* 2022-03-27 [ci skip]

author: git <svn-admin@ruby-lang.org> 2022-03-27 02:43:02 +0900
committer: git <svn-admin@ruby-lang.org> 2022-03-27 02:43:02 +0900
commit: 956e57f7f300894fea7a8c38b9ce0804917f2a7f (patch)
tree: 156597d29d72fb392e0305f402f6792fd15a8ee0 /spec/ruby/core/regexp/case_compare_spec.rb
parent: e699e2d9bff14e3de1323d8d263cd3d04f4d9128 (diff)
0 files changed, 0 insertions, 0 deletions
diff --git a/.cvsignore b/.cvsignore
index 9fd96ca149..2332ee6472 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,10 +5,6 @@
 *~
 .ccmalloc
 .ppack
-.ext
-.git
-.svn
-.rbconfig.time
 COPYING.LIB
 ChangeLog.pre-alpha
 ChangeLog.pre1_1
@@ -41,7 +37,6 @@ parse.c
 parse.y.try
 pitest.rb
 ppack
-preview
 rbconfig.rb
 rename2.h
 repack
diff --git a/.document b/.document
deleted file mode 100644
index 230c50e387..0000000000
--- a/.document
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file determines which files in the
-# Ruby hierarchy will be processed by the RDoc
-# tool when it is given the top-level directory
-# as an argument
-
-# Process all the C source files
-*.c
-
-# the lib/ directory (which has its own .document file)
-
-lib
-
-
-# and some of the ext/ directory (which has its own .document file)
-
-ext
diff --git a/COPYING b/COPYING
index 9043404a83..870a5f22d6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 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
-version 2 (see the file GPL), or the conditions below:
+(see the file GPL), 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
diff --git a/ChangeLog b/ChangeLog
index d6a1f07f07..3ec2124d86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18368 +1,20367 @@
-Sun Jun  8 02:57:32 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+Sun Mar  2 09:51:47 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	Merged 13781 from trunk.
+	* marshal.c (w_nbyte): should output always via rb_io_write().
 
-	* lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
-	  addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
+	* marshal.c (dump_ensure): ditto.
 
-Wed Oct 25 06:46:21 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+	* marshal.c (marshal_dump): should call "binmode" method, if it
+	  responds to.
 
-	Merged 13779 from trunk.
+	* marshal.c (r_byte): should input always via "getc" method.
 
-	* lib/net/telnet.rb (Net::Telnet#login): Making the password prompt
-	  pattern case insensitive. [ruby-Bugs-10746]
+	* marshal.c (r_bytes0): should input always via "read" method.
 
-Sun Jun  8 02:54:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* marshal.c (marshal_load): need not to set up FILE* fp;
 
-	* io.c (rb_io_tell, rb_io_seek): check errno too.  [ruby-dev:32093]
+Mon Mar  3 11:29:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Jun  8 01:51:52 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+	* parse.y (arg): parse 'lhs = a rescue b' as 'lhs=(a rescue b)'.
 
-	Merged 13767, 13768, 13769, and 13770 from trunk.
+Mon Mar  3 02:53:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/xmlrpc/parser.rb (XMLRPC::Convert::dateTime): Fixing a bug that
-	  caused time zone conversion to fail for some ISO 8601 date formats.
-	  [ruby-Bugs-12677]
+	* io.c (rb_io_fread): should not clearerr() if there's no filled
+	  buffer (i.e. rb_io_fread() returning zero).
 
-	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Explicitly start
-	  the HTTP connection to support keepalive requests. [ruby-Bugs-9353]
+Mon Mar 03 01:42:35 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
-	  message for Content-Type check failures. [ruby-core:12163]
+	* misc/ruby-mode.el (ruby-expr-beg): escaped char syntax.
 
-	* lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
-	  Making Content-Type checks case insensitive. [ruby-Bugs-3367]
+	* misc/ruby-mode.el (ruby-parse-partial): ditto.
 
-Sun Jun  8 01:45:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* misc/ruby-mode.el (ruby-parse-partial): no deep indent for
+	  block.
 
-	* marshal.c (r_bytes0): refined length check.  [ruby-dev:32059]
+	* misc/ruby-mode.el (ruby-backward-arg): skip arguments backward.
 
-Sun Jun  8 01:45:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* misc/ruby-mode.el (ruby-calculate-indent): too deep indentation.
 
-	* marshal.c (r_bytes0): check if source has enough data.
-	  [ruby-dev:32054]
+Fri Feb 28 23:50:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Sun Jun  8 01:37:58 2008  Tanaka Akira  <akr@fsij.org>
+	* win32/win32.c (map_errno): map OS error to errno. [new]
 
-	* ext/socket/socket.c (s_accept_nonblock): make accepted fd
-	  nonblocking.  [ruby-talk:274079]
+	* 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 logial 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.
+	  [EXPREIMENTAL]
+
+	* 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 09 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 09 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.
+
+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, sinse
+	  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.
 
-Sun Jun  8 01:28:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jan 24 05:12:55 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* win32/mkexports.rb: deal with __fastcall name decorations.
-	  [ruby-list:44111]
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): deal
+	  with escaped $ and ? at the end of strings.  [ruby-talk:62297]
 
-Sun Jun  8 01:23:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* misc/ruby-mode.el (ruby-font-lock-keywords): added defined?.
 
-	* lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): typo
-	  fixed.  [ruby-list:44099]
+Thu Jan 23 17:25:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Jun  8 01:17:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (rb_eval): do not warn discarding already undefined
+	  method.
 
-	* {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's
-	  bug. [ruby-core:12584]
+	* lib/rational.rb: undef quo before replacing.
 
-Sun Jun  8 00:56:44 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jan 23 15:49:57 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/net/http.rb, lib/open-uri.rb: remove
-	  Net::HTTP#enable_post_connection_check.  [ruby-dev:31960]
+	* parse.y (arg): missing arguments.
 
-	* lib/net/imap.rb: hostname should be verified against server's
-	  indentity as persented in the server's certificate. [ruby-dev:31960]
+Thu Jan 23 14:56:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
+	* lib/rational.rb: modified to support "quo".
 
-Thu Jun  5 16:19:27 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* numeric.c (num_quo): should return most exact quotient value,
+	  i.e. float by default, rational if available.
 
-	* win32/win32.c (make_cmdvector): adjust escaped successive
-	  double-quote handling. (merge from trunk)
+	* numeric.c (num_div): "div" should return x.divmod(x)[0].
 
-Thu Jun  5 12:24:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jan 23 13:24:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c (init_env): initialize HOME and USER environment
-	  variables unless set. [ruby-core:12328] (merge from trunk)
+	* time.c (time_arg): was accessing garbage argv value.
 
-	* win32/win32.c (NtInitialize, getlogin): ditto.
+Thu Jan 23 06:37:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* configure.in, win32/Makefile.sub (LIBS): need to link shell32
-	  library for SH* functions on mswin32 and mingw32.
+	* instruby.rb: should not contain destdir in shebang line.
 
-Thu Jun  5 12:21:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jan 22 23:19:57 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
-	  [ruby-dev:31911]
+	* win32/win32.c (pipe_exec): remove unnecessary SetStdHandle().
 
-Wed Jun  4 16:39:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 22 20:20:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
-	  objects.  [ruby-Bugs-14228]
+	* parse.y (arg): syntaxify tPOW negative number hack.
 
-Tue Jun  3 16:13:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (negate_lit): new function to negate literal numeric
+	  values in compile time.
 
-	* parse.y (yyerror): limit error message length.  [ruby-dev:31848]
+Wed Jan 22 15:36:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* regex.c (re_mbc_startpos): separated from re_adjust_startpos.
+	* regex.c (re_match_exec): charset info may be stored in MBC
+	  region when $KCODE != NONE.
 
-Tue Jun  3 15:27:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 22 14:22:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* gc.c (os_obj_of, os_each_obj): hide objects to be finalized.
-	  [ruby-dev:31810]
+	* error.c (set_syserr): should preserve duplicated error names.
 
-Wed Jun  4 19:15:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jan 21 20:29:31 2003  Michal Rokos  <michal@rokos.homeip.net>
 
-	* eval.c (remove_method): should not remove undef place holder.
-	  [ruby-dev:31817]
+	* mkmf.rb: make possible to add files to clean and distclean targets 
 
-Tue Jun  3 15:05:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jan 21 18:05:25 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* process.c (struct rb_exec_arg): proc should be a VALUE.
+	* bcc32/Makefile.sub (LIBRUBY_A): link dmyext.
 
-	* process.c (rb_f_exec): suppress a warning.
+Tue Jan 21 16:59:18 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* process.c (rb_detach_process): cast for the platforms where size of
-	  pointer differs from size of int.
+	* instruby.rb: use real interpreter pathname at shebang line.
+	  [ruby-dev:19370]
 
-	* process.c (rb_f_exec, rb_f_system): should not exceptions after
-	  fork.  [ruby-core:08262]
+Tue Jan 21 16:22:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed May 21 01:32:56 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (arg): put back old ** behavior for negative number
+	  right operand.
 
-	* lib/webrick/httpservlet/filehandler.rb: should normalize path
-	  name in path_info to prevent script disclosure vulnerability on
-	  DOSISH filesystems. (fix: CVE-2008-1891)
-	  Note: NTFS/FAT filesystem should not be published by the platforms
-	  other than Windows. Pathname interpretation (including short
-	  filename) is less than perfect.
+Tue Jan 21 14:46:12 2003  Tanaka Akira  <akr@m17n.org>
 
-	* lib/webrick/httpservlet/abstract.rb
-	  (WEBrick::HTTPServlet::AbstracServlet#redirect_to_directory_uri):
-	  should escape the value of Location: header.
+        * lib/pp.rb: Use Test::Unit.
 
-	* lib/webrick/httpservlet/cgi_runner.rb: accept interpreter
-	  command line arguments.
+        * lib/prettyprint.rb: Ditto
 
-Sun May 18 01:57:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+        * lib/time.rb: Ditto
 
-	* file.c (isdirsep): backslash is valid path separator on cygwin too.
-	  backported from 1.8 HEAD.
+        * lib/tsort.rb: Ditto
 
-Sat May 17 23:53:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jan 21 04:15:50 2003  Tanaka Akira  <akr@m17n.org>
 
-	* file.c (file_expand_path): fix for short file name on Cygwin.
+        * lib/pp.rb: Use redefined `to_s' as well as `inspect'.
+          Useless `pretty_print' methods removed.
+          (PP::ObjectMixin#pretty_print_inspect): new method.
 
-Sat May 17 23:50:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jan 20 21:48:43 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-	* file.c (OpenFile): prevent conflict on Windows.
+	* 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.
 
-	* file.c (USE_NTFS): fixed merge miss.
+	* Makefile.in (MANTYPE): Define MANTYPE and pass it to
+	  instruby.rb.
 
-Sat May 17 12:36:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* instruby.rb: Convert mdoc manpages to man for systems which
+	  nroff(1) does not grok mdoc.
 
-	* file.c (file_expand_path): rb_str_set_len is not backported.
+Mon Jan 20 21:25:18 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-Sat May 17 12:15:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.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.
 
-	* file.c (file_expand_path): support for alternative data stream
-	  and ignored trailing garbages of NTFS.
+Mon Jan 20 21:02:50 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-	* file.c (rb_file_s_basename): ditto.
+	* mdoc2man.rb: Properly put nested braces, parentheses and angles.
 
-	* file.c (rb_file_s_extname): ditto.
+	* mdoc2man.rb: Add support for .An and .Aq/.Ao/.Ac.
 
-Mon Mar  3 23:36:41 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* mdoc2man.rb: Add support for .Dl.
 
-	* lib/webrick/httpservlet/filehandler.rb: should normalize path
-	  separators in path_info to prevent directory traversal attacks
-	  on DOSISH platforms.
-	  reported by Digital Security Research Group [DSECRG-08-026].
+	* mdoc2man.rb: Make .Pf macro actually work.
 
-	* lib/webrick/httpservlet/filehandler.rb: pathnames which have
-	  not to be published should be checked case-insensitively.
+	* mdoc2man.rb: Properly handle .Os.
 
-Sun Sep 23 21:57:25 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>  
+	* mdoc2man.rb: Correctly omit spaces around punctuation
+	  characters.
 
-	* lib/net/http.rb: an SSL verification (the server hostname should
-	  be matched with its certificate's commonName) is added.
-	  this verification can be skipped by
-	  "Net::HTTP#enable_post_connection_check=(false)".
-	  suggested by Chris Clark <cclark at isecpartners.com>
+Mon Jan 20 19:43:41 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/net/open-uri.rb: use Net::HTTP#enable_post_connection_check to
-	  perform SSL post connection check.
+	* mdoc2man.rb: Make this work as a library.
 
-	* ext/openssl/lib/openssl/ssl.c
-	(OpenSSL::SSL::SSLSocket#post_connection_check): refine error message.
+Mon Jan 20 18:22:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Sun Sep 23 06:08:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_f_require): purge too many goto's.
 
-	* ext/stringio/stringio.c (strio_init): separate from strio_initialize
-	  to share with strio_reopen properly.  [ruby-Bugs-13919]
+Mon Jan 20 17:50:05 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Sep 23 05:42:35 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* mdoc2man.rb (parse_macro): Understand .Ux.
 
-	* lib/rdoc/options.rb (Options::check_diagram): dot -V output
-	  changed. [ ruby-Bugs-11978 ], Thanks Florian Frank.
+Mon Jan 20 17:32:56 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Sep 17 04:47:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* mdoc2man.rb: New file.  A mdoc to man converter ported from
+	  Perl.
 
-	* ruby.c (proc_options): -W should be allowed in RUBYOPT
-	  environment variable.  [ruby-core:12118]
+Mon Jan 20 15:40:15 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Sep 17 04:31:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.1: Properly close .Bl with .El.
 
-	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
+Mon Jan 20 04:14:17 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Fri Sep  7 14:57:36 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+	* lib/mkmf.rb (egrep_cpp): use inspect to show options.
 
-	* ruby.c (rubylib_mangled_path): eliminate RSTRING_PTR
-	  [ruby-dev:31679]
+	* lib/mkmf.rb (dir_config): prior configured directories to
+	  defaults.
 
-	* ruby.c(push_include_cygwin): ditto.
+	* lib/mkmf.rb (dir_config): extract first word to determin
+	  make command type.
 
-Fri Sep  7 14:32:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jan 20 02:15:53 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* array.c (rb_ary_subseq): need integer overflow check.
-	  [ruby-dev:31736]
+	* ext/aix_mksym.rb: no longer used.
 
-	* array.c (rb_ary_splice): ditto.  [ruby-dev:31737]
+Mon Jan 20 00:17:16 2003  Matt Armstrong  <matt@lickey.com>
 
-	* array.c (rb_ary_fill): ditto.  [ruby-dev:31738]
+	* file.c (eaccess): under windows, make eaccess() just call
+	  access(). [ruby-core:716], [ruby-bugs:PR#556]
 
-	* string.c (rb_str_splice): integer overflow for length.
-	  [ruby-dev:31739]
+Sun Jan 19 23:08:18 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Sep  7 14:27:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.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.
 
-	* eval.c (mnew): should preserve noex as safe_level.
+Sun Jan 19 14:01:12 2003  UENO Katsuhiro  <unnie@blue.sky.or.jp>
 
-	* eval.c (rb_call0): tighten security check condition..
+	* regex.c (is_in_list): should work well with UTF-8.
 
-Fri Sep  7 14:19:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (re_match_exec): ditto.
 
-	* configure.in (group_member): check if presents.
+Sat Jan 18 14:53:49 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* configure.in (XCFLAGS): add _GNU_SOURCE on linux.
+	* bignum.c (rb_cstr_to_inum): should not erase all 0s, but
+	  squeeze into one.  [ruby-dev:19377]
 
-	* file.c (group_member): use system routine if available.
+Fri Jan 17 03:33:42 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Sep  7 14:14:19 2007  Yukihiro Matsumoto  <matz@ruby-lang.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.
 
-	* include/ruby/defines.h (flush_register_windows): call "ta 0x03"
-	  even on Linux/Sparc.  [ruby-dev:31674]
+	* sprintf.c (rb_f_sprintf): Use switch instead of a sequence of
+	  else-if's.
 
-Fri Sep  7 14:12:37 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Wed Jan 15 15:18:38 2003  moumar  <moumar@netcourrier.com>
 
-	* ext/win32ole/win32ole.c (ole_type_progid, reg_enum_key, 
-	  reg_get_val, ole_wc2mb): fix the bug. Thanks, arton. 
-	  [ruby-dev:31576]
+	* configure.in (ARCHFILE): set even unless --enable-shared on
+	  AIX.  [ruby-talk:61466]
 
-Fri Sep  7 14:02:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* marshal.c (math.h): should be included after ruby.h on AIX.
+	  [ruby-talk:61366]
 
-	* process.c (detach_process_watcher): should not pass the pointer
-	  to an auto variable to the thread to be created.  pointed and
-	  fix by KUBO Takehiro <kubo at jiubao.org>  [ruby-dev:30618]
+Tue Jan 14 21:47:56 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Fri Sep  7 13:52:36 2007  Tanaka Akira  <akr@fsij.org>
+	* eval.c (rb_f_require): do not search adding .rb/.so suffixes if
+	  the suffix specifiched.  [ruby-dev:18702]
+	  http://moonrock.jp/~don/d/200211.html#d08_t1
 
-	* bignum.c (big_lshift): make shift offset long type.
-	  (big_rshift): ditto.
-	  (rb_big_lshift): ditto.
-	  (big_rshift): ditto.
-	  [ruby-dev:31434]
+Tue Jan 14 18:36:41 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Aug 16 08:44:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enum.c (enum_all): now works without block.
 
-	* hash.c (rb_hash_delete_key): delete the entry without calling block.
+	* enum.c (enum_any): ditto.
 
-	* hash.c (rb_hash_shift): should consider iter_lev too.
+Tue Jan 14 01:21:32 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* hash.c (delete_if_i): use rb_hash_delete_key() so that the block
-	  isn't called twice.  [ruby-core:11556]
+	* io.c (next_argv): not always set binmode.
 
-Thu Aug 16 08:43:50 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Jan 13 20:45:19 2003  Guy Decoux  <ts@moulon.inra.fr>
 
-	* lib/rinda/tuplespace.rb: fix Rinda::TupleSpace keeper thread bug.
-	  the thread is started too early. [ruby-talk:264062] 
+	* parse.y (list_append): avoid O(n) search using node->nd_next->nd_end.
 
-	* test/rinda/test_rinda.rb: ditto.
+	* parse.y (list_concat): ditto.
 
-Thu Aug 16 08:40:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): NODE_ARRY nd_end adoption.
 
-	* ext/pty/pty.c (establishShell): handshaking before close slave
-	  device.  [ruby-talk:263410]
+Mon Jan 13 02:22:11 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Aug 16 08:29:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/dl/lib/dl/win32.rb: elimitate unnecessary "A" adding.
 
-	* configure.in (ac_cv_func_isinf): set yes also on OpenSolaris.
-	  [ruby-Bugs-12859]
+Sun Jan 12 16:07:17 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Aug 16 08:28:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (next_argv): inherit binmode from $defout.
 
-	* lib/rexml/encodings/{ISO-8859-15,CP-1252}.rb: fixed invalid syntax.
+Sat Jan 11 22:50:47 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Aug 16 08:26:08 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+	* ext/dl/lib/dl/win32.rb: compatibility improvement.
 
-	* lib/README: fixed a typo.
+Sat Jan 11 01:44:16 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Aug 16 08:20:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in (RUBY_CHECK_IO_NEED): added more tests.
 
-	* ext/extmk.rb (extmake): save all CONFIG values.
+	* io.c (rb_io_check_readable): seek after synchronized write.
 
-	* ext/extmk.rb (extmake): remove mkmf.log at clean, and extconf.h at
-	  distclean, respectively.
+Fri Jan 10 01:23:45 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/extmk.rb: remove rdoc at clean, and installed list file at
-	  distclean, respectively.
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): syntax
+	  classes are not allowed inside character classes.
+	  [ruby-talk:60996]
 
-Thu Aug 16 07:58:18 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jan  9 23:28:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* sprintf.c (rb_f_sprintf): should not check positional number as
-	  width.  [ruby-core:11838]
+	* configure.in: AC_MSG_FAILURE is a new macro in 2.54b or later.
 
-Thu Aug 16 07:52:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jan  9 17:05:24 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* dln.c (conv_to_posix_path): removed.
+	* configure.in (RUBY_CHECK_IO_NEED): check whether fseek() and
+	  fflush() are needed.
 
-	* ruby.c (rubylib_mangled_path, rubylib_mangled_path2): return
-	  VALUE instead of a pointer to static buffer.
+	* io.c (flush_before_seek): flush write stream only.
 
-	* ruby.c (push_include_cygwin): fixed buffer overflow.
-	  [ruby-dev:31297]
+	* io.c (rb_io_check_readable): seek instead of flush if the last
+	  operation was write.
 
-	* ruby.c (ruby_init_loadpath): not convert built-in paths.
+	* io.c (rb_io_check_writable): seek instead of flush if the last
+	  operation was read.
 
-Thu Aug 16 07:51:37 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* bcc32/Makefile.sub, win32/Makefile.sub: needs to seek between
+	  R/W.
 
-	* defines.h: Pull the RUBY_MBCHAR_MAXSIZE definition from trunk,
-	  which is necessary for dir.c to compile on djgpp and emx.
+Thu Jan  9 16:31:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Aug 16 07:42:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): should not discard nested NODE_BLOCK.
 
-	* intern.h (is_ruby_native_thread): removed since declared as an int
-	  function in ruby.h already.
+Thu Jan  9 15:12:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Aug 16 07:40:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (stmt): NODE_NOT elimitation for if/unless/while/until node.
 
-	* file.c (rb_file_s_rename): deleted code to get rid of a bug of
-	  old Cygwin.
+	* parse.y (primary): ditto.
 
-	* file.c (rb_file_truncate): added prototype of GetLastError()
-	  on cygwin.  [ruby-dev:31239]
+Thu Jan  9 13:26:18 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-	* intern.h (is_ruby_native_thread): prototype.
+	* st.h, st.c: Back out the introduction of st_*_func_t.  Some
+	  compilers complain about function type mismatch.
 
-	* missing/strftime.c (strftime): fix printf format and actual
+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/extm.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.
 
-	* ext/Win32API/Win32API.c (Win32API_initialize): ditto.
+	* win32/win32.c (CreateChild): add new argument for real filename of
+	  executing process.
 
-	* ext/tk/tcltklib.c (ip_finalize): ditto.
+	* win32/win32.c (NtHasRedirection, pipe_exec): follow above change.
 
-	* ext/dl/ptr.c (rb_dlptr_inspect): ditto.  [ruby-dev:31268]
+Sat Jan  4 14:29:52 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* ext/dl/sym.c (rb_dlsym_inspect): ditto.
+	* configure.in: set rb_cv_need_io_flush_between_seek=yes.
 
-	* ext/socket/getnameinfo.c: include stdio.h always.
+	* win32/Makefile.sub (config.h): define NEED_IO_FLUSH_BETWEE_SEEK.
+	  (pointed out by moriq [ruby-dev:19299])
 
-	* ext/win32ole/win32ole.c (ole_hresult2msg, folevariable_name,
-	  folevariable_ole_type, folevariable_ole_type_detail,
-	  folevariable_value, folemethod_visible): missing return value.
+Sat Jan  4 03:12:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Aug 16 07:32:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (umethod_bind): exact class match is not required.  relax
+	  the restriction to subclasses.
 
-	* lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H
-	  only if extconf.h is created.
+Sat Jan  4 01:33:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Aug 16 07:29:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c (rb_file_s_lchmod): get rid of gcc-3 -O3 warning.
 
-	* {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic.
+Fri Jan  3 22:26:07 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Aug 16 06:43:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (rb_proc_times): need to initialize first.
 
-	* lib/mkmf.rb (init_mkmf): should remove mkmf.log too.
+Fri Jan  3 01:10:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Aug 16 06:40:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): call "inherited" before executing class body.
 
-	* ext/openssl/ossl_config.c (ossl_config_set_section): do not
-	  initialize aggregations with dynamic values.  [ruby-talk:259306]
+	* class.c (rb_define_class): call "inherited" after defining the
+	  constant.
 
-Thu Aug 16 06:39:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* class.c (rb_define_class_under): ditto.
 
-	* eval.c (get_backtrace): check the result more.
-	  [ruby-dev:31261] [ruby-bugs-12398]
+Thu Jan  2 19:37:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Aug 16 06:32:25 2007  Nobuyoshi Nakada  <nobu@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).
 
-	* bignum.c (rb_big_lshift, rb_big_rshift): separated functions
-	  to get rid of infinite recursion.  fixed calculation in edge
-	  cases.  [ruby-dev:31244]
+	* eval.c (massign): avoid unnecessary avalue/svalue conversion.
 
-	* numeric.c (rb_fix_lshift, rb_fix_rshift): ditto.
+	* eval.c (rb_yield_0): ditto
 
-Thu Aug 16 06:26:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_update): do not allocate unused array if rpl is
+	  nil (i.e. merely removing elements).
 
-	* bignum.c (rb_big_pow): refine overflow check.  [ruby-dev:31242]
+Thu Jan  2 13:55:08 2003  Mathieu Bouchard  <matju@sympatico.ca>
 
-Thu Aug 16 06:25:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (io_read): should resize supplied string if it's shorter
+	  than expected.
 
-	* time.c (time_succ): Time#succ should return a time object in the
-	  same timezone mode to the original.  [ruby-talk:260256]
+Thu Jan  2 11:01:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Aug 16 06:24:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (bmcall): arguments should be an array.
 
-	* numeric.c (fix_pow): integer power calculation: 0**n => 0, 
-	  1**n => 1, -1**n => 1 (n: even) / -1 (n: odd).
+Wed Jan  1 18:18:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Aug 16 06:11:34 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in: better DJGPP support. add GNUmakefile.
 
-	* lib/base64.rb (Base64::b64encode): should not specify /o option
-	  for regular expression.  [ruby-dev:31221]
+	* djgpp/GNUmakefile: new.
 
-Thu Aug 16 06:08:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan  1 04:16:18 2003  Akinori MUSHA  <knu@iDaemons.org>
 
-	* sprintf.c (rb_f_sprintf): more checks for format argument.
-	  [ruby-core:11569], [ruby-core:11570], [ruby-core:11571],
-	  [ruby-core:11573]
+	* 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.
 
-Thu Aug 16 05:39:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 31 23:22:50 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bignum.c (bignorm): do not empty Bignum.  [ruby-dev:31229]
+	* eval.c (massign): removed awkward conversion between yvalue,
+	  mvalue, etc.
 
-Thu Aug 16 05:12:05 2007  pegacorn  <subscriber.jp AT gmail.com>
+	* eval.c (rb_yield_0): new parameter added to tell whether val is
+	  an array value or not.
 
-	* ext/openssl/ossl.h: include ossl_pkcs5.h.  [ruby-dev:31231]
+	* parse.y (yield_args): restructuring: new nodes: NODE_RESTARY2,
+	  NODE_SVALUE; removed node: NODE_RESTARGS.
 
-	* ext/openssl/ossl_pkcs5.h: new file for PKCS5.  [ruby-dev:31231]
+Tue Dec 31 21:13:51 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise()
-	  instead of rb_raise().  [ruby-dev:31222]
+	* Makefile.in, {win32,bcc32}/Makefile.sub: add new target:
+	  what-where, no-install.
 
-	* ext/sdbm/_sdbm.c: DOSISH platforms need io.h.  [ruby-dev:31232]
+	* mkconfig.rb: add const: CROSS_COMPILING.
 
-	* ext/syck/syck.h: include stdlib.h for malloc() and free().
-	  [ruby-dev:31232]
+	* ext/extmk.rb: no-install support.  add MAKEDIRS macro.
 
-	* ext/syck/syck.h (syck_parser_set_input_type): prototype added.
-	  [ruby-dev:31231]
+	* lib/mkmf.rb: add !ifdef .. !endif for Borland make.
 
-	* win32/win32.c: include mbstring.h for _mbspbrk().  [ruby-dev:31232]
+	* process.c: improve DJGPP support.  system "ls", "-l".
 
-	* win32.h (rb_w32_getcwd): prototype added.  [ruby-dev:31232]
+Tue Dec 31 20:16:37 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Aug 16 05:02:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.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.
 
-	* bignum.c (rb_cstr_to_inum): check leading non-digits.
-	  [ruby-core:11691]
+Tue Dec 31 20:07:49 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Aug 16 05:00:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.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.
 
-	* numeric.c (fix_pow): 0**2 should not raise floating point
-	  exception.  [ruby-dev:31216]
+Tue Dec 31 19:48:21 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Aug 16 04:56:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: Improve OpenBSD support. [obtained from: OpenBSD
+	  ports]
 
-	* win32/win32.c (CreateChild): enclose command line except for
-	  command.com which can not handle quotes.  [ruby-talk:258939]
+	* dln.c (FUNCNAME_PATTERN): Ditto.
 
-Thu Aug 16 04:54:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 31 19:21:02 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand
-	  ::CONFIG which is an alias of MAKEFILE_CONFIG.
+	* array.c (rb_ary_transpose): Properly declare ary as a VALUE.
 
-Thu Aug 16 04:53:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c (rb_file_s_chmod): Do not directly cast an int to void *
+	  to avoid a warning.
 
-	* struct.c (rb_struct_init_copy): disallow changing the size.
-	  [ruby-dev:31168]
+	* defines.h (FLUSH_REGISTER_WINDOWS): Add support for
+	  FreeBSD/sparc64.  miniruby still coredumps in a different place,
+	  though.
 
-Thu Aug 16 04:52:11 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Dec 31 07:47:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* random.c: documentation fix.  srand(0) initializes PRNG with '0',
-	  not with random_seed.
+	* parse.y (parse_string): readjusted.
 
-Thu Aug 16 04:49:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (heredoc_identifier): readjusted.
 
-	* bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir.
+	* parse.y (here_document): make EOL codes of single-quoted
+	  here-documents consistent.
 
-Thu Aug 16 04:40:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (yylex): reduced unnecessary conditionals.
 
-	* sprintf.c (rb_f_sprintf): sign bit extension should not be done
-	  if FPLUS flag is specified.  [ruby-list:39224]
+Tue Dec 31 04:49:51 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Aug 16 04:39:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.1: mdoc'ify.
 
-	* array.c (rb_ary_initialize): should call rb_ary_modify() first.
-	  [ruby-core:11562]
+Tue Dec 31 01:30:29 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Aug 16 04:38:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (yylex): do not accept " __END__\n".  ([ruby-dev:19245])
 
-	* parse.y (yylex): return non-valid token for an invalid
-	  instance/class variable name.  a patch from from Yusuke ENDOH
-	  <mame AT tsg.ne.jp>.  [ruby-dev:31095]
+Mon Dec 30 21:10:59 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Aug 16 04:36:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (yylex): use strncmp instead of strcmp. 
+	  accept "__END__\r\n".  ([ruby-dev:19241])
 
-	* parse.y (dsym): return non-null NODE even if yyerror().  based on a
-	  patch from from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:31085]
+Mon Dec 30 20:32:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Aug 16 04:34:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (rb_gc_mark_frame): should mark frame->node.
 
-	* process.c (proc_exec_v, rb_proc_exec): preserve errno.
+Mon Dec 30 19:10:30 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Aug 16 04:30:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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.
 
-	* variable.c (rb_path2class): get rid of dangling pointer caused by
-	  optimized out value.
+	* instruby.rb: extract -n option also from --make and
+	  --make-flags.
 
-Thu Aug 16 04:24:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bcc32/Makefile.sub, win32/Makefile.sub: not prepend - to
+	  $(MFLAGS)
 
-	* ext/dl/lib/dl/win32.rb: seems that dl doesn't accept void argument.
-	  fixed [ruby-bugs:PR#5489].
+Mon Dec 30 16:44:14 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Aug 16 04:23:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_substr): should share the shared string if
+	  present, instead of the original string.  (ruby-bugs:PR#528)
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser): handle more
-	  extensions.  [ruby-dev:30972]
+Mon Dec 30 05:10:00 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Aug 16 04:14:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/socket.c (tcp_svr_init): local host to
+	  init_inetsock() is VALUE but not pointer.
 
-	* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
-	  clash.
-Thu Aug 16 04:11:17 2007  Ryan Davis  <ryand@zenspider.com>
+	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): get rid of
+	  gcc-3 -O3 warning.
 
-	* lib/rexml/dtd/dtd.rb: Fixed typo in code. Fixes bug #10420
+Sun Dec 29 23:45:53 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Aug 16 04:08:20 2007  Shugo Maeda  <shugo@ruby-lang.org>
+	* gc.c (gc_sweep): adjust GC trigger.
 
-	* lib/net/imap.rb (ResponseParser#next_token): fixed
-	  error message. (backported from HEAD)
+	* dln.c (init_funcname_len): get rid of gcc-3 -O3 warning.
 
-	* lib/net/imap.rb (ResponseParser#parse_error): fixed
-	  the condition not to refer @token.symbol unexpectedly.
-	  Thanks, Dick Monahan. (backported from HEAD)
+	* eval.c (copy_node_scope): ditto.
 
-Thu Aug 16 04:05:20 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* hash.c (rb_hash_foreach, delete_if_i, select_i, each_value_i,
+	  each_key_i, each_pair_i, envix): ditto.
 
-	* marshal.c (w_extended): erroneous check condition when dump
-	  method is defined.  [ruby-core:10646]
+	* range.c (range_each_func): ditto.
 
-Sat Jun  9 10:40:00 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* file.c (rb_file_s_chmod): ditto.
 
-	* stable version 1.8.5-p52 released.
+Sun Dec 29 15:30:37 2002  Minero Aoki  <aamine@loveruby.net>
 
-Thu Jun  7 14:53:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* lib/fileutils.rb (fu_parseargs): should not inherit ftools.rb's
+          misfeature.
 
-	* eval.c (method_inspect): show proper class name.
-	  [ruby-talk:248647], Thanks Calamitas.
+Sun Dec 29 05:08:13 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Mon May 28 19:37:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/fileutils.rb (cmp): return false if file size differs.
 
-	* win32/win32.c (move_to_next_entry): revert r12338. not necessary
-	  on ruby_1_8_5.
+Sat Dec 28 19:21:24 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Sun May 27 05:52:37 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* instruby.rb: remove junk args.
 
-	* eval.c (mnew): call of super via a method object should work again.
-	  [ruby-talk:248647], Thanks Calamitas.
+	* lib/mkmf.rb (create_makefile): remove a trouble library
+	  before making a shared library.
 
-	* test/ruby/test_method.rb (TestMethod::test_method_super): test for
-	  above fix.
+	* win32/Makefile.sub: invoke instruby.rb with the --make-flags option.
 
-Wed May 23 06:51:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Sat Dec 28 03:09:58 2002  Wakou Aoyama  <wakou@ruby-lang.org>
 
-	* lib/cgi.rb (CGI#[]): get rid of exceptions being raised.
-	  [ruby-dev:30740], Thanks Kentaro KAWAMOTO.
+	* lib/cgi.rb (CGI#[]): improvement. thanks to Kazuhiro NISHIYAMA
+	  <zn@mbf.nifty.com>
 
-Wed May 23 06:14:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Dec 28 00:34:03 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* win32/win32.c (move_to_next_entry): loc also must move forward.
-	  [ruby-talk:251987]
+	* {win32,bcc32}/Makefile.sub: remove `=' from --make-flags options.
+	  nmake quotes args if included `=' in args.
 
-Wed May 23 05:55:04 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* instruby.rb: use getopts.rb.
 
-	* win32/win32.c (init_stdhandle): stderr should be without buffering,
-	  but mswin32 use buffering when stderr is not connected to tty.
+	* ext/dbm/extconf.rb (-DDBM_HDR): substitute ' with " to avoid
+	  a error on Win32.
 
-Wed May 23 03:33:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/gdbm/gdbm.c: add prototypes to avoid VC++ warnings.
 
-	* lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
-	  ensures Thread.critical to be false.  [ruby-talk:248300]
+Fri Dec 27 21:41:57 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Wed May 23 03:25:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bcc32/setup.mak, win32/setup.mak(-prologue-): move srcdir from
+	  CPP input or UNC path will be removed as a comment.
 
-	* util.c (ruby_strtod): exponent is radix 10.  [ruby-talk:248272]
+Fri Dec 27 17:55:00 2002  Takaaki Uematsu  <mail@uema2.cjb.net>
 
-Wed May 23 02:09:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* wince/config, wince/configure.bat: replace 1.7 with 1.8
+	  in macros.
 
-	* eval.c (rb_yield_0): should not clear state on TAG_NEXT when
-	  it's invoked from within lambda body.  [ruby-talk:248136]
+Fri Dec 27 13:28:14 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* eval.c (proc_invoke): handle TAG_NEXT which would be caused by
-	  next in the lambda body as well.
+	* instruby.rb: fileutils.rb accepts only one argument.
 
-Wed May 23 01:55:49 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Dec 27 13:23:29 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
-	  before calling original fclose()/close().
+	* lib/fileutils.rb (fu_parseargs): reject illegal options
+	  correctly.
 
-Wed May 23 01:42:29 2007  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/fileutils.rb (uptodate?): parameter declaration was wrong.
 
-	* lib/net/imap.rb (disconnect): call shutdown for
-	  SSLSocket. Thanks, Technorama Ltd.
+	* lib/fileutils.rb: change coding styles.
 
-Wed May 23 01:28:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 27 09:25:22 2002  ABE Shigeru  <shiger-a@nifty.com>
 
-	* error.c (rb_notimplement), io.c (pipe_open): removed definite
-	  articles and UNIX manual section from messages.  [ruby-dev:30690]
+	* process.c (rb_proc_times): avoid WindowsXP crash using volatile
+	  variables.
 
-	* io.c (pipe_open): raise NotImplementedError for command "-" on
-	  platforms where fork(2) is not available.  [ruby-dev:30681]
+Fri Dec 27 02:56:58 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Wed May 23 00:06:19 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* instruby.rb: check only `-' option, and use fileutils instead of
+	  ftools.
 
-	* ext/socket/socket.c (s_recv, s_recvfrom): some systems (such as
-	  windows) doesn't set fromlen if the socket is connection-oriented.
-	  reported by Bram Whillock in [ruby-core:10512] [ruby-Bugs#9061]
+Fri Dec 27 02:45:17 2002  Wakou Aoyama  <wakou@ruby-lang.org>
 
-Tue Mar 20 15:37:24 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* lib/net/telnet.rb: Telnet#print not add "\n".
 
-	* distruby.rb: Add zip generation.
+	* lib/cgi.rb: cgi['key'] is equal cgi['key'][0]
 
-Fri Mar 16 21:48:11 2007  Akinori MUSHA  <knu@iDaemons.org>
+Thu Dec 26 22:33:18 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation;
-	  submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
-	  in [ruby-dev:30554].
+	* ext/extmk.rb (create_makefile): check only `-' option.
 
-Fri Mar 16 18:28:06 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* configure.in: cleanups for MinGW. remove -D__NO_ISOCEXT in $CFLAGS.
 
-	* ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
-	  always returning the (real) group entry of the running process;
-	  reported by: UEDA Hiroyuki <ueda AT netforest.ad.jp>
-	  in [ruby-dev:30586].
+	* win32/win32.h: prototypes for isinf, isnan are not needed on MinGW.
 
-Wed Mar 14 12:30:00 2007  Shigeo Kobayashi  <shigeo@tinyforest.jp>
+Thu Dec 26 19:22:00 2002  YOSHIDA Kazuhiro <moriq@moriq.com>
 
-	* ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
-	  treated as ("-0.31") not as ("0.31").
+	* win32/setup.mak (-prologue-): moved srcdir macro definition.
+	  [ruby-win32:420].
 
-Fri Mar 16 18:05:40 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Dec 25 18:26:44 2002  K.Kosako  <kosako@sofnec.co.jp>
 
-	* lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph
-	  assumption any more; submitted by MIYASAKA Masaru <alkaid AT
-	  coral.ocn.ne.jp> in [ruby-dev:30537].
+	* regex.c (re_match): fixed wrong \G behavior.  (ruby-bugs-ja:PR#377)
 
-Tue Mar 13 17:29:43 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Wed Dec 25 16:41:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* stable version 1.8.5-p35 released.
+	* regex.c (re_match_exec): fix odd \G behavior based on the patch
+	  from Nobu.
 
-Tue Mar 13 14:42:10 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Wed Dec 25 11:05:11 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* test/fileutils/fileasserts.rb: Fix wrong error message.
+	* bcc32/setup.mak (-generic-): removed garbages.
 
-	* lib/fileutils.rb (FileUtils::mv): Type Error; should utilize
-	  Strings instead of Symbols here.
+Wed Dec 25 10:36:20 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Mon Mar 12 17:22:44 2007  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]
 
-	* lib/fileutils.rb (FileUtils::mv): fix incomplete backport of
-	  FileUtils.mv changes at r11988
+	* bcc32/setup.mak, win32/setup.mak (-prologue-): define MAJOR, MINOR
+	  and TEENY from version.h. based on Nobu's patch. [ruby-win32:413]
 
-Mon Mar 12 16:09:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/Makefile.sub (config.h): add HAVE_FLOAT_H.
 
-	* mkconfig.rb (patchlevel): read from version.h.
+	* win32/Makefile.sub (parse.obj): depend on win32/win32.h.
 
-Sun Mar 11 18:57:50 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Dec 24 23:49:16 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* misc/README: Add a note about ruby-electric.el. 
+	* lib/irb/completion.rb: Use Object#class rather than Object#type.
 
-	* misc/ruby-mode.el (ruby-non-block-do-re): Fix
-	  ruby-non-block-do-re. [ruby-core:03719]
+Tue Dec 24 23:37:40 2002  TADA Tadashi <sho@spc.gr.jp>
 
-	* misc/inf-ruby.el: Synchronize the comment section with trunk.
+	* lib/cgi.rb (Cookie::parse), lib/cgi-lib.rb (initialize): Do not
+	  pass to split() a bare string longer than 2 characters as
+	  separator.
 
-	* misc/README, misc/rdebug.el: Add rdebug.el, Emacs ruby-debug
-	  interface based on rubydb3x.el; submitted by Martin Nordholts
-	  <enselic AT gmail.com> in [ruby-bugs:PR#9023].
+Tue Dec 24 19:19:24 2002  Tietew <tietew@tietew.net>
 
-Sun Mar 11 17:45:51 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* numeric.c (DBL_MAX_10_EXP): fix typo. [ruby-dev:19175]
 
-	* ext/dl/mkcallback.rb (mkfunc): Make sure that a callback
-	  function is found in the function table before trying to call
-	  it; submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
-	  in [ruby-dev:30524].
+Tue Dec 24 17:02:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Mar  6 18:58:37 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
-	
-	* lib/shell/process-controller.rb: fix thread synchronization
-	  problem for [ruby-dev:30477].
-	
-Sun Mar  4 23:53:27 2007  Minero Aoki  <aamine@loveruby.net>
+	* eval.c (rb_undefined): use NoMethodError instead of fatal.
+
+Tue Dec 24 02:12:45 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/fileutils.rb (mv): could not move a directory between
-	  different filesystems. [ruby-dev:30411]
+	* lib/README: Synchronize with reality.
 
-Sat Mar  3 21:41:31 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Dec 24 02:05:51 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;
-	  submitted by: NISHIMATSU Takeshi <t_nissie AT yahoo.co.jp> in
-	  [ruby-list:43218].
-	  cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24556
+	* MANIFEST, lib/README, lib/ipaddr.rb: Add ipaddr.rb from rough.
 
-Sat Mar  3 16:30:39 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Dec 22 04:07:47 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a
-	  local_tbl region from getting freed many times; submitted by
-	  Chikanaga Tomoyuki <chikanag AT nippon-control-system.co.jp> in
-	  [ruby-dev:30460].
+	* ext/dbm/dbm.c (fdbm_alloc): allocator takes only one argument.
 
-	* eval.c (proc_invoke): Ditto.
+Sun Dec 22 02:49:25 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* gc.c (obj_free): Ditto.
+	* 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.
 
-	* parse.y (top_local_setup_gen): Ditto.
+	* ext/sdbm/init.c (fsdbm_alloc): allocator takes only one argument.
 
-Sat Mar  3 15:41:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Dec 22 00:36:43 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
-	  empty.  [ruby-dev:30452]
+	* lib/mkmf.rb (create_makefile): accept pure ruby libraries.
 
-Wed Feb 28 20:51:32 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Sat Dec 21 23:59:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* pack.c (pack_unpack): properly ignore non-base64 octets such as
-	  UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
-	  to fix [ruby-core:10437]
+	* class.c (ins_methods_i): should not show ID_ALLOCATOR.
 
-Wed Feb 28 00:08:11 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+	* class.c (ins_methods_prot_i): ditto.
 
-	* mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
+	* class.c (ins_methods_priv_i): ditto.
 
-	* common.mk: new target dist
+	* class.c (ins_methods_pub_i): ditto.
 
-	* distruby.rb: new file
+	* eval.c (call_trace_func): ditto.
 
-Tue Feb 27 21:19:35 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (rb_undefined): ditto.
 
-	* win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
-	  workaround. [ruby-core:10259]
+Sat Dec 21 07:27:24 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* win32/win32.c (NtInitialize): call above function.
+	* misc/ruby-mode.el (ruby-parse-partial): keywords must not be
+	  preceded by @ or $.
 
-Mon Feb 26 09:57:58 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Dec 20 20:29:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* signal.c (ruby_signal): don't set SA_RESTART.  a backport from
-	  the HEAD.  [ruby-talk:220937]  [ruby-talk:147220]
+	* 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().
 
-Tue Feb 13 02:21:12 2007  Sam Roberts  <sroberts@uniserve.com>
+Fri Dec 20 18:29:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* io.c (rb_f_syscall): Fix buffer overflow with syscall
-	  arguments.  [ruby-bugs:PR#8541]
+	* io.c (rb_io_fwrite): separated from io_write().
 
-Sat Feb 10 09:33:47 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* marshal.c (w_byten): use rb_io_fwrite() to support non-blocking
+	  IO, and added error check.
 
-	* ext/win32ole/win32ole.c (ole_variant2val): sorry, fix the enbug.
+	* rubyio.h: prototypes; rb_io_fwrite
 
-Sat Feb 10 09:08:01 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Fri Dec 20 17:40:59 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (ole_variant2val): fix compile error
-	  on VC++.
+	* object.c (Init_Object): should not remove Class#allocate.
 
-Sat Feb 10 08:38:30 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* lib/profiler.rb: separate profiling functions, without
+	  trace_func and at_exit setting.
 
-	* ext/win32ole/win32ole.c (ole_variant2val): fix the bug when
-	  SAFEARRAY pointer is NULL.
+Fri Dec 20 16:20:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Feb  6 20:41:39 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (do_block): split "do" block and tLBRACE_ARG block.
 
-	* string.c (rb_str_sub_bang): calling rb_str_modify() should be just
-	  before actually modifying the string.
-	  fixed: [ruby-dev:30211] (originally reported by zunda)
+	* parse.y (cmd_brace_block): new tLBRACE_ARG block rule
 
-Sat Jan 27 15:20:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (command): can take optional cmd_brace_block; use %prec
+	  to resolve shift/reduce conflict. (ruby-bugs-ja PR#372)
 
-	* parse.y (dyna_var_lookup): should not alter dvar->val not to
-	  destroy living value.  [ruby-core:10076]
+	* eval.c (ruby_finalize): trace_func should be cleared here (after
+	  executing exit procs and finalizers).
 
-	* parse.y (dyna_init): ditto.
+	* 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.
 
-Wed Jan 24 18:05:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Dec 20 05:06:49 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): fix
-	  regexp font-lock bug.  [ruby-talk:235758]
+	* 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.
 
-Sun Jan 14 07:26:44 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Fri Dec 20 04:58:22 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/win32ole/win32ole.c (ole_free, ole_type_free, 
-	  olemethod_free, olevariable_free, oleparam_free, 
-	  ole_event_free): fix memory leak.  [ruby-core:09846]
+	* lib/tempfile.rb: Embed Rdoc style comments.
 
-Tue Jan  9 12:29:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/tempfile.rb: Add length as an alias for size.
 
-	* ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
-	  convert uid/gid from VALUE.
+Fri Dec 20 03:57:32 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/etc/etc.c (etc_getpwuid): ditto.
+	* lib/tempfile.rb: Add Tempfile#close!() as a shorthand for
+	  Tempfile#close(true).
 
-Mon Dec 25 20:08:28 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* lib/tempfile.rb: Add Tempfile#{unlink,delete}().
 
-	* ext/openssl/ossl.h: fixed compilation problem on gcc 3.2.
-	  [ruby-talk:214786]
+Fri Dec 20 03:53:01 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Dec 25 10:40:40 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* lib/README, lib/cgi/final.rb, lib/cgi/session.rb: Delete
+	  final.rb, which was obsoleted long ago.
 
-	* stable version 1.8.5-p12 released.
+Fri Dec 20 00:16:06 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Sat Dec 16 04:02:10 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* 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]
 
-	* ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
-	  [ruby-talk: 227408]
+Thu Dec 19 22:55:49 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Fri Dec 15 17:21:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* numeric.c (DBL_EPSILON): fix typo.
 
-	* lib/rdoc/ri/ri_options.rb: prevent NameError.  [ruby-dev:29597]
+Thu Dec 19 22:35:20 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Dec 14 23:37:38 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (assign): avoid [BUG] at multiple attribute assignment.
 
-	* dir.c (glob_helper): get rid of possible memory leak.
+Thu Dec 19 01:00:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c (cmdglob, rb_w32_cmdvector, rb_w32_opendir,
-	  rb_w32_get_environ): not to use GC before initialization.
+	* numeric.c (num_step): use DBL_EPSILON.
 
-Wed Dec  6 19:53:41 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* array.c (rb_check_array_type): new function: return an array
+	  (convert if possible), or nil.
 
-	* configure.in (SITE_DIR): fixed to emtpy RUBY_SITE_LIB in config.h on
-	  NetBSD.  fixed: [ruby-dev:29358]
+	* string.c (rb_check_string_type): new function: return a string
+	  (convert if possible), or nil.
 
-Mon Dec  4 10:43:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* numeric.c (rb_dbl_cmp): returns nil if values are not
+	  comparable.
 
-	* parse.y (dyna_init_gen): dvar initialization only if dvar is
-	  assigned inner block.  [ruby-talk:227402]
+	* numeric.c (fix_cmp,flo_cmp): use rb_num_coerce_cmp()
 
-Mon Dec  4 10:22:26 2006  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+	* bignum.c (rb_big_cmp): ditto.
 
-	* stable version 1.8.5-p2 released.
+	* numeric.c (rb_num_coerce_cmp): new coercing function for "<=>",
+	  which does not raise TypeError.
 
-Sun Dec  3 17:11:12 2006  Shugo Maeda  <shugo@ruby-lang.org>
+	* numeric.c (do_coerce): can be supress exception now.
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
-	  boundary. JVN#84798830
+	* object.c (rb_mod_cmp): should return nil for non class/module
+	  objects.
 
-Sun Nov 26 16:36:46 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Thu Dec 19 04:21:10 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* version.h: addition of RUBY_PATCHLEVEL.
-	* version.c: ditto.
+	* lib/open-uri.rb: add a missing ||. (found by: ruby -wc)
 
-Fri Nov 24 10:17:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Dec 18 17:53:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bignum.c (bignorm): avoid segmentation.  a patch from Hiroyuki
-	  Ito <ZXB01226@nifty.com>.  [ruby-list:43012]
+	* re.c (rb_reg_eqq): return false if the argument is not a
+	  string.  now returns boolean value.
 
-Thu Nov  2 15:43:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* class.c (rb_include_module): argument should be T_MODULE, not
+	  T_class, nor T_ICLASS.
 
-	* parse.y (primary): should set NODE even when compstmt is NULL.
-	  merge from trunk. fixed: [ruby-dev:29732]
+Wed Dec 18 03:52:55 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Sat Sep 23 21:34:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_new4): handle tail shared string.
+	  (ruby-bugs-ja:PR#370)
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content
-	  may be empty.  a patch from Jamis Buck <jamis at 37signals.com>.
+	* string.c (rb_str_dup_frozen): ditto.
 
-Mon Sep  4 21:43:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 17 21:08:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/dbm/extconf.rb: create makefile according to the result of check
-	  for dbm header.  fixed: [ruby-dev:29445]
+	* node.h (NODE_ATTRASGN): new node, assignment to attribute.
+	  [ruby-core:00637].
 
-Tue Aug 29 19:10:10 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (is_defined, rb_eval): ditto.
 
-	* hash.c (rb_hash_s_create): fixed memory leak, based on the patch
-	  by Kent Sibilev <ksruby at gmail.com>.  fixed: [ruby-talk:211233]
+	* parse.y (attrset, node_assign): ditto.
 
-Fri Aug 25 17:15:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_substr): tail sharing.  [ruby-core:00650]
 
-	* stable version 1.8.5 released.
+	* re.c (rb_reg_nth_match): ditto.
 
-Fri Aug 25 17:02:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Dec 17 16:52:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* gc.c (gc_sweep): typo fixed.
+	* eval.c (is_defined): "defined?" should return "assignment" for
+	  attribute assignment (e.g. a.foo=b) and indexed assignment
+	  (e.g. a[2] = 44).
 
-Tue Aug 22 18:47:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (aryset): use NODE_ATTRASGN.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_method):
-	  rdoc documents C module methods as instance methods. a patch in
-	  [ruby-core:08536]. 
+Tue Dec 17 04:03:45 2002  Tanaka Akira  <akr@m17n.org>
 
-Sat Aug 19 14:15:02 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+        * lib/open-uri.rb: new file.
 
-	* win32/Makefile.sub (config.status): include winsock2.h instead of
-	  winsock.h when --with-winsock2 is specified.
-	  fixed: [ruby-dev:29296]
+Tue Dec 17 00:28:19 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Sat Aug 19 11:28:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c (utimbuf): need to define for VC++.
 
-	* file.c (rb_file_s_rename): use errno if set properly.
-	  fixed: [ruby-dev:29293]
+Mon Dec 16 15:53:20 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Sat Aug 19 11:09:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (nextc): get rid of overrun.  (pointed out by akr
+	  [ruby-list:36773])
 
-	* parse.y (then): remove semicolon warning.  [ruby-dev:29299]
+Sun Dec 15 21:16:44 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Aug 17 19:15:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/mkmf.rb (init_mkmf): add $(topdir) to $LIBPATH if $extmk.
+	  remove adding $(archdir) to $LIBPATH.
 
-	* file.c (rb_stat_[rRwWxX]): check for super user.
-	  fixed: [ruby-core:08616]
+Sat Dec 15 12:15:00 2002  Takaaki Uematsu <mail@uema2.cjb.net>
 
-Thu Aug 17 14:47:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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
 
-	* lib/mkmf.rb: added rdoc by Daniel Berger.  [ruby-core:08177]
+Sun Dec 15 11:43:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Aug 17 00:39:05 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* parse.y (dispose_string): dispose String object.
 
-	* lib/rinda/ring.rb (do_reply): Fix for RingServer fails to find a
-	  TupleSpace when TupleSpace resides in the same ruby process with
-	  RingServer. a patch from Kent Sibilev. [ruby-core:08453]
+	* parse.y (heredoc_restore, here_document): fix memory leak.
 
-Wed Aug 16 11:45:36 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Dec 14 14:25:00 2002  Takaaki Uematsu <mail@uema2.cjb.net>
 
-	* process.c (proc_setuid, proc_setgid, proc_seteuid, proc_setegid):
-	  get rid of bogus implementations on Mac OS X.
+	* 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.
 
-Tue Aug 15 19:10:18 2006  Eric Hodel  <drbrain@segment7.net>
+Sat Dec 14 01:51:29 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment): Fix
-	  broken class-level documentation.
+	* ext/dbm/extconf.rb (rb_check): support for GNU dbm 1.8.3.
+	  (-with-dbm-type=gdbm_compat). link against -lgdbm_compat
+	  and -lgdbm.
 
-Wed Aug 16 11:09:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 13 23:42:16 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ruby.c (set_arg0): fill argv other than the first with an empty
-	  string instead of NULL.
+	* ext/dbm/extconf.rb (db_check): check existence of the function
+	  in the specified library before checking it in libc.
 
-Wed Aug 16 11:08:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 13 17:15:49 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.h: removed an excess macro.  fixed: [ruby-dev:29258]
+	* variable.c (generic_ivar_get): should always warn uninitialized
+	  instance variables.
 
-Tue Aug  8 23:49:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Dec 13 12:33:22 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/irb/extend-command.rb (IRB::ExtendCommandBundle): pacify
-	  RDoc.  a patch from Eric Hodel <drbrain at segment7.net>.
-	  [ruby-core:08522]
+	* parse.y (expr): rescue clause was ignored.
 
-Tue Aug  8 11:32:54 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Dec 12 18:19:14 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* Makefile.in, common.mk, configure.in: fix for platforms without
-	  rm. patches from Yutaka kanemoto <kinpoco at gmail.com>.
-	  [ruby-dev:29215]
+	* configure.in (RUBY_PROG_GNU_LD): add $CFLAGS, $CPPFLAGS, $LDFLAGS
+	  to the option of $CC.
 
-Mon Aug  7 17:56:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in: set LIBRUBYARG to '-l$(RUBY_SO_NAME)' if the
+	  target os is cygwin and --disable-shared option is supplied.
 
-	* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
-	  ext/digest/sha1/sha1ossl.c, ext/readline/readline.c: move
-	  incluion of config.h to pacify AIX.  a patch from Yutaka
-	  Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29197]
+	* lib/mkmf.rb (init_mkmf): expand config["LIBRUBY"] and
+	  config["LIBRUBY_A"].  don't link $LIBRUBYARG_STATIC if
+	  --disable-shared option is supplied.
 
-Mon Aug  7 15:55:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in (RUBY_CPPOUTFILE): should be a better message.
 
-	* ext/syck/syck.c (syck_move_tokens): should avoid negative
-	  memmove.  [ruby-list:42625]
+	* ext/Win32API/extconf.rb: join with a space.
 
-Mon Aug  7 14:37:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Dec 12 17:27:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in, common.mk: AIX link issue.  a patch from Yutaka
-	  Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29190]
+	* re.c (rb_reg_hash): define Regexp#hash to make regexps to be
+	  hash keys.
 
-	* ext/socket/socket.c: AIX socket support.  [ruby-dev:29190]
+	* re.c (Init_Regexp): define Regexp#eql? (alias to Regexp#==).
 
-Mon Aug  7 12:05:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Dec 12 16:26:31 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* dln.c, eval.c, gc.c, regex.c, ruby.h: shut up AIX alloca
-	  warning.  a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
-	  [ruby-dev:29191]
+	* marshal.c (r_object0): singleton class instance can't be loaded.
+	  (ruby-bugs-ja:PR#366)
 
-Sun Aug  6 20:40:41 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Dec 11 23:35:43 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/date/format.rb (str[fp]time): %[EO]U didn't denote %U.
+	* ext/extmk.rb (create_makefile): -no-undefined -> --no-undefined.
 
-Sat Aug  5 17:07:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Dec 11 17:54:59 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* parse.y (top_local_setup): local_vars[-1] should point
-	  ruby_scope itself to protect local_tbl from garbage collection.
-	  [ruby-dev:29049]
+	* io.c (io_read): takes optional second argument to specify a
+	  string to be written.  the string should not be frozen.
 
-Sat Aug  5 13:54:03 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+	* io.c (rb_io_sysread): ditto.
 
-	* lib/date/format.rb (str[fp]time): "%\n" means "\n".
+Wed Dec 11 11:30:28 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Fri Aug  4 15:21:00 2006  Eric Hodel  <drbrain@segment7.net>
+	* ext/digest/digest.c (rb_digest_base_copy): renamed "become".
 
-	* lib: Merge RDoc and .document from HEAD.
-	* lib/drb/ssl.rb: Close socket on SSLError [ruby-core:7197]
+	* ext/stringio/stringio.c (strio_copy): ditto.
 
-Fri Aug  4 19:13:41 2006  Keiju Ishitsuka  <keiju@ruby-lang.org>
+Wed Dec 11 00:45:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/irb/{init.rb,ruby-lex.rb,slex.rb}: can't input '\c' for
-	  [ruby-core: 7122].
+	* lib/getoptlong.rb (GetoptLong::Error): provide a common ancestor
+	  for GetoptLong error classes (RCR#129).
 
-Fri Aug  4 14:02:14 2006  James Edward Gray II  <james@grayproductions.net>
+Tue Dec 10 17:42:39 2002 2002  K.Kosako  <kosako@sofnec.co.jp>
 
-	* lib/date/format.rb (__strptime, strftime): allow multi-line patterns
-	  in Date#strftime the same as Time#strftime accepts.
-	  fixed: [ruby-core:08466]
+	* re.c (rb_reg_copy_object): fixed memory leak.
 
-Fri Aug  4 13:56:51 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 10 17:30:35 2002  Tanaka Akira  <akr@m17n.org>
 
-	* pack.c (pack_pack): check argument overrun for 'P'.  based on a
-	  patch by rucila <rucila at yahoo.cojp>.  fixed: [ruby-dev:29182]
+        * pack.c (utf8_limits): fix the limit of 4 bytes UTF-8 sequence.
 
-Tue Aug  1 17:44:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 10 12:01:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* win32/win32.c (init_stdhandle): assign standard file handles.
+	* eval.c (mnew): original class of method defined in module should
+	  be the module not intermediate class.  [ruby-dev:19040]
 
-Tue Aug  1 12:24:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 10 01:16:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (Init_Binding): fix old commit miss.
+	* sprintf.c (rb_f_sprintf): preceding ".." for negative numbers
+	  still left;  removed.
 
-Mon Jul 31 17:08:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* sprintf.c (rb_f_sprintf): should not prepend '0' if width > prec
+	  for example "%5.3d".
 
-	* win32/win32.c (exit_handler): new function; release winsock and
-	  environment work area.
+Sat Dec  7 18:14:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c (NTInitialize): setup exit_handler.
+	* process.c (Init_process): add Process.exit and Process.abort
 
-	* win32/win32.c (StartSockets): use exit_handler.
+	* pack.c (utf8_to_uv): raise ArgumentError for malformed/redundant
+	  UTF-8 sequences.
 
-	* win32/win32.c (rb_w32_getenv): use GetEnvironmentStrings() instead
-	  of GetEnvironmentVariable(), because the latter cannot distinguish
-	  wheather a null environment variable exists or not.
-	  fixed: [ruby-talk:205123]
+Fri Dec  6 03:46:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jul 31 16:15:13 2006  Tanaka Akira  <akr@fsij.org>
+	* process.c (last_status_set): add pid attribute to Process::Status.
 
-	* test/ruby/test_process.rb (TestProcess#test_rlimit_nofile):
-	  setrlimit may fail with EINVAL.
-	  reported by MIYAMUKO Katsuyuki.  [ruby-dev:29174]
+Wed Dec  4 17:31:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jul 31 13:38:22 2006  GOTOU Yuuzou  <gotoyuzo@notwork.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.
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
-	  for the value of IPv6 address in the Host: header field.
+	* pack.c (utf8_to_uv): do not decode sequences longer than 6 bytes.
 
-Mon Jul 31 09:22:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* object.c (copy_object): use "copy_object" method, not "become".
 
-	* ruby.h: use ifdef (or defined) for macro constants that may or
-	  may not be defined to shut up gcc's -Wundef warnings.
-	  [ruby-core:08447]
+Wed Dec  4 16:37:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Jul 30 23:26:22 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (copy_object): copy finalizers as well if any.
 
-	* eval.c (rb_call0): trace call/return of method defined from block.
-	  fixed: [ruby-core:08329]
+	* gc.c (rb_gc_copy_finalizer): new function to copy finalizers.
 
-	* eval.c (rb_trap_eval): make the current thread runnable to deal with
-	  exceptions which occurred within the trap.  fixed: [ruby-dev:27729]
+Tue Dec  3 01:13:41 2002  Tanaka Akira  <akr@m17n.org>
 
-	* lib/cgi/session.rb, lib/cgi/session/pstore.rb: suppress warnings.
-	  fixed: [ruby-talk:204896]
+	* lib/pp.rb (PP.singleline_pp): new method.
 
-Sat Jul 29 06:12:06 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sun Dec  1 23:04:03 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/tk/lib/multi-tk.rb: freeze ip_name for security reason.
+	* lib/optparse.rb (OptionParser::new): same as OptionParser#on but
+	  returns new OptionParser::switch.
 
-Sat Jul 29 01:23:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Dec  1 22:43:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/logger.rb: improves the amount of documentation that Rdoc
-	  picks up when processing logger.rb by moving the require
-	  statement back before the comment block.  a patch from Hugh
-	  Sasse <hgs at dmu.ac.uk>.  [ruby-core:08422]
+	* win32/win32.c (rb_w32_stat): empty path is invalid, and return
+	  ENOENT rather than EBADF in such case.  [ruby-talk:57177]
 
-Thu Jul 27 22:21:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Nov 29 18:01:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* time.c (time_to_s): fixed format mismatch.
+	* pack.c (utf8_to_uv): added checks for malformed or redundant
+	  UTF-8 sequences.
 
-Thu Jul 27 21:19:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Nov 28 12:08:30 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* math.c (domain_check): a new function to check domain error
-	  explicitly for systems that return NaN like FreeBSD.
-	  [ruby-core:07019]
+	* 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.
 
-	* math.c (math_acos, math_asin, math_acosh, math_atanh, math_log,
-	  math_log10, math_sqrt): use domain_check().
+Thu Nov 28 02:40:42 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* math.c (math_sqrt): fix documentation flaw.
+	* 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.
 
-Thu Jul 27 18:12:12 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Nov 27 17:39:38 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* time.c: need to declare time_utc_offset.
+	* ext/syslog/syslog.c: Cut redundancy.
 
-Thu Jul 27 17:01:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/syslog/syslog.c: Do not leak ident.
 
-	* io.c (io_close): always calls "close" method of the receiver.
-	  [ruby-core:6911] [ruby-core:8112]
+Wed Nov 27 17:25:29 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Jul 27 16:49:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/syslog/syslog.c, ext/syslog/test.rb: Syslog.close should
+	  raise RuntimeError when not opened.
 
-	* time.c (time_to_s): use +0900 style timezone string for local time.
-	  [ruby-dev:29143]
+	* ext/syslog/syslog.c, ext/syslog/test.rb:
+	  Syslog.{ident,options,facility,mask} should all return nil when
+	  not opened.
 
-Thu Jul 27 16:41:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/syslog/syslog.c, ext/syslog/test.rb: Change back the output
+	  format of inspect().
 
-	* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
-	  Solaris compiler.  [ruby-core:08114]
+Wed Nov 27 16:25:43 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Jul 26 22:20:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/digest/test.rb: Switch from RUnit to Test::Unit.
 
-	* configure.in: add support for as and ASFLAGS.  [ruby-dev:29138]
+Wed Nov 27 16:14:12 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Jul 26 22:13:45 2006  Minero Aoki  <aamine@loveruby.net>
+	* ext/syslog/syslog.c: Fix a problem where Syslog.ident was not
+	  marked and could thus be GC'd.
 
-	* lib/net/http.rb: sync with HEAD (rev 1.132).
+Wed Nov 27 16:11:53 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/net/http.rb (Net::HTTP#post, request_post, request): should
-	  set Content-Type: x-www-form-urlencoded by default.
+	* ext/syslog/test.rb: Switch from RUnit to Test::Unit.
 
-	* lib/net/http.rb (Net::HTTPHeader#content_type): should return
-	  nil when there's no Content-Type.
+	* ext/syslog/test.rb: The output format of inspect() is slightly
+	  altered.
 
-	* lib/net/http.rb (Net::HTTPHeader#sub_type): should return nil
-	  when there's no sub Content-Type (e.g. "Content-Type: text").
+Wed Nov 27 06:43:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/net/http.rb (Net::HTTPHeader#type_params): wrongly failed
-	  when there's no Content-Type.
+	* error.c (exit_initialize): add SystemExit#initialize to set
+	  instance variable status.  (ruby-bugs-ja:PR#362)
+	  Now accepts status as optional first argument.
 
-Wed Jul 26 18:35:38 2006  Minero Aoki  <aamine@loveruby.net>
+	* eval.c (error_handle): now SystemExit have status always.
 
-	* ext/strscan/strscan.c: sync with HEAD (rev 1.25).
+	* eval.c (system_exit): just instantiate SystemExit without raise.
 
-	* ext/strscan/strscan.c (strscan_do_scan):
-	  StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
+	* eval.c (rb_thread_start_0): initialize SystemExit properly.
 
-Wed Jul 26 18:14:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Nov 26 10:17:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/pty/pty.c (getDevice): retry once after GC on failure.
-	  [ruby-core:08282]
+	* dln.c (init_funcname_len): remove MAXPATHLEN dependency.
 
-Wed Jul 26 17:28:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Nov 25 19:55:38 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* sprintf.c (rb_f_sprintf): prepend ".." to %u for negative bignum,
-	  but not "-".  fixed: [ruby-core:08167]
+	* ext/extmk.rb (extmake): return true if not dynamic and not static.
 
-Wed Jul 26 16:39:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Nov 25 01:08:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* string.c (rb_str_scan): add string modification check.
-	  [ruby-core:7216]
+	* dln.c: revert and add the MAXPATHLEN definition on mswin32/mingw32.
 
-Wed Jul 26 16:06:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Nov 24 20:36:53 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): check
-	  multipart boundary end.  a patch from Fujioka <fuj at rabbix.jp>
-	  [ruby-dev:28470]
+	* dln.c: move the MAXPATHLEN definition in front.
 
-Wed Jul 26 01:02:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Nov 22 22:55:01 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in: suppress warnings by automake 1.8 or later.
+	* sprintf.c (rb_f_sprintf): preceding ".." for negative
+	  hexadecimal numbers should not appear if prec (e.g. %.4) is
+	  specified.
 
-Tue Jul 25 00:30:06 2006  Eric Hodel  <drbrain@segment7.net>
+	* pack.c (NUM2I32): support platforms which does not have 32bit
+	  integers (e.g. Cray).
 
-	* lib/prettyprint.rb: RD to RDoc conversion by Hugh Sasse.
+Fri Nov 22 19:20:36 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Jul 25 14:49:51 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* instruby.rb: Install batch files on Windows. [Submitted by usa]
 
-	* lib/mkmf.rb (configuration): typo.
+Fri Nov 22 18:31:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Jul 25 13:14:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_add_method): node may be NULL.
 
-	* process.c (rb_proc_times): rename hz to hertz to avoid name
-	  crash on AIX.  [ruby-dev:29126]
+Thu Nov 21 20:53:06 2002  Minero Aoki  <aamine@loveruby.net>
 
-Mon Jul 24 22:03:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/smtp.rb: changes coding style.
 
-	* eval.c (backtrace): skip frames successive on node and method name.
+	* lib/net/pop.rb: ditto.
 
-Mon Jul 24 17:55:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/protocol.rb: ditto.
 
-	* process.c (rb_f_system): add security check.  [ruby-talk:202947]
+Thu Nov 21 20:17:08 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* process.c (rb_f_system): move signal right before fork to avoid
-	  signal handler intervention.
+	* lib/net/http.rb: changes coding style.
 
-Mon Jul 24 15:51:52 2006  Tanaka Akira  <akr@fsij.org>
+Thu Nov 21 20:04:06 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/readline/readline.c (readline_readline): rl_deprep_term_function
-	  may be NULL with libedit.  reported by Ryan Davis.  [ruby-dev:29070]
+	* lib/net/http.rb: should not overwrite Host: header.
+	  (This patch is contributed by sean@ruby-lang.org)
 
-Mon Jul 24 15:19:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Nov 21 20:01:33 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* eval.c (rb_call0): revert last change.  [ruby-dev:29112]
-	  [ruby-core:08374]
+	* lib/net/http.rb: support Proxy-Authorization.
+	(This patch is contributed by Alexander Bokovoy)
 
-Sun Jul 23 22:59:49 2006  Tanaka Akira  <akr@fsij.org>
+Thu Nov 21 11:03:39 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/socket/test_unix.rb: disabled on cygwin.
-	  reported by Kouhei Yanagita.  [ruby-dev:29080]
+	* file.c (rb_find_file_ext): should not terminate searching with
+	  empty path, just ignore.
 
-Fri Jul 21 21:21:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c: remove <sys/parm.h> inclusion.
 
-	* eval.c (rb_call0): include funcalled methods in caller list.
-	  fixed: [ruby-core:08290]
+Wed Nov 20 02:07:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jul 21 12:11:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* compar.c (cmp_eq,cmp_gt,cmp_ge,cmp_lt,cmp_le): check using
+	  rb_cmpint().
 
-	* ext/extmk.rb, lib/mkmf.rb (with_destdir): remove drive letter before
-	  prepending destdir on DOSISH.
+	* error.c (init_syserr): remove sys_nerr dependency.
 
-Thu Jul 20 15:07:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Nov 20 01:52:21 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ruby.h: export classes/modules to implement sandbox.
-	  [ruby-core:08283]
+	* numeric.c (num_cmp): added to satisfy Comparable assumption.
 
-Thu Jul 20 00:06:29 2006  Keiju Ishitsuka  <keiju@ishitsuka.com>
+	* eval.c (rb_add_method): "initialize" should be public if it is a
+	  singleton method.
 
-	* lib/irb/completion.rb: support for completion of numeric
-    	  number. [ruby-dev: 29038]
+Tue Nov 19 22:37:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Jul 19 23:53:05 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* regex.c (re_match): avoid dereferencing if size == 0.
+	  (ruby-bugs-ja:PR#360)
 
-	* lib/rss/parser.rb, lib/rss/utils.rb: added documents.
+Tue Nov 19 20:40:39 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Jul 18 22:10:13 2006  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)
 
-	* process.c (rb_f_system): block SIGCHLD during the process
-	  execution, like glibc system(3) does.  [ruby-talk:202361]
+	* file.c (rb_stat_cmp): should return nil if an operand is not
+	  File::Stat.
 
-Tue Jul 18 23:12:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov 19 14:35:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c (open_ifs_socket): should not use plain malloc.
+	* 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.
 
-	* win32/win32.c (rb_w32_opendir): should not use plain realloc.
+	* enum.c (zip_i): changed for new behavior.
 
-Tue Jul 18 18:05:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_transpose): added. [new]
 
-	* test/ruby/test_float.rb (TestFloat::test_strtod): update test to
-	  conform strtod change.
+Tue Nov 19 05:12:21 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Jul 18 15:49:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* instruby.rb: Do not install various working files under bin/.
 
-	* pack.c (pack_unpack): propagate association array to copied
-	  string.  [ruby-core:08223]
+Tue Nov 19 05:07:39 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* pack.c (pack_unpack): return referenced string itself if it has
-	  same length as specified.  a patch from <nobu at ruby-lang.org>
-	  in [ruby-core:08225].
+	* instruby.rb: not rewrite installed scripts when dry-run mode.
 
-	* pack.c (pack_pack): taint 'p' packed strings.
+	* lib/ostruct.rb (OpenStruct::initialize): should symbolize keys
+	  instead of values.
 
-Tue Jul 18 14:03:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov 19 02:24:10 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer::unmount): remove
-	  inpect argument from sprintf.  [ruby-dev:29039]
+	* instruby.rb: Rewrite installed scripts' shebang lines.
 
-Tue Jul 18 10:53:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* instruby.rb: Use File.join() where appropriate.
 
-	* object.c (rb_cstr_to_dbl): limit out-of-range message.
+Tue Nov 19 01:53:35 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* util.c (ruby_strtod): return end pointer even if ERANGE occurred.
-	  fixed: [ruby-dev:29041]
+	* bin/irb: Moved from sample/irb.rb.
 
-Mon Jul 18 00:43:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* instruby.rb: Install script files under bin/ with ruby's program
+	  prefix and suffix.
 
-	* util.c (ruby_strtod): stop at dot not followed by digits.
-	  fixed: [ruby-dev:29035]
+Mon Nov 18 02:13:36 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Jul 18 00:01:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/tempfile.rb: Make this library thread safe.
 
-	* ext/extmk.rb: remove LIBRUBY_SO if static linked extensions exist.
+	* lib/tempfile.rb: Do not pick a name which was once used and is
+	  still scheduled for removal.
 
-Mon Jul 17 23:30:46 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/tempfile.rb: A lock file need not and must not be scheduled
+	  for removal.
 
-	* configure.in (rb_cv_msvcrt): defaulted to msvcrt.  Workaround for a
-	  bug of cygwin 1.5.20.
+	* lib/tempfile.rb: Compare Max_try with the number of mkdir
+	  failures instead of the suffix counter.
 
-Mon Jul 17 13:43:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/tempfile.rb: Overall cleanup and add some important notices.
 
-	* pack.c (define_swapx): should not use plain malloc.
+Sun Nov 17 22:57:31 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon Jul 17 12:58:41 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* parse.y (dsym): garbage returned.  (ruby-bugs-ja:PR#358)
 
-	* configure.in: should use ac_cv_lib_dl_dlopen=no on MinGW.
+Fri Nov 15 07:40:08 2002  NAKAMURA Hiroshi  <nakahiro@sarion.co.jp>
 
-Sat Jul 15 23:50:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* observer.rb: raise NoMethodError instead of NameError.
+	  [ruby-dev:18788]
 
-	* eval.c (rb_require_safe): wait for another thread requiring the same
-	  feature.  fixed: [ruby-core:08229]
+	* ostruct.rb: ditto.  fix a bug in inspect which called String#+ with
+	  Symbol.  [ruby-dev:18788]
 
-Sat Jul 15 01:27:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* profile.rb: illegal use of Array#sort!.  replaced it with non-bang
+	  method.  [ruby-dev:18792]
 
-	* dir.c (has_magic): glob names contain alphabets to enable case fold
-	  search also for directories.  fixed: [ruby-talk:201917]
+Thu Nov 14 22:40:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Sat Jul 15 01:09:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in (LIBRUBY_A): append -static.  [ruby-dev:18689]
 
-	* st.c (malloc): use xmalloc/xcalloc instead of plain
-	  malloc/calloc, to detect memory allocation failure.  see
-	  <http://www.nongnu.org/failmalloc/>.
+	* configure.in (LIBRUBYARG_STATIC, LIBRUBYARG_SHARED): linker
+	  argument to link static/shared library respectively.
 
-	* gc.c (rb_memerror): should not raise empty nomem_error.
+	* Makefile.in (LIBRUBYARG_STATIC, LIBRUBYARG_SHARED): added.
 
-Fri Jul 14 13:08:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bcc32/Makefile.sub, win32/Makefile.sub: ditto.
 
-	* ext/tk/lib/tk.rb: add methods for new features of latest Tcl/Tk8.5.
+	* instruby.rb (LIBRUBY_A): install to libdir.
 
-	* ext/tk/lib/tk/namespace.rb: ditto.
+	* lib/mkmf.rb (link_command): link static library of ruby, or
+	  try_run fails unless LIBRUBY_SO is installed.  [ruby-dev:18646]
 
-Fri Jul 14 02:30:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (call_trace_func): toplevel caller was missing.
+	  [ruby-dev:18754]
 
-	* lib/monitor.rb: document patch from Hugh Sasse <hgs at dmu.ac.uk>.
-	  [ruby-core:08205]
+	* eval.c (proc_to_s): adjust created line number.
 
-Fri Jul 14 01:09:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (primary, do_block, brace_block): adjust line number of
+	  block to beginning line, instead of the first statement inside
+	  the block.
 
-	* parse.y (then): error in warning action.
+Thu Nov 14 08:23:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jul 14 00:10:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* math.c (math_acos): check errno after operation.  ditto for
+	  asin, acosh, atanh, log, log10 and sqrt.
 
-	* array.c (rb_ary_pop): may cause realloc oscillation.  a patch
-	  from MORITA Naoyuki <mlgetter at kidou.sakura.ne.jp>.
-	  [ruby-dev:29028]
+	* eval.c (rb_add_method): initialize should always be private.
 
-Thu Jul 13 22:23:56 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* parse.y (expr): add rescue modifier rule.
 
-	* ext/tk/lib/tk/composite.rb: improve handling of the classname on the
-	  option database for the widget class which includes TkComposite.
+	* parse.y (command_call): return, break and next with argument is
+	  now part of this rule.
 
-Thu Jul 13 20:32:19 2006  Kouhei Sutou  <kou@cozmixng.org>
+Wed Nov 13 16:22:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/rss/parser.rb: updated documents by a patch from
-	Hugh Sasse <hgs at dmu.ac.uk>. [ruby-core:8194]
+	* 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]
 
-Wed Jul 12 13:54:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/extmk.rb (extmake): ditto.
 
-	* parse.y (then): we'd like to reserve colon here for the future.
-	  warning added.
+	* ext/extmk.rb (extmake): exit when make failed.
 
-Tue Jul 11 20:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Nov 10 03:46:18 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ruby.h: export rb_cMethod.  [ruby-talk:201259]
+	* lib/set.rb: retire contain?() and add superset?(),
+	  proper_superset?() subset?(), and proper_subset?().
+	  [obtained from: Jason Voegele's set.rb]
 
-Tue Jul 11 19:13:33 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/set.rb: define several aliases: union() for |(),
+	  difference() for -(), ande intersection() for &().
+	  [obtained from: Jason Voegele's set.rb]
 
-	* ext/tk/lib/multi-tk.rb: remove restriction on the class of
-	  pseudo-toplevel.
+	* lib/set.rb: deal with a s/id/object_id/ leftover.
 
-Tue Jul 11 18:00:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Nov  9 16:06:57 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: security fix.
+	* ext/tcltklib/stubs.c: should include "util.h" for ruby_strdup.
 
-Tue Jul 11 17:33:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Nov  9 11:39:45 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* string.c (rb_str_dump): need to extend len for \b.
+	* eval.c: remove ENABLE_TRACE/DISABLE_TRACE to trace child nodes of
+	  c-call. [ruby-dev:18699]
 
-Mon Jul 10 22:00:00 2006  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Fri Nov  8 04:16:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/bigdecimal/bigdecimal.c: Allows '_' to appear within
-	  digits.  [ruby-dev:28872]
+	* parse.y (yylex): "a" in "a /5" should be considered as a local
+	  variable. [experimental]
 
-	* ext/bigdecimal/lib/bigdecimal/util.rb: Bug in to_r reported by
-	  [ruby-list:42533] fixed.
+Thu Nov  7 09:51:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon Jul 10 19:22:19 2006  Tanaka Akira  <akr@fsij.org>
+	* eval.c (rb_yield_0): should enable trace for non-cfunc nodes.
+	  [ruby-dev:18645]
 
-	* gc.c (gc_sweep): expand heap earlier.
-	  reported by MORITA Naoyuki.  [ruby-dev:28960]
+	* eval.c (blk_orphan): a block created in a different thread is
+	  orphan.  [ruby-dev:17471]
 
-Mon Jul 10 18:59:34 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Nov  6 16:57:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/font.rb: sorry. mistaken to patch.
+	* 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.
 
-Mon Jul 10 18:46:52 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_eval): nosuper should not be inherited unless the
+	  overwritten method is an undef placeholder.
 
-	* ext/tk/tcltklib.c: make SEGV risk lower at exit.
+Tue Nov  5 00:46:04 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/tk/lib/tk.rb: ditto.
+	* ext/extmk.rb: Properly pass the given target to
+	  make(1). [pointed out by eban]
 
-	* ext/tk/lib/multi-tk.rb: fail to call function-style methods on slave
-	  interpreters. The strategy (MultiTkIp_PseudoToplevel_Evaluable) to
-	  fix the problem is a little tricky. You may have to take care of
-	  conflicting with it.
+Mon Nov  4 20:03:53 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: a little change for the pseudo-toplevel strategy.
+	* instruby.rb, lib/mkmf.rb: use CONFIG["ENABLE_SHARED"] instead of
+	  checking whether CONFIG["configure-args"] includes "--enable-shared".
 
-	* ext/tk/lib/tk/font.rb: ditto.
+Mon Nov  4 16:49:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/msgcat.rb: ditto.
+	* parse.y (primary): allow 'when'-less case statement; persuaded
+	  by Sean Chittenden.
 
-	* ext/tk/lib/tkextlib/itk/incr_tk.rb: ditto.
+Mon Nov  4 06:28:09 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/tk/sample/demos-en/widget: fail to call function-style methods
-	  on sample scripts. To fix it, a strategy which similar to the way
-	  on MultiTiIp is used. Please take care when re-write and re-run a
-	  demo script on the Widget-Demo code viewer.
+	* 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]
 
-	* ext/tk/sample/demos-jp/widget: ditto.
+Mon Nov  4 03:59:51 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Jul 10 13:58:40 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* 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.
 
-	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
-	  sigsend_to_ruby_thread, install_nativethread_sighandler):
-	  nativethread-support on signal handler. RE-backport from 1.9.
+Sat Nov  2 00:38:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
+	* object.c (Init_Object): added Object#object_id, new name for
+	  Object#id. [new]
 
-	* eval.c (ruby_native_thread_kill): ditto.
+	* object.c (rb_obj_id_obsolete): give warning for Object#id.
 
-Mon Jul 10 10:54:14 2006  Ryan Davis  <ryand@zenspider.com>
+	* numeric.c (fix_intern): added Fixnum#to_sym. [new]
 
-	* lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro
-	  Morikawa including new file suffixes, function support, public
-	  variables and constants, derived-types, defined operators and
-	  assignments, namelists, and subroutine and function
-	  arguments. Truly massive.
+	* object.c (sym_to_sym): rename from Symbol#intern
 
-	* lib/rdoc/diagram.rb: diagrams are now cached.
+Fri Nov  1 14:21:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/irb/completion.rb: fixed a crasher when completing against
-	  an unnamed class/module.
+	* enum.c (enum_zip): added Enumerable#zip. [new]
 
-	* lib/rdoc/parsers/parse_c.rb: private comment (--/++) support in
-	  C-file rdoc.
+	* array.c (rb_ary_zip): added Array#zip.
 
-	* lib/debug.rb: minor clarification in help.
+Thu Oct 31 20:10:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/pp.rb: minor clarification on exception.
+	* error.c (init_syserr): remove sys_nerr dependency.
 
-Mon Jul 10 09:29:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Oct 31 09:31:51 2002  K.Kosako  <kosako@sofnec.co.jp>
 
-	* eval.c (rb_clear_cache_for_undef): clear entries for included
-	  module.  fixed: [ruby-core:08180]
+	* eval.c (rb_export_method): undef'ed method visibility should not
+	  be changed.
 
-Mon Jul 10 01:48:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Oct 30 17:00:47 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* st.h (st_data_t): use pointer sized integer for st_data_t.
-	  [ruby-dev:28988]
+	* eval.c (rb_mod_public_method_defined, etc.): new methods:
+	  public_method_defined?, private_method_defined?,
+	  protected_method_defined?
 
-Sun Jul  9 18:06:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (rb_obj_public_methods): new method
+	  Object#public_methods.
 
-	* lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
+	* class.c (ins_methods_i): Object#methods should list both public
+	  and protected methods.
 
-	* lib/mkmf.rb (create_makefile): prevent substitution of macro
-	  definition.  fixed: http://www.yotabanana.com/lab/20060624.html#p02
+	* class.c (rb_class_public_instance_methods): new method
+	  Module#public_instance_methods.
 
-Sun Jul  9 00:54:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct 30 06:29:00 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* eval.c (next_jump): deal with destination of next.
-	  fixed: [ruby-core:08169]
+	* 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.
 
-Fri Jul  7 00:38:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Oct 30 04:07:33 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* hash.c (rb_hash_default): should not call default procedure if
-	  no key is given.  [ruby-list:42541]
+	* eval.c (error_print, rb_longjmp, rb_thread_schedule): flush
+	  error message.  [ruby-dev:18582]
 
-Fri Jul  7 00:29:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (ruby_cleanup): added.  just clean up without exit.
+	  [ruby-dev:18582]
 
-	* time.c (time_mload): a patch from Daniel Berger
-	  <Daniel.Berger at qwest.com>.  [ruby-core:08128]
+	* eval.c (ruby_exec): added.  execute main evaluation tree without
+	  exit.  [ruby-dev:18582]
 
-Thu Jul  6 22:21:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* intern.h: prototypes; ruby_cleanup, ruby_exec
 
-	* process.c (rb_proc_times): use sysconf(_SC_CLK_TCK) value prior to
-	  HZ and CLK_TCK.  fixed: [ruby-talk:200293]
+Tue Oct 29 02:00:08 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Jul  6 22:17:21 2006  Minero Aoki  <aamine@loveruby.net>
+	* ext/extmk.rb (extmake): use dummy_makefile to create dummy
+	  Makefile.
 
-	* ext/racc/cparse/cparse.c: sync with original code, rev 1.8.
+	* lib/mkmf.rb (find_executable0): EXEEXT is optional.
 
-	* ext/racc/cparse/cparse.c: should mark CparseParams objects.
+	* lib/mkmf.rb (dummy_makefile): make dummy Makefile content.
 
-	* lib/racc/parser.rb: sync with original code, rev 1.8.
+	* lib/mkmf.rb (create_makefile): define EXTLIB replacing -l.
 
-	* lib/racc/parser.rb: update coding style.
+	* lib/mkmf.rb ($bccwin): detect Borland make by help message.
 
-Mon Jul  3 19:04:38 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/mkmf.rb (CLEANINGS): common rules to clean.
 
-	* ext/tk/tcltklib.c (ip_make_menu_embeddable): help to make a menu
-	  widget embeddable (pack, grid, and so on) like as a general widget.
-	  However, an embeddable menu may require to be definied some event
-	  bindings for general use.
+Mon Oct 28 01:27:17 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/lib/tk/event.rb: [bug fix] Tk.callback_break and
-	  Tk.callback_continue don't work on MultiTkIp.
+	* djgpp/config.sed (@program_transform_name@): use `%', not `,'.
 
-	* ext/tk/lib/multi-tk.rb: ditto.
+Sun Oct 27 22:59:50 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-	* ext/tk/lib/tk.rb: lack of Tk.callback_return.
+	* ext/extmk.rb(78) : The unnecessary error when installing by bccwin32
+	                     is controlled. 
 
-	* ext/tk/lib/tk/menu.rb: improve creating clone menus.
+	* lib/mkmf.rb(773) : Also in the case of bccwin32, the path was added.
 
-Mon Jul  3 14:42:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Oct 27 17:07:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/etc/extconf.rb (PW_UID2VAL, PW_GID2VAL): defaulted to conversion
-	  from int, and sys/types.h needs to be included before grp.h.
-	  fixed: [ruby-dev:28938]
+	* djgpp/*: sync with the latest.
 
-Mon Jul  3 01:14:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/extmk.rb, lib/mkmf.rb: flush $stdout.
 
-	* string.c (rb_str_inspect): encode \b (\010) for escape.
-	  [ruby-dev:28927]
+	* io.c (READ_DATA_PENDING_COUNT, READ_DATA_PENDING_PTR):
+	  undef these macros on DJGPP.
 
-	* string.c (rb_str_dump): ditto.
+Sat Oct 26 10:11:47 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Jul  2 19:17:56 2006  Minero Aoki  <aamine@loveruby.net>
+	* node.h (nd_type): cast the value to int.
 
-	* ext/racc/cparse/cparse.c: sync with original code (rev 1.7).
+Sat Oct 26 04:27:35 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/racc/cparse/cparse.c: use rb_catch instead of rb_iterate.
-	  Giving a block to a Ruby-level method by rb_iterate is obsolete on
-	  Ruby 1.9.  Note that current cparse.c still includes one
-	  rb_iterate call on Ruby 1.8, but it is not a problem (at least
-	  just now).
+	* ext/dbm/dbm.c (fdbm_indexes, fdbm_select): add a missing
+	  argument and prevent coredump when a nonexistent key is
+	  specified.
 
-Sat Jul  1 15:15:49 2006  Tanaka Akira  <akr@m17n.org>
+	* ext/sdbm/init.c (fsdbm_indexes, fsdbm_select): ditto.
 
-	* test/socket/test_nonblock.rb: add timeout to send/receive
-	  an empty UDP packet.
-	  [ruby-dev:28820]
+Sat Oct 26 03:28:43 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Jun 30 23:46:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c, gc.c: use a common set of alloca() #ifdef's.  This fixes
+	  the build with Intel C Compiler for Linux.
 
-	* configure.in: should test isinf for Solaris with GCC compiler.
-	  a patch from <ville.mattila at stonesoft.com>.  [ruby-core:07791]
+	* eval.c (rb_f_require): declare old_func with a real type, not
+	  just type modifiers.
 
-	* configure.in: -shared patch from Andrew Morrow
-	  <andrew.c.morrow at gmail.com>.  [ruby-core:08100]
+Fri Oct 25 02:55:01 2002  Minero Aoki  <aamine@loveruby.net>
 
-Thu Jun 29 18:58:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_split_m): RSTRING(str)->ptr might become NULL.
+	  [ruby-dev:18581]
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_version): fix patch
-	  failure.
+Thu Oct 24 21:57:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Jun 29 18:00:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in (LIBPATHFLAG): avoid $ substitution.
+	  [ruby-dev:18577]
 
-	* ext/bigdecimal/bigdecimal.c: add RDoc document.  a patch from
-	  mathew <meta at pobox.com>.   [ruby-core:07050]
+	* ext/extmk.rb (extmake): expand $srcdir.
 
-Wed Jun 28 15:47:14 2006  Eric Hodel  <drbrain@segment7.net>
+	* ext/win32ole/extconf.rb: should not override $CFLAGS, but
+	  append.
 
-	* lib/optparse.rb: RDoc patch from Robin Stocker <robin@nibor.org>
-	  [ruby-core:08087]
+	* lib/mkmf.rb (config_string): use given config hash.
 
-Wed Jun 28 19:04:34 2006  Tanaka Akira  <akr@m17n.org>
+	* bcc32/Makefile.sub (.rc.res): directory part may be empty in
+	  Borland make.
 
-	* test/socket/test_unix.rb: test_seqpacket_pair removed.
-	  [ruby-dev:28846]
+Thu Oct 24 03:38:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Tue Jun 27 23:03:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb (create_makefile): site-install target for backward
+	  compatibility.
 
-	* string.c: RDoc update for =~ method.  a patch from Alex Young
-	  <alex at blackkettle.org>.  [ruby-core:08068]
+	* lib/mkmf.rb (init_mkmf): libdir prior to topdir.
 
-Tue Jun 27 22:47:18 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* configure.in (LIBPATHFLAG): should escape $.  [ruby-dev:18572]
 
-	* ext/tk/tcltklib.c: forgot to update TCLTKLIB_RELEASE_DATE.
+	* mkconfig.rb: never substute escaped $$.
 
-	* ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] sometimes fail to convert
-	  a tcl string to a ruby object if the tcl string includes "\n".
+	* instruby.rb: not install LIBRUBY_SO unless enable-shared.
+	  [ruby-dev:18569]
 
-Tue Jun 27 16:04:05 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Oct 23 19:16:06 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* win32/win32.h: define isascii on MinGW for msvcrt compatibility.
+	* eval.c (rb_eval): added NODE_DSYM, symbol literal with
+	  interpolation.
 
-	* configure.in: set ac_cv_header_sys_time_h=no on MinGW
-	  for msvcrt compatibility.
+	* node.h: ditto.
 
-Tue Jun 27 11:36:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* intern.h: prototypes; rb_is_junk_id, rb_str_dump, rb_str_intern
 
-	* ext/etc/etc.c (setup_passwd, setup_group): allow bignum uid, gid and
-	  so on.  [ruby-talk:199102]
+	* object.c (sym_inspect): escape and quote for non-alphanumeric
+	  symbols.
 
-Mon Jun 26 13:37:27 2006  Eric Hodel  <drbrain@segment7.net>
+	* parse.y (dsym, tokadd_string, yylex): extended symbol literals.
 
-	* lib/rdoc: Merge from HEAD.
-	  Add options to limit the ri search path.
+	* parse.y (rb_is_junk_id): added.
 
-Tue Jun 27 00:54:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_dump, rb_str_intern) : make extern.
 
-	* util.c (powersOf10): constified.
+	* lib/mkmf.rb (create_makefile): deffile should be removed by
+	  distclean, not clean.
 
-Mon Jun 26 18:37:44 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Oct 22 23:56:41 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is
-	  deleted on callback.
+	* lib/mkmf.rb (init_mkmf): add dir_config("opt").
 
-Mon Jun 26 10:47:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Oct 22 19:44:03 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-	* io.c (pipe_open): avoid closing uninitialized file descriptors.
-	  a patch from <tommy at tmtm.org> [ruby-dev:28600]
+	* bcc32/configure.bat : The command line when calling setup.mak is 
+	                        corrected. 
 
-Mon Jun 26 09:56:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bcc32/readme.bcc32 : It follows up about the option of configure.bat.
 
-	* win32/win32.[ch] (rb_w32_send, rb_w32_sendto): constified.
+Tue Oct 22 15:23:19 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Sun Jun 25 23:02:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* instruby.rb: add dryrun mode.
 
-	* Makefile.in, mkconfig.rb: catch-up for latest autoconf.
+	* ext/extmk.rb (extmake): add install: target to dummy Makefile.
 
-Sat Jun 24 06:35:00 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/extmk.rb (extmake): avoid Borland make's quirk behavior.
 
-	* signal.c: revert last change.
+	* lib/mkmf.rb (link_command): opt is not a makefile macro.
 
-	* ruby.h: ditto.
+	* 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 comile 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
+	  excutable 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 qoute.
+
+	* lib/mkmf.rb (cpp_include): make include directives.
+
+	* lib/mkmf.rb (try_func): try wheather 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.
 
-	* eval.c: ditto.
+	* ext/dl/extconf.rb: use try_cpp to cross compile.
 
-Thu Jun 22 11:52:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/dl/extconf.rb: not modify files in source directory.
 
-	* lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
-	  HTTPInternalServerError should be error 500.  [ruby-core:08037]
+Fri Oct 18 23:11:21 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Jun 22 05:15:58 2006  Tanaka Akira  <akr@m17n.org>
+	* parse.y (value_expr0): allow return/break/next/redo/retry in rhs
+	  of logical operator.  [ruby-dev:18534]
 
-	* ext/socket/socket.c (sock_s_socketpair): try GC only once.
-	  [ruby-dev:28778]
+	* parse.y (remove_begin): eliminate useless NODE_BEGIN.
+	  [ruby-dev:18535]
 
-Wed Jun 21 21:28:32 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Fri Oct 18 01:02:44 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/date.rb (jd_to_commercial): now works fine even if in
-	  mathn-ized context.
+	* hash.c, eval.c: Use (*_NSGetEnviron()) instead of environ on
+	  Darwin for namespace cleanness.  [ruby-core:00537]
 
-Wed Jun 21 17:32:31 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* 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]
 
-	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
-	  sigsend_to_ruby_thread, install_nativethread_sighandler):
-	  nativethread-support on signal handler (backport from 1.9).
+Thu Oct 17 19:17:56 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
+	* marshal.c (w_byten): added; write n bytes from s to arg.
 
-	* eval.c (ruby_native_thread_kill): ditto.
+	* marshal.c (dump): flush buffered data.
 
-Wed Jun 21 08:39:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c (marshal_dump, r_byte, r_bytes0, marshal_load): unify
+	  marshaling I/O.  [ruby-talk:53368]
 
-	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
-	  and Time processing.  [ruby-core:08033]
+Thu Oct 17 12:58:24 2002  Minero Aoki  <aamine@loveruby.net>
 
-Wed Jun 21 01:40:25 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/fileutils.rb: stat.blksize might be 0/nil.
 
-	* parse.y (yylex, reswords): modifier token is no longer returned in
-	  fname state.  [ruby-dev:28775]
+	* lib/fileutils.rb: change coding style.
 
-Wed Jun 21 01:12:46 2006  Kouhei Sutou  <kou@cozmixng.org>
+Wed Oct 16 22:35:53 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer
-	  supported date type.
+	* 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]
 
-Tue Jun 20 22:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
+Wed Oct 16 13:36:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* test/rss/test_parser.rb: split parser tests into ...
-	* test/rss/test_parser_1.0.rb: ... RSS 1.0 parsing tests and ...
-	* test/rss/test_parser_2.0.rb: ... RSS 2.0 parsing tests.
+	* variable.c (rb_global_entry): not add global entry until
+	  initialized to avoid accessing it while GC.  [ruby-dev:18514]
 
-Tue Jun 20 21:19:06 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* variable.c (rb_alias_variable): ditto.
 
-	* lib/rss/rss.rb: provided default RSS::Element#children.
+Wed Oct 16 01:03:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/0.9.rb: used default RSS::Element#children.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
+	* object.c (rb_str_to_dbl): RString ptr might be NULL.
 
-Tue Jun 20 21:04:33 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* object.c (rb_cstr_to_dbl): p pointer might be NULL.
 
-	* lib/rss/rss.rb: provided default RSS::Element#_tags.
+	* bignum.c (rb_str_to_inum): RString ptr might be NULL.
 
-	* lib/rss/0.9.rb: used default RSS::Element#_tags.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
+	* bignum.c (rb_cstr_to_inum): str pointer might be NULL.
 
-Tue Jun 20 20:47:07 2006  Kouhei Sutou  <kou@cozmixng.org>
+Sat Oct 12 23:44:11 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/rss/rss.rb: hide RSS::Element.install_model.
-	  (RSS::Element.install_have_child_element,
-	   RSS::Element.install_have_children_element,
-	   RSS::Element.install_text_element,
-	   RSS::Element.install_date_element): call
-	  RSS::Element.install_model internally.
+	* win32/win32.c (rb_w32_putc): wrong condition to fill or flush on
+	  bccwin32.  [ruby-win32:408]
 
-	* lib/rss/0.9.rb: followed new API.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+Fri Oct 11 15:58:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Jun 20 20:18:05 2006  GOTOU Yuuzou  <gotoyuzo@notwork.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]
 
-	* ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
+Fri Oct 11 06:05:30 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
-	  OpenSSL::Cipher.ciphers. it returns all the cipher names.
+	* win32/win32.c (rb_w32_fclose, rb_w32_close): use closesocket()
+	  for socket.  [ruby-win32:382]
 
-	* ext/openssl/lib/openssl/cipher.rb:
-	  - add constants AES128, AES192, AES256. [ruby-dev:28610]
-	  - reimplement without eval()
+	* win32/win32.c (StartSockets): set NtSocketsInitialized.
 
-	* ext/openssl/lib/openssl/digest.rb: reimplement without eval().
+	* win32/win32.h: prototypes; rb_w32_fclose, rb_w32_close
 
-	* test/openssl/test_cipher.rb, test_digest: fix about reimplemented
-	  features.
+Fri Oct 11 00:24:57 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* sample/openssl/cipher.rb: rewrite all.
+	* gc.c (ruby_xmalloc, ruby_xrealloc): restrict total allocation
+	  size according to memories consumed by live objects.
+	  [ruby-dev:18482]
 
-Sat Jun 19 11:21:46 2006  Eric Hodel  <drbrain@segment7.net>
+	* gc.c (gc_sweep): estimate how live objects consume memories.
 
-	* lib/test/unit/assertions.rb: Merge RDoc from HEAD.
+Thu Oct 10 17:26:12 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Jun 20 01:06:57 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* ext/tcltklib/stubs.c (ruby_tcltk_stubs): fix memory leak.
+	  [ruby-dev:18478]
 
-	* lib/rss/rss.rb:
-	  - cleanup validation mechanism. Now, #XXX_validation is
-	    needless.
-	  - changed internal variable name RSS::Element::MODEL to
-	    RSS::Element::MODELS.
-	  - RSS::Element.install_model requires uri.
+Thu Oct 10 15:20:18 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/rss/0.9.rb: followed new validation API.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+	* lib/weakref.rb (WeakRef::@@final): use Hash#delete.
 
-Mon Jun 19 23:40:59 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/weakref.rb (WeakRef::__getobj__): examin if alive or not by
+	  ID_REV_MAP to deal with recycled object.  [ruby-dev:18472]
 
-	* ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
+	* lib/weakref.rb (WeakRef::weakref_alive?): ditto.
 
-	* ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
-	  imported nkf 2.0.7.
+Wed Oct  9 07:11:25 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon Jun 19 22:31:59 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* gc.c (gc_sweep): also adjust heaps_limits when free unused heap
+	  page.  [ruby-core:00526]
 
-	* lib/rss/rss.rb:
-	  - provided default #to_s as RSS::Element#to_s.
-	  - removed RSS::Element#other_element.
-	  - RSS::Element#tag requires attributes as Hash instead of Array.
+	* io.c (io_fflush): condition to retry can occur.
 
-	* lib/rss/0.9.rb: removed #to_s to use RSS::Element#to_s.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+	* io.c (io_write): returned 0 wrongly if no error occurred.
 
-	* lib/rss/2.0.rb: removed #other_element.
+Tue Oct  8 14:19:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon Jun 19 22:09:16 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* io.c (io_write): must check returned value from fwrite() before
+	  test with ferror().  (ruby-bugs-ja:PR#350)
 
-	* ext/win32ole/win32ole.c(ole_invoke): support some kind of
-	  method of word. [ruby-Bugs#3237]
+Tue Oct  8 10:55:23 2002  Tanaka Akira  <akr@m17n.org>
 
-	* ext/win32ole/tests/test_word.rb: ditto.
+	* lib/prettyprint.rb (PrettyPrint.singleline_format): new method.
 
-	* ext/win32ole/tests/testall.rb: ditto.
+Mon Oct  7 16:43:07 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jun 19 00:02:17 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* bignum.c (bigdivrem): bignum zero's len should not be 0.
 
-	* lib/rss/rss.rb: automatically detected attributes.
+Mon Oct  7 15:36:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/0.9.rb: removed #_attrs.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+	* bignum.c (bigdivmod): wrong condition check for Bignum zero.
 
-	* lib/rss/parser.rb: followed new internal API.
+	* bignum.c (Init_Bignum): need to add Bignum#div.
 
-Mon Jun 19 00:00:17 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sun Oct  6 00:49:15 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
+	* eval.c (rb_load): should not pass blocks to the loaded file.
+	  [ruby-dev:18458]
 
-Sun Jun 18 22:36:13 2006  Kouhei Sutou  <kou@cozmixng.org>
+Fri Oct  4 20:25:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/rss/rss.rb: RSS::Element#initialize accepts initial
-	  attributes.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+	* 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)
 
-	* lib/rss/utils.rb: added Utils.element_initialize_arguments? to
-	  detect backward compatibility initial arguments.
+Fri Oct  4 13:05:58 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/rss/parser.rb: user initial attributes to initialize
-	  RSS::Element.
+	* configure.in (RUBY_PROG_GNU_LD): check whether the linker is GNU ld.
 
-Sun Jun 18 18:24:42 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* ext/extmk.rb (create_makefile): add -Wl,-no-undefined to $DLDFLAGS
+	  on Linux if GNU ld is used and --enable-shared is specified.
 
-	* lib/rss/converter.rb: use NKF for Uconv fallback.
+Fri Oct  4 02:21:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Jun 18 18:22:04 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* bignum.c (rb_big_rshift): num should be initialized by carry
+	  bits if x is negative.
 
-	* test/rss/test_image.rb: shared name space configuration.
+	* bignum.c (bigdivmod): len for bignum zero is 1, not 0.
 
-Sun Jun 18 18:13:25 2006  Kouhei Sutou  <kou@cozmixng.org>
+Thu Oct  3 20:22:11 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/rss/rss.rb: improved ignore_unknown_element
-	  handling. RSS::NotExpectedTagError provides tag URI.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+	* bcc32/mkexports.rb: to work on cygwin via telnet.
+	  [ruby-win32:358]
 
-	* test/rss/rss-assertions.rb: checked URI of not expected tag too.
-	* test/rss/test_parser.rb: ditto.
+	* ext/tcltklib/tcltklib.c (ip_invoke): requires command name
+	  argument.  [ruby-dev:18438]
 
-Sun Jun 18 18:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* eval.c (ruby_init, ruby_options): Init_stack() with local
+	  location.  (ruby-bugs-ja:PR#277)
 
-	* lib/rss/rss.rb: changed empty namespace URI representation to ""
-	  from nil.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
+	* eval.c (rb_call0): disable trace call.  [ruby-dev:18074]
 
-Sun Jun 18 18:03:50 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* eval.c (eval, rb_load): enable trace call.  [ruby-dev:18074]
 
-	* lib/rss/parser.rb: removed a guard for requiring open-uri.
+	* eval.c (rb_f_require): set source file name for extension
+	  libraries.  [ruby-dev:18445]
 
-Sun Jun 18 18:01:26 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* gc.c (Init_stack): prefer address of argument rather than local
+	  variable to initialize rb_gc_stack_start.
 
-	* lib/rss/rss.rb: fixed typo: except -> expect
-	* lib/rss/parser.rb: ditto.
-	* test/rss/rss-assertions.rb: ditto.
-	* test/rss/test_parser.rb: ditto.
+	* ruby.c (translate_char): translate a character in a string;
+	  DOSISH only.  [ruby-dev:18274]
 
-Sun Jun 18 17:52:39 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* ruby.c (ruby_init_loadpath): added argv[0] handling under
+	  Human68K.  [ruby-dev:18274]
 
-	* lib/rss/rss.rb: RSS::Element#calc_indent became to be deprecated.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
+	* ruby.c (proc_options): translate directory separator in $0 to
+	  '/'.  [ruby-dev:18274]
 
-	* test/rss/test_1.0.rb: removed RSS::Element.indent_size tests.
-	* test/rss/test_2.0.rb: ditto.
+Thu Oct  3 00:27:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Sun Jun 18 00:49:11 2006  Tanaka Akira  <akr@m17n.org>
+	* lib/delegate.rb (Delegator::initialize): use Object#class
+	  instead of deprecated Object#type.
 
-	* ext/socket/socket.c (bsock_recv_nonblock): new method
-	  BasicSocket#recv_nonblock.
-	  (udp_recvfrom_nonblock): renamed from ip_recvfrom_nonblock.
-	  IPSocket#recvfrom_nonblock is moved to UDPSocket#recvfrom_nonblock.
-	  (unix_recvfrom_nonblock): removed.
-	  UNIXSocket#recvfrom_nonblock is removed.
+Wed Oct  2 23:32:48 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Sat Jun 17 22:17:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in (RUBY_CHECK_IO_NEED_FLUSH): check whether fflush()
+	  is needed.
 
-	* lib/mathn.rb (Integer::prime_division): raise ZeroDivisionError
-	  on zeros.  [ruby-dev:28739]
+	* io.c (flush_before_seek): flush before seek if buffered data
+	  may remain.
 
-Sat Jun 17 14:53:32 2006  Tanaka Akira  <akr@m17n.org>
+	* io.c (rb_io_check_readable): flush if the last operation was
+	  write.
 
-	* lib/pathname.rb: backport from 1.9.
-	  (Kernel#Pathname): new method.
+	* io.c (rb_io_check_writable): flush if the last operation was
+	  read.
 
-Sat Jun 17 10:30:41 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* rubyio.h (FMODE_RBUF): added.
 
-	* lib/rss/rss.rb (Hash#merge, Enumerable#sort_by): removed.
+Wed Oct  2 23:09:20 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/rss/rss.rb (RSS::RootElementMixin#to_xml): added.
-	  [ruby-talk:197284]
+	* io.c (rb_io_wait_readable): handle retryable errors.
 
-	  We can convert RSS version easily like the following:
-	    rss10 = RSS::Parser.parse(File.read("1.0.rdf"))
-	    File.open("2.0.rss", "w") {|f| f.print(rss10.to_xml("2.0"))}
+	* io.c (rb_io_wait_writable): ditto.
 
-	* test/rss/test_1.0.rb: added #to_xml test.
-	* test/rss/test_2.0.rb: 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.
 
-	* test/rss/rss-testcase.rb: added some helper methods that
-	  generates sample RSS 2.0.
+Mon Sep 30 20:29:10 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* sample/rss/convert.rb: added a sample script to convert RSS format.
+	* io.c (rb_io_inspect): not need to raise IOError for closed
+	  stream.  [ruby-talk:51871]
 
-Sat Jun 17 10:23:22 2006  Kouhei Sutou  <kou@cozmixng.org>
+Mon Sep 30 03:48:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/rss.rb (Kernel#funcall): removed.
-	* lib/rss/parser.rb (Kernel.URI): removed.
+	* range.c (range_check): need no Fixnum check.
 
-	* lib/rss/maker/: supported
-	    xxx.new_yyy do |yyy|
-	      yyy.zzz = zzz
-	      ...
-	    end
-	  style and this style became the style of the recommendation.
+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.
 
-	  Old style
-	    yyy = xxx.new_yyy
-	    yyy.zzz = zzz
-	    ...
-	  is supported too but this style isn't recommended.
-	  [ruby-talk:197284]
+Sat Sep 28 10:40:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/rss/test_*maker*.rb: used new recommended style.
+	* hash.c (rb_hash_become): Hash#become should check added
+	  self-assignment.
 
-Sat Jun 17 09:03:47 2006  Kouhei Sutou  <kou@cozmixng.org>
+	* class.c (rb_make_metaclass): metaclass of a superclass may be
+	  NULL at boot time.
 
-	* lib/rss, test/rss: backported from trunk. (2005-11-16 - now)
+Sat Sep 28 09:50:03 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
-	* test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
+	* ext/extmk.rb: The condition judgment without necessity was deleted.
 
-	* lib/rss/trackback.rb: added TrackBack prefix.
-	* lib/rss/maker/trackback.rb: ditto.
+Fri Sep 27 18:40:42 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/rss/rss.rb : removed needless argument 'prefix'.
-	* lib/rss/parser.rb: ditto.
+	* eval.c (rb_thread_deadlock): more verbose message at deadlock.
 
-	* lib/rss/1.0.rb: added rdf:Bag.
+	* eval.c (rb_thread_schedule): ditto.
 
-	* lib/rss/taxonomy.rb: implemented taxonomy module.
-	* test/rss/test_taxonomy.rb: added tests for taxonomy support.
+	* eval.c (rb_thread_join): ditto.
 
-	* lib/rss/1.0.rb: added convenience method 'resources'.
-	* lib/rss/taxonomy.rb: ditto.
-	* test/rss/rss-assertions.rb: added test for 'resources'.
-	* test/rss/test_taxonomy.rb: ditto.
+Fri Sep 27 13:24:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/rss.rb: fixed a indentation bug.
-	* lib/rss/taxonomy.rb: fixed <taxo:topic> #to_s bug.
-	* test/rss/test_taxonomy.rb: added a #to_s test.
+	* eval.c (rb_eval): Class#inherited should be called after the
+	  execution of the class body.
 
-	* lib/rss/maker/taxonomy.rb: implemented taxonomy module for RSS
-	  Maker.
-	* lib/rss/taxonomy.rb: supported RSS Maker.
-	* lib/rss/maker.rb: added taxonomy module support.
+Fri Sep 27 02:41:53 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/rss/rss.rb: adjusted to other element API.
-	* lib/rss/1.0.rb: adjusted to other element API but backward
-	  compatibility is reserved.
-	* lib/rss/0.9.rb: ditto.
+	* 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.
 
-	* test/rss/test_maker_taxo.rb: added test case for taxonomy module
-	  for RSS Maker.
-	* test/rss/test_setup_maker_1.0.rb: added tests for taxo:topic.
+Fri Sep 27 02:25:14 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/rss/test_setup_maker_1.0.rb: added backward compatibility
-	  test.
-	* test/rss/test_setup_maker_0.9.rb: ditto.
-	* test/rss/test_setup_maker_2.0.rb: ditto.
+	* 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.
 
-	* test/rss/rss-testcase.rb: added convenience method for setting
-	  up taxo:topic.
-	* test/rss/rss-assertions.rb: added assertion for taxo:topic.
+Fri Sep 27 01:23:39 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* sample/rss/blend.rb: followed new API.
+	* 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.
 
-	* lib/rss/taxonomy.rb: changed class or module prefix to
-	  Taxonomy from Taxo.
-	* lib/rss/maker/taxonomy.rb: ditto.
+Thu Sep 26 22:44:21 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/rss/test_taxonomy.rb: use #reject directory.
+	* ext/digest/digest.c (rb_digest_base_s_digest): Fix a double
+	  free() bug mingled with allocation framework deployment.
 
-	* lib/rss/: use #__send__ instead of #send.
-	* test/rss/: ditto.
+	* ext/digest/digest.c (rb_digest_base_s_hexdigest): Get rid of
+	  redundant struct allocation.
 
-	* lib/rss/parser.rb: added entity handling type predicate.
-	* lib/rss/rexmlparser.rb: ditto.
-	* lib/rss/xmlparser.rb: ditto.
-	* lib/rss/xmlscanner.rb: ditto.
+Thu Sep 26 09:52:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/xmlscanner.rb: more robust entity handling.
+	* parse.y (primary): remove "return outside of method" check at
+	  compile time.
 
-	* test/rss/test_parser.rb: added an entity handling test.
+Wed Sep 25 23:51:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* test/rss/test_2.0.rb: added RSS 2.0 tests.
-	* test/rss/rss-assertions.rb: extended XML stylesheet assertion.
-	* lib/rss/0.9.rb: added initialize method.
-	* test/rss/test_1.0.rb: cleanup.
+	* dir.c (glob_helper): must not closedir() when exception raised
+	  while globbing "**".
 
-	* lib/rss/image.rb: added Image prefix.
-	* lib/rss/maker/image.rb: ditto.
+	* marshal.c (w_uclass): unused variable.
 
-	* lib/rss/rss.rb: improved type conversion.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
+	* re.c (match_clone): unused.
 
-	* test/rss/test_2.0.rb: added type conversion tests.
-	* test/rss/test_accessor.rb: ditto.
-	* test/rss/test_to_s.rb: ditto.
-	* test/rss/test_syndication.rb: ditto.
-	* test/rss/test_setup_maker_2.0.rb: ditto.
-	* test/rss/test_setup_maker_1.0.rb: ditto.
-	* test/rss/test_setup_maker_0.9.rb: ditto.
-	* test/rss/test_maker_sy.rb: ditto.
-	* test/rss/test_maker_image.rb: ditto.
-	* test/rss/test_maker_2.0.rb: ditto.
-	* test/rss/test_maker_0.9.rb: ditto.
-	* test/rss/test_image.rb: ditto.
+	* regex.c (re_compile_pattern): get rid of implicit promotion from
+	  plain char to int.
 
-	* test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
+Wed Sep 25 17:46:46 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* test/rss/rss-assertions.rb: improved type conversion assertions.
+	* lib/mkmf.rb (libpathflag): restore ENV['LIB'] when some error occured.
 
-	* lib/rss/rss.rb: added backward compatibility codes.
-	* lib/rss/parser.rb: ditto.
-	* test/rss/test_parser.rb: ditto.
-	* test/rss/test_2.0.rb: ditto.
+Wed Sep 25 16:14:51 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jun 17 02:01:00 2006  Tanaka Akira  <akr@m17n.org>
+	* regex.c (re_match): p1 may exceed pend limit.
 
-	* lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
+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 genetated.
+
+	* 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 envionment.
+
+	* 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 Jun 17 00:23:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Sep 21 23:28:28 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* parse.y (reswords): kDO_BLOCK was missing.  fixed: [ruby-core:7995]
+	* 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.
 
-Sat Jun 17 00:02:15 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* class.c (rb_singleton_class): check if its class is singleton
+	  AND attached to self.
 
-	* ext/win32ole/win32ole.c (ole_propertyput): support
-	  PROPERTYPUTREF. [ruby-talk:183042]
+Sat Sep 21 22:23:41 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/win32ole/tests/test_propertyputref.rb: ditto.
+	* eval.c (rb_thread_raise): no need to save dead thread context.
+	  [ruby-dev:18322]
 
-Thu Jun 15 23:02:47 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Fri Sep 20 23:02:01 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/win32ole/win32ole.c (fole_methods): The return value
-	  of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
+	* parse.y (block_append): eliminate unused literal nodes.
 
-	* ext/win32ole/win32ole.c (fole_put_methods): The return value
-	  of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
+	* parse.y (literal_concat): refined literal concatination.
 
-	* ext/win32ole/tests/test_ole_methods.rb: ditto.
+Fri Sep 20 19:43:40 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/win32ole/tests/testall.rb : ditto.
+	* lib/set.rb: Merge rough/lib/set.rb rev.1.5-1.15.
 
-Wed Jun 14 18:23:28 2006  Eric Hodel  <drbrain@segment7.net>
+Wed Sep 18 12:41:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* enum.c (enum_any): Documentation typo.
+	* eval.c (rb_eval): should define class/module under ruby_cbase.
 
-Wed Jun 14 15:01:09 2006  Eric Hodel  <drbrain@segment7.net>
+	* eval.c (rb_eval): should set class/module path based on
+	  ruby_cbase, not ruby_class.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
-	  warnings when -q is set.
+	* eval.c (module_setup): use ruby_cbase instead of ruby_class.
 
-Wed Jun 14 23:03:53 2006  Tanaka Akira  <akr@m17n.org>
+Tue Sep 17 21:06:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* configure.in: check sizeof(rlim_t).
-	  check setrlimit.
+	* eval.c (rb_thread_die): put thread dead state.
 
-	* process.c (proc_getrlimit): new method Process.getrlimit.
-	  (proc_setrlimit): new method Process.setrlimit.
+	* eval.c (rb_thread_atfork): free stack buffer at fork too.
 
-	* ruby.h (NUM2ULL): new macro.
+Tue Sep 17 01:13:31 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jun 12 22:25:09 2006  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)
 
-	* sprintf.c (rb_f_sprintf): adjust precision length to prevent
-	  splitting multi-byte characters.  [ruby-list:42389]
+	* eval.c (rb_thread_remove): free stack buffer on remove.
 
-Sun Jun 11 23:20:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep 17 00:58:35 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
-	  parser.
+	* io.c: add parameter prototype.
 
-Sun Jun 11 10:00:57 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* re.c: ditto.
 
-	* win32/win32.h (write): not need to define on bcc.
+Sun Sep 15 21:14:22 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-Sun Jun 11 08:30:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (rb_w32_opendir, rb_w32_stat): Corresponds to
+	  the unjust path containing ".
 
-	* lib/optparse.rb (OptionParser#getopts): new methods.
+Sun Sep 15 19:48:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Sat Jun 10 18:02:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in (OUTFLAG, CPPOUTFILE): moved from lib/mkmf.rb.
+	  check whether ${CPP} accepts the -o option.
 
-	* ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
-	  fixed: raize -> raise.  [ruby-talk:196608]
+	* win32/Makefile.sub (OUTFLAG, CPPOUTFILE): ditto.
 
-Thu Jun  8 14:19:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bcc32/Makefile.sub (OUTFLAG, CPPOUTFILE): ditto.
 
-	* win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions.
-	  use recv() and send() when fd is socket. fixed: [ruby-dev:28694]
+	* djgpp/config.sed (OUTFLAG, CPPOUTFILE): ditto.
 
-Wed Jun  7 16:22:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb (OUTFLAG, CPPOUTFILE): use CONFIG.
+	  make easy to understand log.
 
-	* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
-	  basename and pid.  [ruby-talk:196272]
+	* mkconfig.rb (val): should not strip.
 
-Wed Jun  7 14:53:04 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Sep 14 20:13:42 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-	* win32/win32.c (errmap): add some winsock errors.
+	* error.c(rb_sys_fail): remove case EPIPE on bcc32 .
 
-Wed Jun  7 11:34:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Sep 13 23:39:49 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* configure.in: add new configure option `--with-winsock2' for mingw.
+	* dir.c (glob_func_caller): add prototype to get rid of warning.
 
-	* win32/Makefile.sub (config.h): define USE_WINSOCK2 in config.h
-	  instead of in CPPFLAGS.
+Fri Sep 13 18:35:12 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/socket/extconf.rb: determine whether to use winsock2 or not
-	  by using with_config.
+	* eval.c (rb_eval): avoid uninitialized global/class variable
+	  warnings at `||='.  [ruby-dev:18278]
 
-Wed Jun  7 10:45:10 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (stmt, arg): ditto
 
-	* win32/{configure.bat, setup.mak, Makefile.sub, win32.h}: add
-	  new configure option `--with-winsock2'.
+Fri Sep 13 13:28:04 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* win32/win32.c (StartSockets): ditto.
+	* lib/mkmf.rb ($INSTALLFILES): avoid warning when $VERBOSE mode.
 
-	* ext/socket/extconf.rb: ditto.
+Thu Sep 12 23:20:10 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-	* win32/win32.c (open_ifs_socket): new function.
+	* bcc32/setup.mak    : Control of a message.
 
-	* win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
-	  instead of socket().
-	  ifs socket support is backported from trunk.
+	* bcc32/makefile.sub : include resource.
 
-Wed Jun  7 09:14:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Sep 12 18:10:03 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* eval.c (rb_call0): binding for the return event hook should have
-	  consistent scope.  [ruby-core:07928]
+	* dir.c (glob_helper): fixed freeing buffer.  (ruby-bugs-ja:PR#332)
 
-	* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
-	  event_hooks.	no guarantee for arbitrary hook deletion.
-	  [ruby-dev:28632]
+	* dir.c (glob_helper): should pass matched path.  (ruby-bugs-ja:PR#333)
 
-Mon Jun  5 18:12:12 2006  Tanaka Akira  <akr@m17n.org>
+Thu Sep 12 00:09:32 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): reject
-	  non-AF_INET/AF_INET6 sockaddr.
-	  (sock_s_unpack_sockaddr_un): reject non-AF_UNIX sockaddr.
-	  [ruby-dev:28691]
+	* eval.c (rb_trap_eval): preserve thread status and so on.
+	  [ruby-talk:40337], [ruby-core:00019]
 
-Sun Jun  4 20:40:19 2006  Tanaka Akira  <akr@m17n.org>
+Wed Sep 11 21:25:52 2002  Tanaka Akira  <akr@m17n.org>
 
-	* ext/socket/socket.c: fix sockaddr_un handling.
-	  [ruby-dev:28677]
+	* pp.rb (ARGF.pretty_print): implemented.
+	  (PP.pp): arguments reordered.
 
-Fri Jun  2 22:08:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Sep 11 18:55:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/forwardable.rb: RDoc typo fix from Jan Svitok
-	  <jan.svitok at gmail.com>.  [ruby-core:07943]
+	* eval.c (proc_to_s): refined format.  [ruby-dev:18215]
 
-Fri Jun  2 19:02:09 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Sep 11 17:47:17 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* ext/openssl/extconf.rb: use create_header.
+	* win32/win32.c, win32/win32.h (rb_w32_getpid): negate pid under Win9x.
+	  [ruby-dev:18262]
 
-	* ext/openssl/ossl.h, ext/openssl/openssl_missing.h:
-	  include RUBY_EXTCONF_H.
+Wed Sep 11 12:58:57 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Jun  2 17:16:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (get_pat): Add an extra argument "quote".
 
-	* lib/mkmf.rb (CLEANINGS): remove extconf.h by distclean if created.
+	* string.c (rb_str_match_m): Do not bother to convert if a regexp
+	  is given.
 
-Fri Jun  2 00:11:19 2006  Tanaka Akira  <akr@m17n.org>
+Wed Sep 11 11:33:40 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* ext/socket/socket.c (s_recvfrom): alen may be zero with UNIXSocket
-	  too.  (tested on NetBSD 3.0)
-	  (s_recvfrom_nonblock): extracted from sock_recvfrom_nonblock.
-	  (sock_recvfrom_nonblock): use s_recvfrom_nonblock.
-	  (ip_recvfrom_nonblock): new method: IPSocket#recvfrom_nonblock
-	  (unix_recvfrom_nonblock): new method: UNIXSocket#recvfrom_nonblock
-	  (s_accept_nonblock): extracted from sock_accept_nonblock.
-	  (sock_accept_nonblock): use s_accept_nonblock.
-	  (tcp_accept_nonblock): new method: TCPServer#accept_nonblock
-	  (unix_accept_nonblock): new method: UNIXServer#accept_nonblock
+	* bcc32/Makefile.sub: remove unnecessary `.dll' from filename of 
+	  dll's resource file.
 
-Thu Jun  1 19:12:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* cygwin/GNUmakefile.in: ditto. [ruby-dev:17103]
 
-	* win32/win32.c (rb_w32_cmdvector): backslashes inside single-quotes
-	  no longer has special meanings.  fixed: [ruby-list:42311]
+	* win32/Makefile.sub: ditto. [ruby-dev:17103]
 
-Thu Jun  1 16:14:41 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* win32/resource.rb: ditto. [ruby-dev:17103]
 
-	* win32/win32.c (rb_w32_getcwd): runtime's getcwd() will not success
-	  if the length of the cwd is longer than MAX_PATH.
-	  fixed [ruby-list:42335]
+Wed Sep 11 09:59:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Jun  1 11:29:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* io.c (rb_io_wait_readable): added.
 
-	* win32/win32.c (rb_w32_getcwd): set errno if not set.
-	  fixed [ruby-list:42346]
+	* io.c (rb_io_wait_writable): added.
 
-Sat May 27 11:29:46 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+	* io.c (io_read_retryable): added.
 
-	* ext/extmk.rb (extmake): remove extinit files if no statically linked
-	  extensions.
+	* io.c (io_write): retry on EINTR, ERESTART and EWOULDBLOCK.
+	  [ruby-dev:17855], [ruby-dev:17878], [ruby-core:00444]
 
-Fri May 26 09:05:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+	* io.c (rb_io_fread): ditto.
 
-	* ruby.h, lib/mkmf.rb (create_header): clear command line options for
-	  macros moved to extconf.h.
+	* io.c (read_all): ditto.
 
-	* ext/extmk.rb (extract_makefile, extmk): made RUBY_EXTCONF_H and
-	  EXTSTATIC permanent.
+	* io.c (appendline): ditto.
 
-	* ext/{dbm,digest/*,socket,zlib}/extconf.rb: used $defs and $INCFLAGS.
+	* io.c (rb_io_each_byte): ditto.
 
-	* {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added
-	  $(INCFLAGS).
+	* io.c (rb_io_getc): ditto.
 
-	* lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
+Wed Sep 11 09:29:24 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Thu May 25 01:52:07 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+	* win32/Makefile.sub (ext): make directory `ext' on compile dir.
+	  [ruby-dev:18255]
 
-	* lib/mkmf.rb (pkg_config): particular config commands support.
+Wed Sep 11 00:41:10 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/extmk.rb: deal with $static set in extconf.rb.
+	* eval.c (rb_mod_define_method): initialize orig_func too.
+	  (ruby-bugs-ja:PR#330)
 
-	* mkconfig.rb: merge multiple entries to an entry with multiple lines.
+Wed Sep 11 00:01:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/mkmf.rb: allow a series of commands to link.
+	* dir.c (glob_helper): prevent memory leak using rb_protect().
 
-	* win32/Makefile.sub: embed manifests.
+	* string.c (rb_str_associate): no need to check freeze flag.
 
-	* win32/setup.mak: suffix OS name by runtime version.
+	* string.c (rb_str_resize): should honor STR_ASSOC flag on
+	  resize.
 
-Wed May 24 23:52:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_resize): proper STR_ASSOC handling.  pointed
+	  out by Michal Rokos.
 
-	* configure.in (ac_install_sh): ignore dummy install-sh.
-	  [ruby-talk:193876]
+	* string.c (rb_str_buf_cat): ditto.
 
-Wed May 24 03:10:48 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* string.c (rb_str_cat): ditto.
 
-	* ext/openssl/lib/openssl/ssl.rb
-	  (OpenSSL::SSL::SocketForwarder#setsockopt,getsockopt): typo fixed.
+	* string.c (rb_str_buf_append): ditto.
 
-Mon May 22 17:54:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* string.c (rb_str_append): ditto.
 
-	* ext/socket/socket.c (sock_recvfrom_nonblock): use rb_read_pending
-	  instead of rb_io_read_pending.
-	  [ruby-dev:28663]
+Tue Sep 10 23:35:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon May 22 17:30:04 2006  Tanaka Akira  <akr@m17n.org>
+	* parse.y (nextc): restore line number after here documents.
+	  (ruby-bugs-ja:PR#331)
 
-	* rubyio.h (rb_io_set_nonblock): declared.
+	* parse.y (heredoc_restore): ditto.
 
-	* io.c (rb_io_set_nonblock): new function.
-	  (io_getpartial): nonblocking read support.
-	  (io_read_nonblock): new method: IO#read_nonblock.
-	  (io_write_nonblock): new method: IO#write_nonblock.
+Tue Sep 10 18:26:52 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/socket/socket.c
-	  (sock_connect_nonblock): new method: Socket#connect_nonblock.
-	  (sock_accept_nonblock): new method: Socket#accept_nonblock.
-	  (sock_recvfrom_nonblock): new method: Socket#recvfrom_nonblock.
+	* ext/extmk.rb, lib/mkmf.rb ($INCFLAGS): new var for -I$(topdir).
 
-	  [ruby-core:7917]
+	* lib/mkmf.rb: add #define WIN32_LEAN_AND_MEAN to improve compile
+	  times.
 
-Mon May 22 15:57:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Sep 10 17:16:14 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* eval.c (umethod_bind): should not update original class.
-	  [ruby-dev:28636]
+	* win32/Makefile.sub (miniruby): shouldn't link $(EXTOBJS).
+	  [ruby-dev:17059]
 
-Mon May 22 13:38:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/Makefile.sub ($(LIBRUBY_A), $(LIBRUBY)): avoid lib.exe's
+	  warning. [ruby-dev:17059]
 
-	* eval.c (ev_const_get): should support constant access from
-	  within instance_eval().  [ruby-dev:28327]
+	* win32/Makefile.sub: remove unnecessary rules. [ruby-dev:17059]
 
-Thu May 18 17:51:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/configure.bat, win32/setup.mak, win32/README.win32: enable to
+	  pass some arguments to configure. [ruby-dev:17059]
 
-	* time.c (time_timeval): should round for usec floating
-	  number.  [ruby-core:07896]
+Mon Sep  9 23:43:33 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* time.c (time_add): ditto.
+	* win32/win32.h (S_I?USR): define only if not mingw32.
 
-Thu May 18 17:11:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Sep  9 11:21:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/cgi.rb (CGI::out): support utf-8.  a patch from Fujioka
-	  <fuj at rabbix.jp>.  [ruby-dev:28649]
+	* ext/stringio/stringio.c (strio_set_string): reinitialize
+	  properly.
 
-Thu May 18 00:42:12 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+	* ext/stringio/stringio.c (strio_become): added self-assign check
+	  and experimental auto-conversion to StringIO.
 
-	* ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
+	* ext/stringio/stringio.c (strio_reopen): added.
 
-Wed May 17 17:55:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* dir.c (sys_warning): should not call a vararg function
-	  rb_sys_warning() indirectly.  [ruby-core:07886]
+Sun Sep  8 21:29:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Wed May 17 08:17:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* time.c (time_free): prototype; struct time_object -> void *.
+	  avoid GCC warnings.
 
-	* util.c (ruby_strtod): try to reduce errors using powersOf10
-	  table.  [ruby-dev:28644]
+	* lib/mkmf.rb, ext/extmk.rb ($LINK, $CPP): move to lib/mkmf.rb.
 
-Tue May 16 15:34:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Sep  8 19:02:28 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* re.c (rb_reg_initialize): should not allow modifying literal
-	  regexps.  frozen check moved from rb_reg_initialize_m as well.
+	* time.c: prototype; time_free() to avoid VC++ warnings.
 
-Tue May 16 09:20:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/tcltklib/tcltklib.c: prototype; invoke_queue_handler() to avoid
+	  VC++ warning.
 
-	* re.c (rb_reg_initialize): should not modify untainted objects in
-	  safe levels higher than 3.
+	* win32/win32.c (rb_w32_stat): remove S_IWGRP and S_IWOTH bits from
+	  st_mode.
 
-	* re.c (rb_memcmp): type change from char* to const void*.
+	* win32/win32.h (S_I*): define if not defined.
 
-	* dir.c (dir_close): should not close untainted dir stream.
+Sun Sep  8 14:38:31 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* dir.c (GetDIR): add tainted/frozen check for each dir operation.
+	* configure.in: modify program_prefix only if specified
+	  --program-prefix.
 
-Mon May 15 17:42:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in: don't generate ext/extmk.rb.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
-	  typo fixed.  a patch from Florian Gross <florg at florg.net>.
+	* Makefile.in: execute directly $(srcdir)/ext/extmk.rb.
+	  remove -Cext option, "Dir::chdir 'ext'" in ext/extmk.rb.
 
-Sat May 13 16:14:05 2006  Tanaka Akira  <akr@m17n.org>
+	* {win32,bccwin32}/Makefile.sub: ditto.
 
-	* lib/pp.rb (PP.mcall): new method.
-	  (Struct#pretty_print): call Kernel#class and Struct#members even if
-	  overridden.
-	  (Struct#pretty_print_cycle): ditto.
-	  [ruby-core:7865]
+	* instruby.rb: ditto.
 
-Thu May 11 19:57:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/extmk.rb: renamed from ext/extmk.rb.in.
 
-	* util.c (ruby_strtod): differ addition to minimize error.
-	  [ruby-dev:28619]
+	* lib/mkmf.rb (module Logging): create log files (mkmf.log)
+	  in each extension module directories.
 
-Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
+	* ext/extmk.rb: ditto.
 
-	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
-	  documented.
+	* lib/mkmf.rb (macro_defined?): new method.
 
-Thu May 11 18:10:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/.cvsignore: remove extmk.rb.
 
-	* util.c (ruby_strtod): should not raise ERANGE when the input
-	  string does not have any digits.  [ruby-dev:28629]
+	* ext/*/.cvsignore: add "*.def".
 
-Sun May  7 03:09:51 2006  Stephan Maka  <stephan@spaceboyz.net>
+	* lib/mkmf.rb (have_struct_member): moved from ext/socket/extconf.rb.
 
-	* lib/resolv.rb (Resolv::DNS::Requester::ConnectedUDP#initialize):
-	  Use AF_INET6 for nameservers containing colons.
+	* ext/socket/extconf.rb: use macro_defined? instead of egrep_cpp.
 
-Sat May  6 00:38:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/etc/extconf.rb: use have_struct_member.
 
-	* signal.c (trap): sig should be less then NSIG.  Coverity found
-	  this bug.  a patch from Kevin Tew <tewk at tewk.com>.
-	  [ruby-core:07823]
+	* ext/etc/etc.c: add prefix HAVE_ST_ to PW_ macros.
 
-Thu May  4 02:24:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Sep  8 14:36:40 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-	* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
-	  uninitialized array element.  a patch from Pat Eyler
-	  <rubypate at gmail.com>.  [ruby-core:07809]
+	* 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.
 
-	* array.c (rb_ary_fill): initialize local variables first.  a
-	  patch from Pat Eyler <rubypate at gmail.com>.  [ruby-core:07810]
+Sat Sep  7 23:32:56 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
-	  type_tag.  a patch from Pat Eyler <rubypate at gmail.com>.
-	  [ruby-core:07808]
+	* misc/inf-ruby.el (inferior-ruby-error-regexp-alist): regexp
+	  alist for error message from ruby.
 
-Wed May  3 02:12:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* misc/inf-ruby.el (inferior-ruby-mode): fixed for Emacs.
 
-	* ext/socket/socket.c (make_hostent_internal): accept ai_family
-	  check from Sam Roberts <sroberts at uniserve.com>.
-	  [ruby-core:07691]
+	* misc/inf-ruby.el (ruby-send-region): compilation-parse-errors
+	  doesn't parse first line, so insert separators before each
+	  evaluations.
 
-Mon May  1 12:23:19 2006    <sinara@blade.nagaokaut.ac.jp>
+Sat Sep  7 19:46:57 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* numeric.c (num_div): use floor rather than rb_Integer().
-	  [ruby-dev:28589]
+	* lib/set.rb: Disallow Set.new(false).  Add even more tests.
+	  [Submitted by: "Christoph" <chr_news@gmx.net>]
 
-	* numeric.c (flo_divmod): the first element of Float#divmod should
-	  be an integer. [ruby-dev:28589]
+Sat Sep  7 19:23:56 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
+	* 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.
 
-Sat Apr 29 22:42:08 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/set.rb: Resurrect the test suite by putting it after
+	  __END__ and executing `eval DATA.read'.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): should initialize
-	  flag. [ruby-core:07785]
+Sat Sep  7 08:41:39 2002  Minero Aoki  <aamine@loveruby.net>
 
-Fri Apr 28 10:53:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (rb_gc_mark_parser): ruby_eval_tree is marked in eval.c.
 
-	* util.c (ruby_strtod): should not cut off 18 digits for no
-	  reason.  [ruby-core:07796]
+Fri Sep  6 20:01:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* util.c (ruby_strtod): fixed wrong conversion.
+	* lib/mkmf.rb ($CC): command to compile C source.
 
-Thu Apr 27 01:38:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb (logging): added.
 
-	* array.c (rb_ary_fill): internalize local variable "beg" to
-	  pacify Coverity.  [ruby-core:07770]
+	* lib/mkmf.rb (try_compile): added.
 
-Wed Apr 26 16:59:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* 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.
 
-	* pack.c (pack_unpack): now supports CRLF newlines.  a patch from
-	  <tommy at tmtm.org>.  [ruby-dev:28601]
+	* lib/mkmf.rb (have_func): local variable should be volatile not
+	  to be eliminated by optimization.
 
-Tue Apr 25 18:00:05 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/mkmf.rb (create_makefile): link with CONFIG["LIBS"].
 
-	* ext/tk/tcltklib.c (delete_slaves): maybe increment the reference
-	  count of a NULL Tcl_Obj [ruby-core:07759].
+	* lib/mkmf.rb (create_makefile): emit .SUFFIXES:.
 
-Tue Apr 25 07:55:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Sep  6 12:11:22 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/jcode.rb (String::tr_s): should have translated non
-	  squeezing character sequence (i.e. a character) as well.  thanks
-	  to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
+	* parse.y (rb_gc_mark_parser): should mark ALL global variables
+	  defined in parse.y.
 
-Tue Apr 25 00:08:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Sep  6 01:15:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* regex.c (re_compile_pattern): should check if c is not a
-	  multibyte character.  a patch from KIMURA Koichi
-	  <kimura.koichi at canon.co.jp>.  [ruby-dev:28598]
+	* gc.c (ruby_xmalloc): remove MALLOC_LIMIT to avoid frequent
+	  garabage collection.
 
-Fri Apr 21 15:19:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Sep  6 11:47:37 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer
-	  [ruby-core:07744] and memory leak.
+	* parse.y (rb_gc_mark_parser): should mark global variables
+	  defined in parse.y.
 
-Fri Apr 21 12:14:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Sep  6 10:34:32 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/socket/socket.c: document update patch from Sam Roberts
-	  <sroberts at uniserve.com>.  [ruby-core:07701]
+	* io.c (rb_io_puts): RSTRING(line)->ptr might be NULL.
 
-Wed Apr 19 13:55:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Sep  6 10:26:37 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* parse.y (arg): too much NEW_LIST()
+	* parse.y: should not put non-NODE-VALUEs in the semantic stack.
 
-	* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
+Fri Sep  6 05:48:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Wed Apr 19 11:57:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (rb_path_check): nothing to check under DOSISH.
+	  [ruby-list:35772]
 
-	* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
-	  [ruby-dev:28585]
+Fri Sep  6 05:03:50 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* parse.y (list_concat): revert last change.
+	* gc.c (rb_gc): should mark parser.
 
-	* parse.y (arg): use NODE_ARGSCAT for placeholder.
+	* parse.y (rb_gc_mark_parser): new function.
 
-Wed Apr 19 11:13:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* intern.h (rb_gc_mark_parser): added.
 
-	* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
-	  mathew <meta at pobox.com>.  [ruby-core:07738]
+Thu Sep  5 18:32:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Apr 19 10:13:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* variable.c (rb_path2class): should not use rb_eval_string().
 
-	* variable.c (rb_const_set): raise error when no target klass is
-	  supplied.  [ruby-dev:28582]
+Thu Sep  5 17:18:22 2002  Michal Rokos  <michal@ruby-lang.org>
 
-Wed Apr 19 09:49:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* dln.c: fix memory leak in dln_load (ruby-core:405) and 
+	  in load_1 (ruby-core:407)
 
-	* parse.y (list_concat): should not modify nodes other than
-	  NODE_ARRAY.  [ruby-dev:28583]
+Thu Sep  5 15:43:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Apr 18 17:40:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* marshal.c (w_extended): should allow marshaling of object which
+	  is extended by named module.
 
-	* ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
+	* class.c (rb_make_metaclass): super may be T_ICLASS, need to skip.
 
-	* ext/tk/lib/tk.rb: update RELEASE_DATE.
+Thu Sep  5 13:09:22 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/tk/tcltklib.c: forget to reset a Tcl interpreter.
+	* eval.c (rb_eval): overriding false constant with class/module
+	  definition should be error.  (PR#327)
 
-	* ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
+Thu Sep  5 01:24:26 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Apr 18 00:11:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* extmk.rb (create_makefile): add macro MAKEDIRS, INSTALL_PROG,
+	  INSTALL_DATA.
 
-	* eval.c: block_unique should be 1, not frame_unique.
-	  [ruby-dev:28577]
+	* extmk.rb (create_makefile): support for building to any directory.
 
-Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
+	* extmk.rb (xsystem): move to mkmf.rb.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_body): Make RDoc
-	  ignore C function prototypes.  Patch by Tilman Sauerbeck
-	  <tilman at code-monkey.de>.  [ruby-core:8574]
-	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
-	  documented.
+	* mkmf.rb (xsystem): support for extmk.rb
 
-Mon Apr 10 01:03:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* mkmf.rb ($CPP): remove '-E' option.  add CPPFLAGS.
 
-	* prec.c (prec_prec_f): documentation patch from
-	  <gerardo.santana at gmail.com>.  [ruby-core:07689]
+Wed Sep  4 16:15:17 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Sat Apr  8 02:34:34 2006  Yukihiro Matsumoto  <matz@ruby-lang.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>]
 
-	* bignum.c (rb_big_pow): second operand may be too big even if
-	  it's a Fixnum.  [ruby-talk:187984]
+	* lib/set.rb: - Fix eql?(). [ditto]
 
-Sat Apr  8 02:12:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Sep  4 15:23:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* README.EXT: update symbol description.  [ruby-talk:188104]
+	* class.c (rb_make_metaclass): obj.meta.super.meta should be equal
+	  to obj.meta.meta.super (ruby-bugs-ja:PR#324).
 
-Thu Apr  6 23:28:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Sep  4 05:10:16 2002  Koji Arai  <jca02266@nifty.ne.jp>
 
-	* COPYING: explicitly note GPLv2.  [ruby-talk:187922]
+	* parse.y (yylex): the warning message "invalid
+          character syntax" was never issued (ruby-bugs-ja:PR#323).
 
-Thu Apr  6 11:18:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Sep  4 01:08:45 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/panedwindow.rb: lack of arguments. [ruby-core:7681]
+	* marshal.c (r_bytes): do not use alloca (ruby-bugs:PR#382).
 
-Thu Apr  6 01:04:47 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Sep  3 17:12:59 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/tcltklib.c: fix SEGV when embedding to an application.
-	  [ruby-core:7600]
+	* extmk.rb: require mkmf.rb.  remove duplicate methods.
+	  use Config::CONFIG["FOO"] instead of @FOO@.
 
-	* ext/tk/tcltklib.c: fix SEGV at exit. [ruby-talk:186489]
+	* mkmf.rb: support for extmk.rb.
 
-	* ext/tk/tkutil/tkutil.c: follow to changing specification of
-	  instance_eval on ruby-1.9.x.
+Mon Sep  2 23:01:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/tk/lib/tk.rb: ditto.
+	* re.c (rb_reg_search): MatchData must be rb_cMatch.
+	  (ruby-bugs-ja:PR#319)
 
-	* ext/tk/lib/multi-tk.rb: ditto.
+Mon Sep  2 21:21:46 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/tk/lib/tk.rb: remove warning about redefinition of methods.
+	* gc.c (gc_sweep): does reclaim nodes in also compile time, if we
+	  can.
 
-	* ext/tk/lib/tk/variable.rb: remove warning about unseting Tcl
-	  variables.
+	* ruby.c (load_file): omit GC if we can.
 
-Wed Mar 29 20:54:44 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* parse.y (ruby_parser_stack_on_heap): new function.
 
-	* ext/win32ole/win32ole.c (fole_getproperty): WIN32OLE#[] should accept
-	  multi arguments.
+	* intern.h (ruby_parser_stack_on_heap): added.
 
-	* ext/win32ole/tests/testWIN32OLE.rb (test_setproperty_bracket): ditto.
+Mon Sep  2 18:45:07 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Mar 29 10:07:44 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* variable.c (rb_copy_generic_ivar): remove old generic instance
+	  variable table if it existes.
 
-	* ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar,
-	  e2w_conv): support C90 compiler.
+Sun Sep  1 15:54:33 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Wed Mar 29 06:48:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* config.guess: fixed for Linux/PPC.
 
-	* eval.c (backtrace): reports aliased method names in a generated
-	  backtrace.  a patch from "U.Nakamura" <usa at garbagecollect.jp>.
-	  [ruby-dev:28471]
+Sat Aug 31 09:38:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Mar 27 22:19:09 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+	* class.c (rb_make_metaclass): metaclass of a metaclass is a
+	  metaclass itself.
 
-	* ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c, config.h}: imported nkf 2.0.6.
-	  * Add --ic / --oc option and mapping tables.
-	  * Add fallback option.
-	  * Add --no-best-fit-chars option.
-	  * Fix some bugs.
+Fri Aug 30 22:45:16 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/nkf/nkf.c (nkf_split_options): added for parse option string.
+	* lib/set.rb: Added.
 
-	* ext/nkf/lib/kconv.rb (Kconv.to*): add -m0.
-	  Note that Kconv.to* still imply -X.
+Fri Aug 30 20:58:54 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-Mon Mar 27 03:17:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/Win32API/Win32API.c (Win32API_Call): typo.
 
-	* eval.c (rb_call0): insecure calling should be checked for non
-	  NODE_SCOPE method invocations too.
+Fri Aug 30 19:45:52 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* eval.c (rb_alias): should preserve the current safe level as
-	  well as method definition.
+	* variable.c (rb_const_assign): st_delete() takes pointer to key.
 
-Fri Mar 24 23:14:30 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Aug 30 19:40:28 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* eval.c (yield_under_i): pass self again for instance_eval().
-	  [ruby-dev:28466]
+	* ext/Win32API/Win32API.c (Win32API_Call): RSTRING()->ptr may be
+	  NULL.
 
-Fri Mar 24 17:20:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/nkf/nkf.c (rb_nkf_guess): ditto.
 
-	* process.c (rb_f_sleep): remove description about SIGALRM which
-	  is not valid on the current implementation.  [ruby-dev:28464]
+	* ext/readline/readline.c (readline_s_set_completion_append_character):
+	  ditto.
 
-Thu Mar 23 10:47:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/socket.c (sock_s_getaddrinfo, sock_s_getnameinfo):
+	  ditto.
 
-	* eval.c (method_missing): should support argument splat in
-	  super.  [ruby-talk:185438]
+	* ext/tcltklib/tcltklib.c (ip_toUTF8, ip_fromUTF8): ditto.
 
-Mon Mar 20 12:05:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Aug 30 01:32:17 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in: Solaris SunPro compiler -rapth patch from
-	  <kuwa at labs.fujitsu.com>.  [ruby-dev:28443]
+	* class.c (rb_singleton_class): superclass of a metaclass
+	  should be a metaclass of superclass.
 
-Mon Mar 20 09:40:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* range.c (range_eq): two instances must belong to a same class to
+	  be equal.
 
-	* configure.in: remove enable_rpath=no for Solaris.
-	  [ruby-dev:28440]
+	* range.c (range_eql): ditto.
 
-Fri Mar 17 19:08:49 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* io.c (rb_io_taint_check): frozen check added.
 
-	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: fix typo.
-	  [ruby-core:07571]
+	* file.c (rb_stat_become): frozen check added.
 
-Wed Mar 15 16:54:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* object.c (rb_obj_become): ditto.
 
-	* lib/mkmf.rb (create_makefile): support libraries without *.so.
+	* re.c (rb_reg_become): ditto.
 
-Wed Mar 15 16:35:43 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* struct.c (rb_struct_become): ditto.
 
-	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: should use
-	  "rb_str_new(0, 0)" to make empty string.
+	* time.c (time_become): ditto.
 
-Sat Mar 11 14:24:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_become): should call rb_ary_modify().
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::wrap): removed
-	  space before argument parenthesis.  [ruby-talk:183630]
+	* hash.c (rb_hash_become): should call rb_hash_modify().
 
-	* ruby.1: a clarification patch from David Lutterkort
-	  <dlutter at redhat.com>.  [ruby-core:7508]
+	* compar.c (cmp_equal): should not use NUM2LONG(), since <=> may
+	  return bignum.
 
-Sat Mar  4 15:26:40 2006  Tanaka Akira  <akr@m17n.org>
+	* compar.c (cmp_gt, cmp_ge, cmp_lt, cmp_le, cmp_between): ditto.
 
-	* gc.c (id2ref): fix symbol test.
+Thu Aug 29 23:34:42 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-Sat Mar  4 01:08:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bcc32/MakeFile.sub (sitearch): add.
 
-	* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
-	  directories.  a patch from Eric Hodel <drbrain at segment7.net>.
-	  [ruby-core:07423]
+Thu Aug 29 13:36:42 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Mar  2 19:44:18 2006  Tanaka Akira  <akr@m17n.org>
+	* io.c (read_all): should use off_t instead of long.
 
-	* gc.c: align VALUE with sizeof(RVALUE) globally.
-	  (is_pointer_to_heap): check alignment out of loop.
-	  (id2ref): avoid collision between symbols and objects.
-	  (rb_obj_id): ditto.  moved from object.c.
-	  [ruby-talk:178364] [ruby-core:7305]
+Thu Aug 29 00:55:55 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Mar  2 18:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c (r_object): yield loaded objects, not intermediates.
+	  (ruby-bugs-ja:PR#296)
 
-	* eval.c (rb_thread_fd_writable): should not re-schedule output
-	  from KILLED thread (must be error printing).
+Thu Aug 29 00:06:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Mar  2 17:57:49 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* array.c (rb_ary_become): should not free ptr if it's shared.
 
-	* gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
-	  [ruby-core:7474]
+	* eval.c (rb_alias): prohibit making an alias named "allocate" if
+	  klass is a metaclass.
 
-Thu Mar  2 12:59:14 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Aug 28 23:59:15 2002  Michal Rokos  <michal@ruby-lang.org>
 
-	* win32/win32.c (filetime_to_unixtime): should set tm_isdst to -1.
-	  stat() didn't treat daylight saving time property on WinNT.
-	  [ruby-talk:182100]
+	* signal.c: remove #ifdef SIGINT for struct signals.
 
-Thu Mar  2 08:02:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* variable.c: get rid of fix length buffer in rb_class_path.
 
-	* gc.c (add_heap): heap_slots may overflow.  a patch from Stefan
-	  Weil <weil at mail.berlios.de>.
+Wed Aug 28 23:34:32 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Wed Mar  1 00:24:31 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* io.c (appendline): data was lost when raw mode.
 
-	* lib/rdoc/parsers/parse_rb.rb (read_escape): could not handle /\^/.
-	  merged Mr. Ishizuka's lib/irb/ruby-lex.rb 's patch rev 1.29.
-	  [ruby-talk:181631] [ruby-dev:28404]
+Wed Aug 28 22:57:34 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Feb 28 09:32:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* string.c (rb_string_value_ptr): StringValuePtr() should never
+	  return NULL pointer.
 
-	* lib/drb/extservm.rb (invoke_service_command): cannot invoke command
-	  if command name is quoted on mswin32. [ruby-dev:28400]
+Wed Aug 28 19:12:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon Feb 27 00:19:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/stringio/stringio.c (strio_initialize): RSTRING(mode)->ptr
+	  can be NULL.
 
-	* ruby.h (SYM2ID): should not cast to signed long.
-	  [ruby-core:07414]
+	* ext/stringio/stringio.c (strio_ungetc): fix buffer overflow.
 
-Fri Feb 24 20:07:23 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Aug 28 18:19:55 2002  Michal Rokos  <michal@ruby-lang.org>
 
-	* test/drb/drbtest.rb (add_service_command): quote pathnames in the
-	  server's command line for space contained directory names.
-	  Thanks, arton. [ruby-dev:28386]
+	* file.c: fix memory leak in rb_stat_init.
 
-Fri Feb 24 12:11:08 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug 28 17:45:03 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* instruby.rb: install *.exe.manifest and *.dll.manifest if exist.
-	  It's for VC++8.
+	* win32/win32.c (kill): negate pid under Win9x.
 
-Fri Feb 24 11:33:52 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Aug 28 16:36:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* bcc32/Makefile.sub (HAVE_HYPOT): bcc32 has hypot().
+	* configure.in (ar): don't check ar twice.
 
-Fri Feb 24 11:19:58 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug 28 15:00:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* time.c (time_new_internal): add prototype to tell the compiler
-	  arugments types.
+	* string.c (rb_str_delete_bang): should check if str->ptr is 0.
 
-	* win32/win32.c (NtInitialize): need to set a handler for VC++8.
+	* string.c (rb_str_squeeze_bang): ditto.
 
-Fri Feb 24 08:19:16 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+	* string.c (rb_str_count): ditto.
 
-	* test.rb: Removed.  Obsolete by test/nkf.
+	* string.c (rb_str_lstrip_bang): ditto.
 
-	* ext/.document: enabled documents in nkf and kconv
+	* string.c (rb_str_rstrip_bang): ditto.
 
-	* ext/nkf/nkf.c ext/nkf/lib/kconv.rb: Add rdoc.
+	* string.c (rb_str_intern): ditto.
 
-Thu Feb 23 22:39:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Aug 28 11:37:35 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal
-	  memory manager cannot handle large memory block properly.
-	  ex: 10000.times { "" << "." * 529671; GC.start } # crash
-	  [ruby-dev:28230]
+	* win32/win32.h: define SIGINT and SIGKILL if not defined.
 
-Thu Feb 23 13:20:28 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* win32/win32.c: remove definition of SIGINT and SIGKILL.
 
-	* eval.c (SETUP_ARGS0): fixed memory corruption. [ruby-dev:28360]
+Tue Aug 27 19:50:27 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Tue Feb 21 02:18:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ruby.c (require_libraries): prevent ruby_sorcefile from GC.
 
-	* configure.in (mingw): have link.  [ruby-list:41838]
+Tue Aug 27 15:03:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/Makefile.sub (config.h): ditto.
+	* file.c (rb_find_file): $LOAD_PATH must not be empty.
 
-Tue Feb 21 02:07:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (rb_find_file_ext): ditto.
 
-	* parse.y (f_arglist): should set command_start = Qtrue for
-	  command body.  [ruby-talk:180648]
+Tue Aug 27 02:35:21 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Feb 20 17:37:26 2006  Tanaka Akira  <akr@m17n.org>
+	* range.c (range_eq): class check should be based on range.class,
+	  instead of Range to work with Range.dup.
 
-	* mkconfig.rb: alias RbConfig for Config.
+	* range.c (range_eql): ditto.
 
-Mon Feb 20 12:27:53 2006  Kent Sibilev  <ksruby@gmail.com>
+Mon Aug 26 18:17:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rational.rb (Integer::gcd): small typo fix.
-	  [ruby-core:07395]
+	* class.c (rb_mod_dup): need to preserve metaclass and flags.
 
-Mon Feb 20 01:05:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Aug 26 10:44:18 2002  Tanaka Akira  <akr@m17n.org>
 
-	* lib/rational.rb (Integer::gcd): replaced by gcd4 in
-	  [ruby-core:07390].  [ruby-core:07377]
+	* object.c (rb_cstr_to_dbl): had a buffer overrun.
 
-Mon Feb 20 00:57:02 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Aug 25 20:10:32 2002  Wakou Aoyama  <wakou@ruby-lang.org>
 
-	* ext/openssl/ossl.h (OSSL_Debug): should not use __func__.
-	  [ruby-dev:28339]
+	* lib/cgi.rb (CGI#form): fix ruby-bugs-ja:PR#280, add default action.
 
-Sun Feb 19 04:46:29 2006  Guy Decoux  <ts@moulon.inra.fr>
+Sat Aug 24 15:32:16 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* eval.c: initial value for block_unique must be 1.
-	  [ruby-talk:180420]
+	* 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)
 
-Sat Feb 18 23:58:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (module_setup): unused variable.  [ruby-core:00358]
 
-	* lib/tracer.rb (Tracer::Tracer.add_filter): turn on tracer mode
-	  only when caller() level size is one.  [ruby-core:07389]
+Sat Aug 24 14:59:02 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rdoc/parsers/parse_rb.rb: need not to require "tracer".
-	  [ruby-core:07389]
+	* marshal.c (w_class): integrate singleton check into a funciton
+	  to follow DRY principle.
 
-	* sample/rtags.rb: ditto.
+	* marshal.c (w_uclass): should check singleton method.
 
-Sat Feb 18 12:18:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* object.c (rb_obj_dup): dmark and dfree functions must be match
+	  for T_DATA type.
 
-	* lib/fileutils.rb (FileUtils::fu_world_writable): make it
-	  private.  [ruby-core:07383]
+	* object.c (rb_obj_dup): class of the duped object must be match
+	  to the class of the original.
 
-Sat Feb 18 00:22:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Aug 24 13:57:28 2002  Tanaka Akira  <akr@m17n.org>
 
-	* lib/tracer.rb: merged a minor clarification patch from Daniel
-	  Berger <Daniel.Berger at qwest.com>.  [ruby-core:07376]
+	* lib/time.rb (Time.rfc2822, Time#rfc2822): preserve localtimeness.
 
-Fri Feb 17 11:18:42 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/pp.rb: pretty_print_cycled is renamed to pretty_print_cycle.
 
-	* util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330]
+Fri Aug 23 23:59:57 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* pack.c (EXTEND32): unpack("l") did not work where sizeof(long) != 4.
-	  [ruby-talk:180024]
+	* eval.c (method_call): check receiver is defined.
 
-	* pack.c (pack_unpack): fixed integer overflow on template "w".
-	  [ruby-talk:180126]
+	* eval.c (umethod_call): removed.
 
-Fri Feb 17 09:39:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Aug 23 23:39:17 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_thread_wait_for): sleep should always sleep for
-	  specified amount of time.  [ruby-talk:180067]
+	* re.c (rb_reg_quote): do not escape \t, \f, \r, \n, for they are
+	  not regular expression metacharacters.
 
-Thu Feb 16 01:10:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* time.c (time_s_alloc): use time_free instead of free (null check,
+	  also serves for type mark).
 
-	* eval.c (backtrace): frame->orig_func may not be initialized.
-	  [ruby-core:07367]
+	* time.c (time_s_at): check dfree function too.
 
-Wed Feb 15 16:52:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Aug 23 17:06:48 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* eval.c (rb_eval): NODE_OP_ASGN1 should allow splat in its
-	  argument list.  [ruby-core:07366]
+	* configure.in: RUBY_SO_NAME is msvcrt-rubyXX on mswin32/mingw32.
 
-	* parse.y (arg): avoid unnecessary extra argument.
-	  [ruby-core:07366]
+	* configure.in (sitearch): new var.
 
-	* eval.c (rb_eval): honor visibility on OP_ASGN1 and
-	  OP_ASGN2. [ruby-core:07366]
+	* mkconfig.rb, lib/mkmf.rb (sitearch): ditto.
 
-Wed Feb 15 10:09:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/Makefile.sub, win32/setup.mak (sitearch): ditto.
 
-	* eval.c (yield_under_i): should not pass self as an argument to
-	  the block for instance_eval.  [ruby-core:07364]
+	* instruby.rb: ditto.
 
-Wed Feb 15 09:20:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Aug 21 16:53:00 2002  Michal Rokos  <michal@ruby-lang.org>
 
-	* eval.c (rb_obj_instance_eval): should be no singleton classes for
-	  true, false, and nil.  [ruby-dev:28186]
+	* *.c: int, long types cleanup.
 
-Tue Feb 14 18:48:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y: ditto.
 
-	* eval.c (DMETHOD_P): accessing wrong frame.  [ruby-dev:28181]
+	* re.h, regex.h, ruby.h: ditto.
 
-	* eval.c (proc_invoke): preserve FRAME_DMETH flag.
+Wed Aug 21 16:43:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Feb 14 15:13:51 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (rb_thread_cleanup): should not modify the global
+	  variable curr_thread.
 
-	* ext/zlib/zlib.c: supress warning on test/zlib. [ruby-dev:28323]
+Wed Aug 21 16:14:26 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Feb 14 14:01:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* configure.in: set ac_cv_func__setjmp to "no" on Cygwin.
 
-	* time.c (search_time_t): support non 32bit time_t environments.
+	* configure.in: set ac_cv_func_crypt to "no" on MinGW.
 
-	* win32/Makefile.sub (config.h): VC++8 has ``long long'' type.
+Tue Aug 20 21:47 2002  KONISHI Hiromasa  <konishih@fd6.so-net.ne.jp>
 
-	* win32/Makefile.sub (config.h): VC++8's time_t is 64bit value.
+	* io.c          (rb_io_fread): remove case EPIPE on bcc32 .
 
-	* win32/win32.c (rb_w32_utime): drop read-only attribute before
-	  changing file time.
+	* win32/win32.c (rb_w32_getc): clear EPIPE error on bcc32.
 
-	  all changes are backported from CVS HEAD.
+Tue Aug 20 19:39:03 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Feb 14 11:21:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (rb_file_s_expand_path): accept drive letter on Cygwin.
 
-	* io.c (argf_forward): should not use frame->argv.
-	  [ruby-core:07358]
+	* file.c (is_absolute_path): ditto.
 
-Mon Feb 13 18:08:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Aug 20 12:12:25 2002  Tietew <tietew@tietew.net>
 
-	* eval.c (rb_call0): argument update propagation.  [ruby-dev:28044]
+	* io.c (rb_io_putc): output via rb_io_write().
 
-	* env.h: remove argv member from struct FRAME.
+Mon Aug 19 19:01:55 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon Feb 13 13:27:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* misc/inf-ruby.el (inf-ruby-keys): ruby-send-definition
+	  conflicted with ruby-insert-end.
 
-	* eval.c (eval): should push class from binding if supplied.
-	  [ruby-core:07347]
+	* misc/inf-ruby.el (inferior-ruby-mode): compilation-minor-mode.
 
-Mon Feb 13 00:04:00 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* misc/inf-ruby.el (ruby-send-region): send as here document to
+	  adjust source file/line.  [ruby-talk:47113], [ruby-dev:17965]
 
-	* lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
-	  change <%='s behavior. (backported 1.15 - 1.16)
+	* misc/inf-ruby.el (ruby-send-terminator): added to make unique
+	  terminator.
 
-Sat Feb 11 02:04:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Aug 19 17:08:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (eval): no need to push ruby_class.  [ruby-dev:28176]
+	* re.c (rb_reg_initialize_m): frozen check should be moved here
+	  from rb_reg_initialize().
 
-Sat Feb 11 01:57:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Aug 19 15:38:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_f_autoload): check if ruby_cbase is nil (during
-	  instance_eval for objects cannot have singleton classes,
-	  e.g. fixnums and symbols).  [ruby-dev:28178]
+	* array.c (sort_2): comparison should be done as signed long.
 
-Tue Feb  7 23:03:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* array.c (sort_2): should return int, not VALUE.
 
-	* ext/zlib/zlib.c: should not access ruby objects in finalizer.
-	  [ruby-dev:28286]
+Mon Aug 19 12:38:33 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon Feb  6 16:02:51 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (rb_thread_save_context, rb_thread_restore_context):
+	  save/restore SEH chain on MS-Windows at thread switch.
+	  [ruby-win32:273]
 
-	* file.c (rb_thread_flock): ERROR_NOT_LOCKED is not an error on Cygwin.
-	  In such situation, flock() should return 0.
+	* eval.c (win32_get_exception_list, win32_set_exception_list):
+	  added.
 
-Mon Feb  6 00:41:08 2006  Tanaka Akira  <akr@m17n.org>
+Sat Aug 17 23:01:25 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ruby.h (RSTRUCT_LEN, RSTRUCT_PTR): defined for source level
-	  compatibility with ruby 1.9.
+	* array.c (sort_2): *a - *b may overflow.
 
-Sun Feb  5 21:05:34 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Aug 17 00:25:08 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* numeric.c (fix_to_s): removed workaround for radix 2. Historically,
-	  rb_fix2str could only handle radix 8, 10, 16. (Rev1.37) But for now,
-	  it can handle radix 2..36. [ruby-Bugs#3438] [ruby-core:7300]
+	* array.c (ary_new): len*sizeof(VALUE) may be a positive value.
 
-Sun Feb  5 18:55:08 2006  Minero Aoki  <aamine@loveruby.net>
+	* array.c (rb_ary_initialize): ditto.
 
-	* lib/net/http.rb: imported from trunk, rev 1.129
+Fri Aug 16 15:58:16 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/net/http.rb (add_field, get_fields): keep 1.8.2 backward
-	  compatibility.
+	* io.c (NOFILE): define NOFILE as 64 if not defined.
 
-	* lib/net/https.rb: imported from trunk, rev 1.3.
+	* signal.c (sighandler_t): rename to sh_t on dietlibc.
 
-	* lib/net/https.rb: #use_ssl? definition moved from net/http.rb.
+Fri Aug 16 15:37:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Sun Feb  5 14:22:15 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bignum.c (rb_cstr_to_inum): new decimal and octal string.
 
-	* lib/pstore.rb: should return default value if name is not found.
-	  [ruby-core:7304]
+Fri Aug 16 13:17:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/pstore.rb: should raise PStore::Error if not in transaction.
+	* object.c (rb_class_allocate_instance): move singleton class
+	  check from rb_obj_alloc().
 
-Sat Feb  4 22:51:43 2006  Tanaka Akira  <akr@m17n.org>
+Fri Aug 16 11:47:24 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* eval.c: apply the FreeBSD getcontext/setcontext workaround
-	  only before FreeBSD 7-CURRENT.
+	* io.c (rb_io_fread): renamed from io_fread and made extern.
 
-Sat Feb  4 21:19:23 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* marshal.c (r_bytes0): check if successfully read, use
+	  rb_io_fread() instead of fread() to be preemptive.
+	  (ruby-bugs-ja:PR#294, 295)
 
-	* win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error.
-	  In such situation, flock() should return 0.
+	* rubyio.h (rb_io_fread): added.
 
-Sat Feb  4 15:56:37 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Aug 16 07:57:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* numeric.c (fix_to_s): (2**32).to_s(2) fails with exception where
-	  sizeof(int) == 4 < sizeof(long). [ruby-core:7300]
+	* eval.c (compile_error): must not clear ruby_sourcefile here.
+	  (ruby-bugs:PR#364).
 
-Fri Feb  3 15:06:50 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (rb_longjmp): set ruby_sourcefile before making
+	  backtrace.
 
-	* ext/syck/syck.c (syck_move_tokens): should reset p->cursor or etc
-	  even if skip == 0. This causes buffer overrun.
-	  (ex: YAML.load('--- "..' + '\x82\xA0' * 511 + '"'))
+Thu Aug 15 20:38:58 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Feb  2 23:51:18 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (ruby_current_node) : added to set sourceline on demand.
 
-	* ext/syck/emitter.c (syck_emitter_write): should not set '\0' on
-	  emitter's marker. if marker points to the end of buffer, this causes
-	  buffer overrun. (ex: YAML.dump("." * 12288))
+	* eval.c (error_pos, error_print, rb_longjmp, assign): set source
+	  file/line.
 
-Thu Feb  2 16:01:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_eval): store current node instead of file/line, and
+	  preserve it at return.
 
-	* eval.c (eval): need not to protect $SAFE value.
-	  [ruby-core:07177]
+	* eval.c (module_setup): ditto.
 
-Thu Feb  2 14:45:53 2006  Ville Mattila  <ville.mattila@stonesoft.com>
+	* eval.c (struct thread): store node instead of file/line.
 
-	* configure.in: The isinf is not regognized by autoconf
-	  library guesser on solaris 10. [ruby-core:7138]
+	* eval.c (rb_thread_raise): ditto.
 
-Wed Feb  1 22:01:47 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* intern.h (ruby_current_node): added.
 
-	* configure.in, hash.c (ruby_setenv): use setenv(3) and unsetenv(3)
-	  where they are supported. modifing environ variable seems to
-	  segfault solaris 10. [ruby-core:7276] [ruby-dev:28270]
+	* intern.h (ruby_set_current_source): added.
 
-	* ruby.c (set_arg0): if use setenv(3), environ space cannot be used
-	  for altering argv[0].
+	* parse.y (stmt, arg): not fix position of assignment.
 
-Tue Jan 31 14:46:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (node_assign): ditto.
 
-	* struct.c (rb_struct_select): update RDoc description.
-	  [ruby-core:7254]
+	* parse.y (yycompile): clear current node.
 
-Tue Jan 31 11:58:51 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Aug 15 00:48:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#eval and bg_eval.
+	* re.c (rb_reg_initialize): should not modify frozen Regexp.
 
-	* ext/tk/lib/tk/namespace.rb: TkNamespace#eval was enbugged at the
-	  last commit. Now it will return a proper object.
+Tue Aug 13 18:33:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Jan 31 00:10:26 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/tcltklib/tcltklib.c (ip_init): allocation framework.
 
-	* ext/syck/rubyext.c (syck_resolver_transfer): workaround for SEGV.
-	  ex: ruby -ryaml -e 'YAML.load("!map:B {}")' [ruby-core:7217]
+Tue Aug 13 15:32:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jan 28 07:56:57 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* hash.c (rb_hash_replace): should copy ifnone.
 
-	* lib/rdoc/usage.rb: support "a:0:33" style caller[-1]. In this case
-	  file name is "a:0". I don't know this really happens though...
-	  [ruby-Bugs:3344]
+	* hash.c (rb_hash_dup): should preserve HASH_PROC_DEFAULT and
+	  HASH_DELETED flags.
 
-Wed Jan 25 22:29:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* hash.c (rb_hash_shift): shift from empty hash should not return
+	  its default proc.
 
-	* configure.in, dln.c, file.c, intern.h, missing.h (eaccess): use
-	  system routine if provided.  fixed: [ruby-core:07195]
+	* hash.c (rb_hash_default_proc): new method. [new]
 
-Sun Jan 22 23:27:13 2006  Go Noguchi  <gonoguti@yahoo.co.jp>
+Tue Aug 13 00:37:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/test/unit/autorunner.rb (process_args): ignore arguments after
-	  '--' so that test scripts can handle them.  fixed: [ruby-dev:28258]
+	* array.c (rb_ary_aref): no need for Bignum check.
 
-Sun Jan 22 22:09:52 2006  Tanaka Akira  <akr@m17n.org>
+	* array.c (rb_ary_aset): explicit Bignum check removd.
 
-	* eval.c (POST_GETCONTEXT): define separately from PRE_GETCONTEXT on
-	  IA64 to avoid reusing variable address.
+	* numeric.c (fix_aref): normalize bignum before bit-op.
 
-Sun Jan 22 20:03:35 2006  Tanaka Akira  <akr@m17n.org>
+	* bignum.c (rb_big_rand): max may be Bignum zero.
 
-	* eval.c (ruby_setjmp): define PRE_GETCONTEXT and POST_GETCONTEXT
-	  instead of FUNCTION_CALL_MAY_RETURN_TWICE.
-	  define PRE_GETCONTEXT to clear carry flag for workaround of
-	  FreeBSD/i386 getcontext/setcontext bug.
-	  [ruby-dev:28263]
+	* bignum.c (rb_cstr_to_inum): should normalize bignums, to avoid
+	  returning fixable bignum value.
 
-Sat Jan 21 00:36:47 2006  Tanaka Akira  <akr@m17n.org>
+	* bignum.c (rb_uint2big): there should be no zero sized bignum.
 
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): use only on SPARC and IA64
-	  before gcc 4.0.3.
-	  [ruby-dev:28247]
+Mon Aug 12 23:45:28 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jan 19 22:21:23 2006  Minero Aoki  <aamine@loveruby.net>
+	* ext/extmk.rb.in: extmake() that works properly for both tkutil
+	  (tk/tkutil.so) and digest/sha1.
 
-	* lib/fileutils.rb (mv): should remove file after copying.
-	  [ruby-dev:28223]
+Mon Aug 12 22:29:35 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Jan 18 23:37:06 2006  Tanaka Akira  <akr@m17n.org>
+	* ruby.c (set_arg0): Correct the position of #endif.
 
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): don't clobber %l7 of SPARC
-	  if enable-shared.
-	  (ruby_setjmp): call FUNCTION_CALL_MAY_RETURN_TWICE after getcontext
-	  too.
-	  reported by Pav Lucistnik and Marius Strobl.
-	  http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
+Mon Aug 12 17:25:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Jan 17 11:32:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* hash.c (rb_hash_equal): should check HASH_PROC_DEFAULT too.
 
-	* win32/setup.mak (MAKE): workaround for nmake 8.
+Mon Aug 12 16:15:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Tue Jan 17 11:10:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (rb_big_cmp): raise for NaN.  (ruby-bugs-ja:PR#284).
 
-	* win32/{Makefile.sub,setup.mak}: invoke .bat via shell. workaround
-	  for nmake 8.
+Sun Aug 11 09:34:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon Jan 16 10:26:23 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (rb_eval): set line number from all nodes.
 
-	* ext/syck/emitter.c (syck_emit_seq, syck_emit_map, syck_emit_item):
-	  should output complex key mark even if map's key is empty seq/map.
-	  [ruby-core:7129]
+	* eval.c (proc_to_s): show source file/line if available.
 
-Sat Jan 14 05:37:06 2006  Tanaka Akira  <akr@m17n.org>
+	* marshal.c (r_object): register TYPE_BIGNUM regardless real type.
 
-	* io.c (READ_DATA_PENDING, READ_DATA_PENDING_COUNT): defined
-	  for DragonFly BSD 1.4.0.
+Sat Aug 10 23:47:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jan 14 03:43:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bignum.c (rb_big_cmp): use dbl2big() for Floats, instead of
+	  big2dbl().
 
-	* file.c (rb_file_s_chmod): avoid warning where sizeof(int) !=
-	  sizeof(void*).
+	* bignum.c (Init_Bignum): rb_big_zero_p() removed.  There may be
+	  Bignum zero.
 
-Fri Jan 13 19:14:56 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Aug  9 13:31:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/rdoc/diagram.rb:
-	    - properly quote bare element attributes
-	    - terminates dangling elements (e.g. <img>, <br>, <link>, etc)
-	    - converts "CVS" to the more HTML-friendly acronym element
-	    - adds missing type attributes to style elements
+	* ext/Win32API/extconf.rb: check existence of <windows.h>.
 
-	  based on Paul Duncan's patch <pabs@pablotron.org> [ruby-core:7028]
+Thu Aug  8 09:37:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/rdoc/generators/html_generator.rb: ditto.
-	* lib/rdoc/generators/template/html/hefss.rb: ditto.
-	* lib/rdoc/generators/template/html/html.rb: ditto.
-	* lib/rdoc/generators/template/html/kilmer.rb: ditto.
+	* lib/optparse.rb (NilClass): must provide conversion block.
 
-Thu Jan 12 11:53:08 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/optparse.rb (String): ditto.
 
-	* ext/tk/sample/tkballoonhelp.rb: [bug fix] couldn't add to a widget
-	  which is constructed with TkComposite module.
-	  [new feature] support 'command' option which is called just before
-	  popping up the balloon help.
+Thu Aug  8 00:45:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Jan 11 15:00:00 2006  Ville Mattila  <mulperi@iki.fi>
+	* eval.c (rb_call0): new argument added for original method name.
+	  preserve original method name in frame->orig_func.
 
-	* io.c (READ_PENDING*): Support solaris 64-bit environments.
-	  Solaris defines a opaque FILE struct when compiling 64 bit
-	  binaries. This means that we dont have access to _ptr etc.
-	  members anymore. The solution by Steven Lumos is to define
-	  FILE64 that has needed members available. I've modified
-	  the origanal patch a bit so that it compiles both with gcc
-	  and now free sun studio 11 compiler and both amd64 and sparc.
-	  NOTE! We have to 64 bit solaris FILE structure time to time
-	  otherwise we'll get breakage.
-	  [ruby-core:7106]
+	* eval.c (is_defined): use frame->orig_func, not last_func.
 
-Tue Jan 10 19:42:33 2006  Tanaka Akira  <akr@m17n.org>
+	* eval.c (rb_eval): ditto.
 
-	* gc.c (garbage_collect): mark ruby_current_node.
-	  if an exception is raised in a finalizer called written in C by
-	  rb_gc_call_finalizer_at_exit, ruby_set_current_source may use
-	  collected ruby_current_node and mark_source_filename may corrupt
-	  memory.
+	* eval.c (method_call): supply data->oid also to rb_call0().
 
-Tue Jan 10 13:30:34 2006  akira yamada  <akira@ruby-lang.org>
+	* object.c (rb_class_allocate_instance): call rb_obj_alloc() when
+	  called from alias, thus invoke original "allocate".
 
-	* ext/syck/rubyext.c (syck_resolver_transfer): should be able to load
-	  !ruby/object:Bignum syntax 1.8.3 dumped. [ruby-core:6159]
+	* eval.c (remove_method): removing allocate from classes should
+	  cause NameError.
 
-Tue Jan 10 12:47:41 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Aug  7 22:12:54 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/yaml/rubytypes.rb (Fixnum): Bignum could not be loaded in
-	  ruby 1.8.3/1.8.4. [ruby-core:6115]
+	* lib/optparse.rb (OptionParser::Completion::convert): returned
+	  all values not first one.
 
-	* lib/yaml/rubytypes.rb (Numeric): Subclass of Numeric could not
-	  be dumped properly. [ruby-core:7047]
+	* lib/optparse.rb (OptionParser::Switch::parse): return values as
+	  is.
 
-Tue Jan 10 12:00:48 2006  Aaron Schrab  <aaron @nospam@ schrab.com>
+	* lib/optparse.rb (OptionParser::order): ditto.
 
-	* lib/yaml/rubytypes.rb (Symbol#yaml_new): YAML loading of quoted
-	  Symbols broken. [ruby-Bugs:2535]
+	* lib/optparse/time.rb: prior time.rb.
 
-Mon Jan  9 19:54:35 2006  arton  <artonx@yahoo.co.jp>
+	* lib/optparse/uri.rb: require standard uri module.  thanks to
+	  Minero Aoki.
 
-	* ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by
-	  http://www.zlib.net/ has zdll.lib. [ruby-dev:28209]
+Wed Aug  7 09:51:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jan  9 14:17:12 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* hash.c (rb_hash_equal): should check default values.
 
-	* win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
-	  (VisualC++6) so use -O2b2xg- if  $(MSC_VER) < 1400. [ruby-core:7040]
+Wed Aug  7 08:44:32 2002  Minero Aoki  <aamine@loveruby.net>
 
-Mon Jan  9 14:17:12 2006  Kero van Gelder  <rubyforge @nospam@ kero.tmfweb.nl>
+	* ext/racc/cparse/cparse.c: reduce goto.
 
-	* lib/webrick/httpservlet/filehandler.rb: fixed typo. [ruby-core:7075]
+Tue Aug  6 15:19:39 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Sat Jan  7 15:40:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_rindex): must return -1 if unmatched.
 
-	* parse.y (singleton): get rid of segfault on syntax error.
-	  fixed: [ruby-core:07070]
+Mon Aug  5 22:41:18 2002  Minero Aoki  <aamine@loveruby.net>
 
-Fri Jan  6 10:16:20 2006  Steven Lumos  <steven@lumos.us>
+	* MANIFEST: add lib/racc/parser.rb.
 
-	* io.c (READ_DATA_PENDING): defined for 64bit Solaris on SPARC.
-	  [ruby-core:7057]
-	  (READ_DATA_PENDING_COUNT): ditto.
-	  (READ_DATA_PENDING_PTR): ditto.
+	* ext/racc/cparse/cparse.c: code refine.
 
-Sun Jan  1 17:07:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/racc/cparse/MANIFEST: add depend.
 
-	* win32/win32.c (rb_w32_seekdir): should not segfault even if passed
-	  the location which rb_w32_telldir didn't return. [ruby-core:7035]
-	  (I think HEAD implementation is better. but binary compatibility)
+Sun Aug  4 22:30:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* test/ruby/test_dir.rb: added.
+	* ext/curses/curses.c: follow allocation framework.
 
-Sat Dec 31 22:57:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug  3 21:23:56 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* eval.c (rb_thread_save_context): should not recycle scope object used
-	  in a thread.  fixed: [ruby-dev:28177]
+	* eval.c (rb_eval): set constant in cbase scope.
 
-Fri Dec 30 18:22:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (assign): ditto.
 
-	* gc.c (garbage_collect): mark objects refered from aborting threads.
-	  [ruby-dev:28190]
+Fri Aug  2 09:12:32 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* win32/Makefile.sub: VC++8 support.
+	* ext/strscan/strscan.c: follow allocation framework.
 
-Fri Dec 30 14:24:53 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+Fri Aug  2 01:21:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* dir.c (glob_helper): do not use TRUE for djgpp.
+	* ext/socket/socket.c (s_recvfrom): update RSTRING len.
 
-Fri Dec 30 04:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Aug  1 17:47:15 2002  Tachino Nobuhiro <tachino@jp.fujitsu.com>
 
-	* file.c (eaccess): workaround for VC++8 runtime.
+	* parse.y (tokadd_string): ignore backslashed spaces in %w.
 
-	* win32/win32.c (ioinfo): VC++8 support.
+Thu Aug  1 14:14:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Dec 29 23:59:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enum.c (enum_find): do not use rb_eval_cmd(); should not accept
+	  a string for if_none.
 
-	* eval.c (rb_gc_mark_threads): leave unmarked threads which won't wake
-	  up alone, and mark threads in the loading table.  [ruby-dev:28154]
+Wed Jul 31 14:11:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
-	  threads.  [ruby-dev:28172]
+	* eval.c (rb_undef): undef should be done for klass, not ruby_class.
 
-Thu Dec 29 17:02:07 2005  Tanaka Akira  <akr@m17n.org>
+Tue Jul 30 19:48:51 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
-	  "miniruby".  [ruby-dev:28140]
+	* misc/ruby-mode.el (ruby-accurate-end-of-block): restrict search
+	  region.
 
-Tue Dec 27 16:59:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* misc/ruby-mode.el (ruby-parse-partial): reversed wrong patch.
 
-	* test/drb/drbtest.rb (DRbService::self.ext_service): increase
-	  timeout limit.  a patch from Kazuhiro NISHIYAMA
-	  <zn at mbf.nifty.com>. [ruby-dev:28132]
+Tue Jul 30 17:21:13 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Tue Dec 27 08:29:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* misc/ruby-mode.el (ruby-accurate-end-of-block): incomplete block
+	  caused infinite loop.
 
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
-	  treat wildcard character in commonName. [ruby-dev:28121]
+	* misc/ruby-mode.el (ruby-parse-partial): returns nil unless
+	  delimiters found.
 
-Mon Dec 26 22:32:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul 30 15:24:07 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS,
-	  NEW_VALIAS), parse.y (fitem): allow dynamic symbols to
-	  NODE_UNDEF and NODE_ALIAS.
-	  backported from trunk.  fixed: [ruby-dev:28105]
+	* ext/tcltklib/stubs.c (ruby_tcltk_stubs): win32_getenv returns
+	  the same address always, so allocate string by ruby_strdup.
 
-Mon Dec 26 08:50:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c: prototype; rb_w32_open_osfhandle().
 
-	* eval.c (ev_const_get): fixed a bug in constant reference during
-	  instance_eval.  [yarv-dev:707]
+Tue Jul 30 09:11:07 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* eval.c (ev_const_defined): ditto.
+	* eval.c (rb_thread_join_m): add parameter type declaration.
 
-	* lib/yaml.rb (YAML::add_domain_type): typo fixed.  a patch from
-	  Joel VanderWerf <vjoel at path.berkeley.edu>.
-	  [ruby-talk:165285] [ruby-core:6995]
+Tue Jul 30 08:37:11 2002  Minero Aoki  <aamine@loveruby.net>
 
-Sat Dec 24 18:58:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (localjump_error): add parameter type declaration.
 
-	* stable version 1.8.4 released.
+Mon Jul 29 16:00:54 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Fri Dec 23 10:30:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/extmk.rb.in: always use File.expand_path for $top_srcdir.
 
-	* ext/digest/sha2/sha2.c (ULL): support AIX C.  a patch from
-	  Kailden <kailden at gmail.com>.  [ruby-core:06984]
+Sat Jul 27 23:07:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Dec 21 16:53:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* numeric.c (num_to_int): default to_int implementaion for every
+	  numeric class.
 
-	* file.c (w32_io_info): should return handle because FileIndex is
-	  valid only while file is open. [ruby-dev:28088]
+Sat Jul 27 08:09:03 2002  Booker C. Bense  <bbense@slac.stanford.edu>
 
-Wed Dec 21 14:53:26 2005  Tanaka Akira  <akr@m17n.org>
+	* re.c (rb_reg_quote): initial part of the string was never copied
+	  to the quoted string.
 
-	* lib/pathname.rb (test_kernel_open): use File.identical?.
-	  [ruby-talk:171804]
+Fri Jul 26 23:03:53 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Tue Dec 20 22:41:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): no need to convert to string twice.
 
-	* eval.c (eval_under_i): evaluate source in caller's frame.
-	  [ruby-dev:28076]
+Fri Jul 26 18:32:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* eval.c (rb_call_super): use original method name on exception.
-	  [ruby-dev:28078]
+	* misc/ruby-mode.el (ruby-expr-beg): wrong indent at modifiers
+	  after ?.
 
-Tue Dec 20 13:11:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jul 26 16:01:16 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/syck/rubyext.c: fixed GC problem (backported HEAD 1.55 - 1.62)
-	  [ruby-dev:27839]
+	* ext/extmk.rb.in (create_makefile): use Regexp in gsub.
 
-	* ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
-	  NULL or not before S_FREE.
+	* sample/mkproto.rb: ditto and fix bug.
 
-	* st.c: uses malloc instead of xmalloc to avoid GC. syck uses st_insert
-	  in gram.c to insert node from rb_syck_bad_anchor_handler into
-	  SyckParser's hash table. if GC occurs in st_insert, it's not under
-	  SyckParser's mark system yet. so RString can be released wrongly.
-	  [ruby-dev:28057]
+Fri Jul 26 14:31:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Dec 20 12:53:23 2005  why the lucky stiff  <why@ruby-lang.org>
+	* random.c: replace with Mersenne Twister RNG.
 
-	* ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
-	  with previous Ruby versions, documents are no longer headless.
+Fri Jul 26 12:14:48 2002  Minero Aoki  <aamine@loveruby.net>
 
-Tue Dec 20 01:46:48 2005  Tanaka Akira  <akr@m17n.org>
+	* parse.y (yylex): modify to accept a code like "m (a){...}".
 
-	* io.c (rb_f_backquote): fix a GC problem on
-	  IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
+Thu Jul 25 09:05:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon Dec 19 23:32:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* misc/ruby-mode.el (ruby-delimiter): include here document.
 
-	* parse.y (rb_symname_p): fixed wrong validation.  [ruby-dev:28047]
+	* misc/ruby-mode.el (ruby-deep-arglist): skips spaces after
+	  parenthesis when 'space.
 
-Sat Dec 17 03:57:01 2005  Tanaka Akira  <akr@m17n.org>
+	* misc/ruby-mode.el (ruby-imenu-create-index): fix for nested
+	  classes.
 
-	* bignum.c (rb_big_rshift): fix a GC problem on
-	  IA64 with gcc 4.0.3 20051216 (prerelease).
+	* misc/ruby-mode.el (ruby-accurate-end-of-block): added.  scan a
+	  block in the order.
 
-Sat Dec 17 03:30:23 2005  Tanaka Akira  <akr@m17n.org>
+	* misc/ruby-mode.el (ruby-expr-beg): support for here document.
 
-	* eval.c (bmcall): fix a GC problem by tail call on
-	  IA64 with gcc 4.0.3 20051216 (prerelease).
+	* misc/ruby-mode.el (ruby-parse-partial): splitted from
+	  ruby-parse-region.
 
-Fri Dec 16 00:54:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* misc/ruby-mode.el (ruby-move-to-block): skips RD style comments.
 
-	* signal.c (Init_signal): revert C++ style comment.
-	  [ruby-dev:28041]
+Wed Jul 24 09:47:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Dec 15 12:35:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (jump_tag_but_local_jump): preserve retval in
+	  LocalJumpError exceptions.
 
-	* lib/tmpdir.rb: merged RDoc patch from Eric Hodel <drbrain at
-	  segment7.net>.  [ruby-core:06894]
+	* parse.y (command): no more check for "super outside of method".
 
-Thu Dec 15 01:33:31 2005  Tanaka Akira  <akr@m17n.org>
+	* eval.c (rb_mod_define_method): should set last_class and
+	  last_func in the block->frame.
 
-	* ext/zlib/zlib.c (zstream_run): fix a GC problem by tail call on
-	  x86_64 with gcc 4.0.3 20051111 (prerelease) (Debian 4.0.2-4)
+Mon Jul 22 17:23:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Dec 14 12:11:46 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (error_handle): should handle TAG_THROW as well.
 
-	* test/gdbm/test_gdbm.rb: specify pid for the argument of
-	  Process.wait.  workaround for Cygwin.
+Fri Jul 19 10:52:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Dec 14 12:01:26 2005  Tanaka Akira  <akr@m17n.org>
+	* parse.y (yylex): new decimal notation '0d4567'.
 
-	* marshal.c (r_object0): fix a GC problem for reading a bignum on
-	  IA64 with gcc 3.3.5 (Debian 1:3.3.5-13).
+Thu Jul 18 11:52:02 2002  Shugo Maeda  <shugo@ruby-lang.org>
 
-Tue Dec 13 12:23:47 2005  Tanaka Akira  <akr@m17n.org>
+	* lib/net/ftp.rb (set_socket): new method.
 
-	* re.c (rb_reg_regcomp): fix a GC problem on x86_64 with
-	  gcc 3.3.5 (Debian 1:3.3.5-13).
+Thu Jul 18 06:51:24 2002  Minero Aoki  <aamine@loveruby.net>
 
-Tue Dec 13 01:44:16 2005  Tanaka Akira  <akr@m17n.org>
+	* parse.y (yylex): fix typo.
 
-	* array.c (rb_ary_diff): fix a GC problem on IA64 with
-	  gcc 3.3.5 (Debian 1:3.3.5-13).
-	  When rb_ary_push is called, there was no register which contains
-	  `hash' but `&RHASH(hash)->tbl' instead.
+Wed Jul 17 18:41:28 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Dec 13 00:08:09 2005  Tanaka Akira  <akr@m17n.org>
+	* parse.y (yylex): new octal notation '0o777'.
 
-	* sprintf.c (rb_str_format): fix a GC problem.
-	  [ruby-dev:28001]
+Mon Jul 15 18:36:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Dec 12 15:54:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (string_content): every string_content node should
+	  return string only.  use NODE_EVSTR to coercing.
 
-	* test/openssl/test_ssl.rb (test_parallel): call GC.start to close
-	  unused files. [ruby-dev:27981]
+	* eval.c (rb_eval): NODE_EVSTR support.
 
-Mon Dec 12 00:33:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul 15 10:35:35 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/digest/digest.c (rb_digest_base_s_digest): add volatile to
-	  protect temporary context object.  [ruby-dev:27979]
+	* parse.y (heredoc_identifier): fix typo.
 
-	* ext/iconv/iconv.c (Init_iconv): rb_gc_register_address() should
-	  be called before actual variable initialization.
-	  [ruby-dev:27986]
+Sat Jul 13 09:30:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Fri Dec  9 23:31:02 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (literal_concat_string): wrong optimization.
 
-	* lib/rexml/encoding.rb (encoding=): give priority to particular
-	  conversion to iconv.  [ruby-core:06520]
+Sat Jul 13 01:25:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Dec  8 02:07:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/resolv.rb (Resolv::DNS::open, close): new.
 
-	* eval.c (umethod_bind): adjust invoking class for module method.
-	  [ruby-dev:27964]
+	* lib/optparse.rb, lib/optparse: import.
 
-Thu Dec  8 00:40:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul 12 06:34:05 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* eval.c (call_trace_func): klass parameter should be a
-	  class/module that defines calling method.  [ruby-talk:169307]
+	* lib/net/http.rb: rename HTTP.get_uri get_response.
 
-Wed Dec  7 17:10:27 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* lib/net/http.rb: HTTP.get_print accepts URI objects.
 
-	* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
+	* lib/net/http.rb: HTTP.get had not work with URI objects.
 
-Wed Dec  7 15:31:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul 12 02:15:58 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* sprintf.c (rb_str_format): integer overflow check added.
+	* string.c (rb_str_match): fix for string match.
 
-	* sprintf.c (GETASTER): ditto.
+Fri Jul 12 00:02:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Wed Dec  7 01:02:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/stringio/stringio.c (strio_gets_internal): fixed for record
+	  separator longer than 1.
 
-	* ext/tk/README.macosx-aqua: [new document] tips to avoid the known
-	  bug on platform specific dialogs of Tcl/Tk Aqua on MacOS X.
+Thu Jul 11 17:59:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/tcltklib.c: fix bug on switching threads and waiting on the
-	  deleted interpreter on vwait and tkwait command.
+	* re.c (rb_reg_quote): avoid unnecessary string allocation.
 
-	* ext/tk/lib/multi-tk.rb: kill the meaningless loop for the deleted Tk
-	  interpreter.
+	* string.c (get_pat): quote metachracters before compiling a
+	  string into a regex.
 
-	* ext/tk/sample/demos-jp/image3.rb: [bug fix] wrong argument.
+	* string.c (rb_str_split_m): special treatment of strings of size
+	  1, but AWK emulation.  now uses get_pat().
 
-	* ext/tk/sample/demos-en/image3.rb: ditto.
+	* string.c (rb_str_match_m): quote metacharacters.
 
-	* ext/tk/sample/demos-jp/menu.rb: fix message for MacOS X.
+	* string.c (rb_str_match2): ditto.
 
-	* ext/tk/sample/demos-jp/menu8x.rb: ditto.
+Thu Jul 11 12:59:23 2002  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/tk/sample/demos-en/menu.rb: ditto.
+	* lib/resolv.rb: untaint strings read from /etc/hosts and
+	/etc/resolv.conf to prevent SecurityError when $SAFE==1.
 
-Tue Dec  6 16:37:57 2005  Yuya Nishida  <yuya@j96.org>
+Thu Jul 11 09:00:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (exec_under): avoid accessing ruby_frame->prev.
-	  [ruby-dev:27948]
+	* string.c (rb_str_slice_bang): if there's no corresponding
+	  substring, slice! should return nil without exception.
 
-Thu Dec  1 00:50:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul  9 20:03:55 2002 Keiju Ishitsuka <keiju@ishitsuka.com>
 
-	* eval.c (rb_funcall2): allow to call protected methods.
-	  fixed: [ruby-dev:27890]
+	* irb 0.9
+	
+Sat Jul  6 07:35:02 2002  Jamie Herre  <jfh@gettysgroup.com>
 
-Wed Nov 30 23:52:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_insert): type fixed.
 
-	* parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
-	  fixed: [ruby-dev:27896]
+Fri Jul  5 09:17:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Nov 30 13:43:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_split_m): accept separator value nil as well.
 
-	* misc/ruby-mode.el (ruby-expr-beg): support $! at the end of
-	  expression.   [ruby-dev:27868]
+Fri Jul  5 08:59:15 2002  Michal Rokos <michal@ruby-lang.org>
 
-Mon Nov 28 18:55:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* enum.c: Fix bug in enum_sort_by and some code indents
 
-	* ext/socket/socket.c (init_inetsock_internal): remove setting
-	  SO_REUSEADDR option on server socket on Cygwin.
-	  fixed: [ruby-core:6765] ([ ruby-Bugs-2872 ])
+Fri Jul  5 05:00:40 2002  Wakou Aoyama  <wakou@ruby-lang.org>
 
-Mon Nov 28 13:08:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
+	thanks to Sean Chittenden <sean@ruby-lang.org>, Shugo Maeda
+	<shugo@modruby.net>
 
-	* win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
-	  error message on bccwin32 + winsock)
+Fri Jul  5 00:10:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Nov 28 09:21:49 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* string.c (rb_str_become): was leaking memory.
 
-	* lib/mkmf.rb (create_makefile): should not change sodir with
-	  dir.gsub!. (bccwin32 failed to install third party exntesions)
-	  [ruby-dev:27834]
+Thu Jul  4 23:43:26 2002  Minero Aoki  <aamine@loveruby.net>
 
-Sun Nov 27 00:56:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* parse.y: remove useless function str_extend_p().
 
-	* lib/wsdl/xmlSchema/complexContent.rb: missing
-	  ComplexContent#elementformdefault method.
+Wed Jul  3 14:26:40 2002  Sean Chittenden  <sean@ruby-lang.org>
 
-Sat Nov 26 19:57:45 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/net/ftp.rb (get): new method.
 
-	* dln.c (conv_to_posix_path): should initialize posix.
+	* lib/net/ftp.rb (putt): ditto.
 
-Thu Nov 24 21:05:58 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/net/ftp.rb (binary): ditto.
 
-	* configure.in (AC_CHECK_FUNCS): need to check link().
-	  fixed: [ruby-dev:27814]
+	* lib/net/ftp.rb (binary=): ditto.
 
-Thu Nov 24 01:22:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul  3 13:57:53 2002  Sean Chittenden  <sean@ruby-lang.org>
 
-	* file.c (w32_io_info): CreateFile failed on Win9x if file was already
-	  opened. (FILE_SHARE_READ was needed, but actually I don't understand
-	  the flags of CreateFile well...)
+	* lib/net/ftp.rb (getbinaryfile): the second argument (localfile)
+	is now optional.
 
-Wed Nov 23 20:59:01 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/net/ftp.rb (gettextfile): ditto.
 
-	* ext/tk/lib/tk.rb: add Tk.pkgconfig_list and Tk.pkgconfig_get
-	  [Tk8.5 feature].
+Wed Jul  3 13:45:42 2002  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/tk/lib/tk/text.rb: supports new indices modifires on a Text
-	  widget [Tk8.5 feature].
+	* lib/net/ftp.rb: use &block and yield for speed.
 
-	* ext/tk/lib/tk/virtevent.rb: add TkNamedVirtualEvent.
+Wed Jul  3 02:32:31 2002  Wakou Aoyama  <wakou@ruby-lang.org>
 
-	* ext/tk/lib/tk/autoload.rb: ditto.
+	* lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
 
-	* ext/tk/lib/tk/event.rb: add :data key for virtual events [Tk8.5
-	  feature].
+Tue Jul  2 14:53:10 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Nov 23 18:55:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* 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.
 
-	* file.c (w32_io_info): should not call GetFileInformationByHandle
-	  for pipe.
+	* class.c (include_class_new): module may be T_ICLASS; retrieve
+	  original module information.
 
-	* file.c (w32_io_info): checks return value from rb_w32_get_osfhandle.
+Tue Jul  2 14:13:11 2002  Wakou Aoyama  <wakou@ruby-lang.org>
 
-	* file.c (w32_io_info): now can identify directory on WinNT.
+	* lib/cgi.rb (CGI#header): accept any type as value.
 
-Wed Nov 23 03:40:49 2005  Guy Decoux  <ts@moulon.inra.fr>
+Sun Jun 30 17:05:29 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* re.c (KR_REHASH): should cast to unsigned for 64bit CPU.
-	  [ruby-core:06721]
+	* configure.in (seekdir, telldir): add ac_cv_func_telldir=yes,
+	  ac_cv_func_seekdir=yes for MinGW.
 
-Wed Nov 23 11:01:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jun 29 01:43:32 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* intern.h, file.c: failed to compile on windows.
+	* io.c (pipe_finalize, pipe_popen): two-way pipe support for win32.
 
-Wed Nov 23 07:26:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* win32/win32.c (ChildRecord, FindFreeChildSlot): ditto.
 
-	* ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.
+	* win32/win32.c, win32/win32.h (pipe_exec): new function for two-way
+	  pipe support for win32.
 
-	* ext/openssl/ossl_x509ext.c (MakeX509ExtFactory): should use
-	  OPENSSL_malloc to allocate X509V3_CTX.
+	* win32/win32.c, win32/win32.h (FindPipedChildSlot, rb_w32_popen,
+	  rb_w32_pclose): removed functions for two-way pipe support for win32.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext): use
-	  X509V3_EXT_nconf_nid to avoid SEGV (and to build extensions which
-	  values are placed in separate section).
+Fri Jun 28 23:49:34 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* test/openssl/test_x509ext.rb: new file.
+	* pack.c (pack_unpack): change names of local variables because their
+	  names are overlapped.
 
-Wed Nov 23 01:22:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun 28 17:54:07 2002  Tanaka Akira  <akr@m17n.org>
 
-	* file.c (test_identical): test if two files are identical.
+	* lib/pp.rb: fix object address.
 
-	* file.c (rb_f_test): support DOSISH systems where st_ino is not
-	  reliable.  fixed: [ruby-core:06672]
+Thu Jun 27 23:55:50 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* win32.h, win32.c (rb_w32_osid): check the running platform.
+	* win32/win32.c (rb_w32_stat): fix buffer overflow. (ruby-bugs:PR#329)
 
-Tue Nov 22 23:52:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jun 27 20:57:45 2002  Tanaka Akira  <akr@m17n.org>
 
-	* lib/optparse.rb: match incomplete (in current enconding) multibyte
-	  string.  http://inamode6.tokuhirom.dnsalias.org/show/1551
+	* lib/prettyprint.rb, lib/pp.rb: convenience methods added.
 
-Tue Nov 22 18:36:11 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jun 27 15:22:18 2002  Tanaka Akira  <akr@m17n.org>
 
-	* win32/win32.c (winnt_stat): set mapped errno instead of ENOENT.
+	* lib/prettyprint.rb: re-implemented for incremental output to handle
+	huge data.  API is changed a bit.
 
-Tue Nov 22 14:46:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/pp.rb: adapt new pretty printing API.
 
-	* file.c (rb_file_s_basename): skip slashes just after UNC top slashes.
+Thu Jun 27 08:28:18 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* test/ruby/test_path.rb (test_dirname, test_basename): follow new
-	  spec. and add new tests.
+	* parse.y (literal_concat_string): non-string last expression in
+	  #{} was ignored when followed by literal.
 
-Tue Nov 22 13:18:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jun 27 03:42:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c (rb_w32_stat): Dir.chdir('//server/shared');
-	  p Dir.glob('*') should work on WinNT. (implemented our own
-	  stat(2) on WinNT) [ruby-list:41552] [ruby-dev:27711]
+	* re.c (rb_reg_expr_str): need to process backslashes properly.
 
-Tue Nov 22 02:31:53 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Jun 26 17:33:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
-	  is not defined).
+	* object.c (rb_any_to_a): declare Object#to_a to be obsolete.
 
-Tue Nov 22 01:45:21 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (rb_Array): do not convert nil into [] automagically.
 
-	* file.c (rb_file_s_basename): DOSISH_UNC is defined on cygwin but
-	  DOSISH is not.  fixed: [ruby-dev:27797]
+Wed Jun 26 15:40:00 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Mon Nov 21 22:50:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (words, qwords): word list literal rules.
 
-	* file.c (rb_path_skip_prefix, rb_file_s_basename): UNC without path
-	  should not be splitted.  fixed: [ruby-dev:27776] [ruby-dev:27786]
+	* parse.y (parse_string): ditto.
 
-	* parse.y (dsym): prohibit empty symbol literal by interpolation.
-	  fixed: [ruby-talk:166529]
+	* parse.y (yylex): %W: word list literal with interpolation. [new]
 
-Mon Nov 21 16:03:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 25 18:53:34 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* win32/setup.mk: findstr doesn't exist on win9x.
-	  fixed: [ruby-dev:27756]
+	* parse.y (string1, xstring, regexp): moved lex_strnest
+	  initialization to string_contents/xstring_contents.
 
-Sun Nov 20 22:34:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 25 19:24:38 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-	* parse.y (rb_symname_p): [ not followed by ] is not valid symbol.
-	  fixed: [ruby-talk:166520]
+	* dln.c: remove definition rb_loaderror().
 
-Sat Nov 19 19:57:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jun 25 00:34:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/fileutils.rb (FileUtils::ln): ln documentation fix.
-	  [ruby-core:06661]
+	* object.c (rb_Integer): use "to_int" instead of
+	  "to_i". [experimental]
 
-Sat Nov 19 07:34:32 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* object.c (nil_to_f): new method.
 
-	* ext/tk/lib/tk/font.rb: remove dependency on Ruby's version (1.8
-	  or 1.9).
+	* object.c (rb_Integer): Symbols and nil should cause error.
 
-	* ext/tk/lib/tkextlib/ICONS/icons.rb: ditto.
+	* object.c (rb_Float): nil should cause error.
 
-	* ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
+Tue Jun 25 00:21:00 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-Fri Nov 18 17:57:08 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* dln.c: remark definition rb_loaderror().
 
-	* file.c (rb_file_s_dirname): should use skipprefix for UNC path.
-	  pointed out by nobu ([ruby-dev:27744]). fixed: [ruby-core:5076]
+Tue Jun 25 00:14:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Fri Nov 18 17:35:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* parse.y (string_dvar): allow back references in interpolation.
 
-	* ext/tk/lib/multi-tk.rb: add restriction to access the entried
-	  command table and manipulate other IPs (for reason of security).
-	  Now, a IP object can be controlled by only its master IP or the
-	  default IP.
+Mon Jun 24 16:32:31 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/tk/lib/remote-tk.rb: add restriction to manipulate.
+	* eval.c (rb_eval): NODE_EVSTR is no longer used.
 
-	* ext/tk/tcltklib.c (ip_is_slave_of_p): add TclTkIp#slave_of?(ip)
-	  to check manipulability.
+	* eval.c (eval): not enforce to make assigned variables dynamic.
 
-	* ext/tk/lib/tk.rb: bug fix on handling of Tcl's namespaces.
+	* parse.y (string): split rules to strings/xstring/regexp to allow
+	  arbitrary statements inside string interpolation.
 
-	* ext/tk/lib/tk/namespace.rb: ditto.
+	* parse.y (here_document): splitted into three phases.
 
-Fri Nov 18 17:26:06 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (literall_append, literal_concat): added.
+	  append/concatinate string literals.
 
-	* file.c (rb_file_s_dirname): added checks for some patterns with drive
-	  letter. fixed: [ruby-dev:27738]
+	* sample/test.rb (valid_syntax): adjust line number for BEGIN.
 
-	* test/ruby/test_path.rb (test_dirname): added tests for above
-	  patterns.
+	* lib/mkmf.rb (create_makefile): get rid of nested string.
 
-Fri Nov 18 12:18:02 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/mkmf.rb (install_rb): site-install didn't work properly.
 
-	* win32/win32.h (S_IFIFO): r,w = IO.pipe; r.stat.pipe? now
-	  returns true on VisualC++6.
+Sun Jun 23 00:19:10 2002  Tadayoshi Funaba  <tadf@dotrb.org>
 
-Wed Nov 16 23:24:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/date.rb, lib/date/format.rb, sample/cal.rb, sample/goodfriday.rb:
+	  updated to the new version (based on date2 3.3).
 
-	* common.mk (static-ruby): overridable.
+Sat Jun 22 14:41:33 2002  Guy Decoux  <ts@moulon.inra.fr>
 
-	* ext/extmk.rb (parse_args): force to link extensions statically only
-	  if static is given for extstatic.
+	* ext/socket/socket.c (sock_addrinfo): make all 3 versions of
+	  getaddrinfo happy.  [ruby-core:00184]
 
-	* ext/extmk.rb (RUBY, RUBYW): overridable.
+Fri Jun 21 18:49:58 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Nov 15 23:46:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (yylex): __END__ should not be effective within
+	  string literals.
 
-	* lib/find.rb (Find::find): should not ignore symbolic links to
-	  non-existing files.  [ruby-talk:165866]
+Thu Jun 20 21:09:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Tue Nov 15 16:23:26 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/readline/readline.c (readline_readline): get rid of
+	  libreadline's bug. (ruby-bugs-ja:PR#268)
 
-	* array.c (rb_ary_fill): previous commit disabled this usage:
+Thu Jun 20 17:10:27 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	    a = [0,1,2,3,4,5,6,7,8,9]
-	    a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]
+	* lib/ftool.rb (BUFSIZE): tuning, set buffer length to 8192.
 
-	  previous commit has the advantage of early garbage collection, but
-	  potensially this would break some script. so I reverted behavior.
+	* configure.in (__NO_ISOCEXT): add for mingw-runtime 2.0-2.
 
-Tue Nov 15 16:04:10 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* configure.in (__MSVCRT__): removed because it is defined
+	  in the GCC specs.
 
-	* array.c (rb_ary_fill): tail elements were vanished when the middle
-	  part of array was filled. (ie: [0,1,2,3,4].fill(-1,2,1) => [0,1,-1])
+Wed Jun 19 14:46:18 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* test/ruby/test_array.rb (test_fill): added.
+	* ext/extmk.rb, lib/mkmf.rb (xsystem): open the log file if xsystem
+	  is called.
 
-Tue Nov 15 14:39:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jun 19 01:01:13 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* array.c (rb_ary_fill): should adjust array length correctly when
-	  an array is expanded in the fill process.  [ruby-core:06625]
+	* parse.y (here_document): should be aware of __END__ within here
+	  documents.
 
-Mon Nov 14 23:49:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jun 19 00:50:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* file.c (rb_file_s_readlink): ERANGE will occur only on GPFS.
-	  [ruby-dev:27699]
+	* parse.y (yylex): ? followed by successive word charaters is
+	  ternary operator not numeric literal.
 
-Mon Nov 14 17:36:22 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (yylex): commands after break/next/rescue can take
+	  arguments.  (ruby-bugs-ja:PR#265)
 
-	* array.c (rb_ary_first): RDoc update from Daniel Berger
-	  <djberg96@yahoo.com>.  [ruby-core:06577].
+Tue Jun 18 19:20:16 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Fri Nov 11 10:31:44 2005  Zach Dennis  <zdennis@mktec.com>
+	* win32/mkexports.rb: remove unnecessary exports. (ruby-dev:17418)
 
-	* ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
+Tue Jun 18 12:50:17 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Fri Nov 11 08:20:56 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (yylex): should pushback proper char after '<<'.
 
-	* Makefile.in (OUTFLAG): keep trailing spaces.  [ruby-dev:27666]
+	* parse.y (range_op, cond0, cond): get rid of doubled warnings.
 
-	* mkconfig.rb: substitution refereces added.
+	* parse.y (value_expr): reduce recursion level.
 
-Fri Nov 11 07:44:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* parse.y (logop): ditto.
 
-	* configure.in: undef HAVE_LINK on BeOS. (link(2) always returns
-	  EINVAL, and this causes error in test/fileutils.)
+Mon Jun 17 11:11:34 2002  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* file.c: overwride chown(2) and fchown(2) on BeOS. (these functions
-	  should not change user/group id if -1 is passed as corresponding
-	  argument, and this causes error in test/fileutils too)
-	  [ruby-dev:27672]
+	* string.c (rb_str_crypt): result need not be tainted always.
 
-	* file.c (rb_file_s_link): checks HAVE_LINK.
+Mon Jun 17 10:51:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Tue Nov  8 15:32:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* dln.c (dln_load): need to preserve dln_strerror() result,
+	  calling other dl family can clear it.
 
-	* lib/drb/ssl.rb (DRb::SSLConfig#accept): fixed typo.
-	  [ruby-dev:27560] [ruby-core:4627]
+Sat Jun 15 22:56:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Nov  7 13:43:51 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* parse.y (yylex): obsolete '?<whitespace>'; use '?\s', '?\n',
+	  etc, instead.
 
-	* ext/tk/stubs.c (_nativethread_consistency_check): use simpler
-	  (low cost) way to check whether the Tcl interpreter was compiled
-	  with threads enabled of not.
+Sat Jun 15 18:51:13 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/tk/tcltklib.c: reduce warnings.
+	* 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.
 
-	* ext/tk/tkutil/tkutil.c: ditto.
+Sat Jun 15 01:59:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Nov  7 00:06:58 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* parse.y (yylex): no here document after a dot.
 
-	* lib/yaml.rb: removed :nodoc: to generate Kernel doc. [ruby-core:6324]
+	* parse.y (yylex): should have set lex_state after '`'.
 
-Sun Nov  6 23:39:13 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (yylex): should have set lex_state properly after
+	  tOP_ASGN.
 
-	* ext/iconv/iconv.c (Iconv::BrokenLibrary): exception when detected a
-	  bug of underlying library.
+Fri Jun 14 21:01:48 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-Sun Nov  6 21:46:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bcc32/mkexports.rb: insert sleep(1) for win9x.
 
-	* ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
-	  interpreter after initialization is done. [ruby-dev:27638]
+	* bcc32/configure.bat: change return code LF -> CRLF fo win9x.
 
-Sun Nov  6 20:13:27 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c: fix rb_w32_open_osfhandle()
 
-	* file.c (rb_file_s_readlink): readlink(2) on AIX fails with ERANGE if
-	  buffer size is less than required.  fixed: [ruby-dev:27634]
+Fri Jun 14 15:22:19 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Wed Nov  2 20:25:28 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* parse.y (read_escape): deny zero-width hexadecimal character.
+	  (ruby-bugs-ja:PR#260)
 
-	* ext/tk/extconf.rb: ext/tk/extconf.rb: change the check parameter
-	  for Win32.
+	* parse.y (tokadd_escape): ditto.
 
-Wed Nov  2 20:14:53 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* regex.c (re_compile_pattern): ditto.
 
-	* ext/tcltklib: merge into ext/tk and remove.
+Fri Jun 14 00:49:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Nov  2 19:03:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bignum.c (rb_big2dbl): return canonical HUGE_VAL for infinity.
 
-	* ext/tcltklib/tcltklib.c (ip_rbUpdateObjCmd,
-	  ip_rb_threadUpdateObjCmd): passed improper flags to DoOneEvent().
+Thu Jun 13 09:43:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/tkutil.c: use rb_obj_respond_to() instead of rb_respond_to().
+	* eval.c (svalue_to_avalue): v may be Qundef.  This fix was
+	  suggested by Guy Decoux.
 
-Tue Nov  1 14:20:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jun 13 00:33:49 2002  takuma ozawa  <metal@mine.ne.jp>
 
-	* eval.c (rb_call_super): should call method_missing if super is
-	  called from Kernel method.
+	* hash.c (rb_hash_s_create): use rb_hash_aset() instead of calling
+	  st_insert() directly, to dup&freeze string keys.
 
-	* eval.c (exec_under): frame during eval should preserve external
-	  information.
+Thu Jun 13 00:12:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Nov  1 10:50:17 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (yylex): proper error message for "@@0".
 
-	* ext/openssl/extconf.rb: should check ERR_peek_last_error().
-	  [ruby-dev:27597]
+	* parse.y (yylex): paren to parse_string() must be zero for
+	  unparenthesized strings.
 
-	* ext/openssl/ossl.c (ossl_raise): ditto.
+	* parse.y (str_extend): broken string when unterminated "#{".
 
-Mon Oct 31 17:34:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* enum.c (enum_sort_by): had a bug in 1 element enumeration.
 
-	* configure.in: use proper option for Sun linker. A patch from
-	  Shinya Kuwamura <kuwa at labs.fujitsu.com>.  [ruby-dev:27603]
+Wed Jun 12 18:04:44 2002  akira yamada  <akira@arika.org>
 
-Mon Oct 31 11:27:22 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* uri/common.rb (REGEXP::PATTERN::X_ABS_URI): 'file:/foo' is valid.
 
-	* test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb (test_s_open_error):
-	  skip on Win32/DOS platforms.
+	* uri/generic.rb (Generic#xxx=): should return substituted value.
+	  (ruby-dev:16728.)
 
-Mon Oct 31 05:49:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/generic.rb (test_set_component): added tests for the above
+	  change.
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must
-	  not be empty. [ruby-talk:161220]
+Wed Jun 12 02:38:00 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* test/openssl/test_cipher.rb: add test for Cipher#update("").
+	* parse.y (stmt): fix typo.
 
-Mon Oct 31 05:37:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Jun 12 01:10:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/httpservlet/cgihandler.rb
-	  (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie:
-	  header field should be splited into each cookie.  [ruby-Bugs:2199]
+	* parse.y (yylex): 'do' should return kDO_BLOCK on EXPR_ENDARG.
 
-	* lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookie): new method
-	  to parse the value of Set-Cookie: header field.
+	* parse.y (singleton): "def (()).a end" dumped core.
 
-	* test/webrick/test_cookie.rb, test/webrick/test_cgi.rb,
-	  test/webrick/webrick.cgi: add some test for cookie.
+	* parse.y (range_op): node may be null.
 
-Mon Oct 31 03:19:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (match_gen): ditto.
 
-	* ext/readline/readline.c (readline_readline): type check.
-	  [ruby-core:6089]
+Tue Jun 11 19:20:34 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* numeric.c (fix_rshift): RDoc fix.  [ruby-core:6351]
+	* configure.in (LIBRUBY): rename to lib$(LIBRUBY_SO).a on Cygwin/MinGW.
 
-	* util.h (strtod): add #undef for platforms defines strtod()
-	  macro.   [ruby-dev:27563]
+	* configure.in, cygwin/GNUmakefile: use dllwrap when --disable-shared
+	  is specified.
 
-Mon Oct 31 02:35:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Jun 11 17:12:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/ruby/test_float.rb (test_precision): test by assert_in_delta.
-	  [ruby-dev:27575]
+	* parse.y (arg): void value check for "..", "...", "!", and "not".
 
-Sat Oct 29 01:58:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (match_gen): void value check for "=~".
 
-	* ext/etc/etc.c: document update from mathew <meta@pobox.com>.
-	  [ruby-core:06473]
+	* parse.y (value_expr): check NODE_AND and NODE_OR recursively.
 
-	* ext/fcntl/fcntl.c: ditto.
+	* parse.y (cond0): void value check added for conditionals.
 
-Thu Oct 27 16:45:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jun 11 13:18:47 2002  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* string.c (scan_once): wrong condition to use mbclen2().
-	  [ruby-dev:27535]
+	* lib/net/ftp.rb (noop): new method.
 
-Wed Oct 26 09:27:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/net/ftp.rb (site): ditto.
 
-	* ext/syck/implicit.c (syck_type_id_to_uri): should return
-	  newly allocated memory. otherwise, type_id will be freed
-	  twice. [ruby-dev:27384] [ruby-core:6385]
+Tue Jun 11 13:15:41 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Wed Oct 26 09:04:51 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bcc32/Makefile.sub: set PROCESSOR_LEVEL to 6 if it's too big value.
 
-	* ruby.h (Qfalse, Qtrue, Qnil, Qundef): make sure these immediate
-	  values have VALUE type. there is an environment where sizeof(VALUE)
-	  != sizeof(int) like IA64. if 32bit integer (Qtrue) is passed to ANYARGS
-	  and received by 64bit integer (VALUE), upper bits may have garbage value.
-	  [ruby-dev:27513]
+	* win32/Makefile.sub: ditto.
 
-Wed Oct 26 01:58:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 11 12:37:46 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-	* configure.in (RUBY_EXTERN): macro to export symbols in shared
-	  library.  [ruby-core:05528]
+	* bcc32/configure.bat fix.
 
-	* defines.h, {bcc32,win32,wince}/Makefile.sub (RUBY_EXTERN): moved to
-	  configuration pass.
+Tue Jun 11 10:18:23 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
-	* ext/extmk.rb (extmake): RUBY_EXTERN for static linked extensions.
+	* 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
 
-Tue Oct 25 15:32:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jun 10 19:02:19 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/rational.rb: applied documentation patch from Gavin Sinclair
-	  <gsinclair@gmail.com>.  [ruby-core:06364]
+	* numeric.c (fix_lshift): negative shift count means right shift.
+	  (ruby-bugs-ja:PR#248)
 
-	* lib/irb.rb (IRB::Irb::eval_input): handle prompts with newlines
-	  in irb auto-indentation mode.  [ruby-core:06358]
+	* numeric.c (fix_rshift): return -1 when left side operand is
+	  negative. (ruby-bugs-ja:PR#247)
 
-Tue Oct 25 02:12:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (yylex): `0_' should be an error. (ruby-bugs-ja:PR#249)
 
-	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):
-	  reduce redundant backtrack.  [ruby-talk:161771]
+Mon Jun 10 01:53:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Oct 25 00:27:35 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* eval.c (rb_eval): ruby_frame->last_func may be null, if it's
+	  called outside of a method.
 
-	* lib/rinda/*: RDoc documentation from Eric Hodel
-	  <drbrain@segment7.net> added.
+	* parse.y (arg): use INT2NUM, not INT2FIX for tUMINUS.
 
-Mon Oct 24 21:14:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (arg): unnecessary negative tPOW treatment.
 
-	* configure.in, io.c: use sys/syscall.h if syscall.h is not available.
-	  [ruby-core:06247]
+	* parse.y (tokadd_escape): wrong backslash escapement.
 
-Mon Oct 24 20:49:45 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Jun  9 17:40:41 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-	* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
-	  fixed: [ruby-list:40058], [ruby-dev:27479]
+	* ext/dl: change the callback mechanism.
 
-Mon Oct 24 07:57:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jun  8 00:48:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
-	  typo fixed.  [ruby-talk:162187]
+	* parse.y (stmt,arg): too much void value check.
 
-	* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
-	  ditto.  [ruby-core:06359]
+	* parse.y (stmt,arg): need to check void value on rules which does
+	  not use node_assign().
 
-Sun Oct 23 21:50:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jun  6 19:50:39 2002  KONISHI Hiromasa <H_Konishi@ruby-lang.org>
 
-	* ext/enumerator/enumerator.c: applied documentation patch from
-	  James Edward Gray II <james@grayproductions.net>.
-	  [ruby-core:06348]
+	* sample/biorhythm.rb (getPosiiton,etc)
+	  fix at changing Date module ( Date is changed Fixnum to Rational )
 
-Sun Oct 23 07:11:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Jun  6 17:42:39 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tcltklib/extconf.rb: improve messages [ruby-core:06325].
+	* ext/socket/socket.c (ipaddr): need not to taint hostnames.
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb,
-	  ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb,
-	  ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/labelframe.rb,
-	  ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/menu.rb,
-	  ext/tk/lib/tk/radiobutton.rb, ext/tk/lib/tk/scale.rb,
-	  ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tk/text.rb,
-	  ext/tk/lib/tk/toplevel.rb: improve conversion of option values.
+Thu Jun  6 12:04:30 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/*: ditto.
+	* win32/Makefile.sub (config.status): use sub! instead of []= because
+	  []= causes exception.
 
-	* ext/tk/lib/tkextlib/*: update to support ActiveTcl8.4.11.2.
+Thu Jun  6 11:42:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/tk/lib/tkextlib/trofs/*: support Trofs 0.4.3.
+	* lib/thread.rb (Queue::pop): get rid of race condition.
 
-	* ext/tk/lib/tkextlib/tile/*: support Tile 0.7.2.
+Tue Jun  4 23:09:24 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/vu/*: support vu 2.3.0.
+	* range.c (range_include): should be based on "<=>", whereas
+	  member? still is based on "each".
 
-	* ext/tk/lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3).
+	* range.c (range_min,range_max): redefine methods based on "<=>".
 
-Sat Oct 22 23:54:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun  4 18:28:37 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/extmk.rb, lib/mkmf.rb (with_config): support --with-extension
-	  options.  [ruby-dev:27449]
+	* ext/socket/extconf.rb: The IPv6 stack of Cygwin is still incomplete.
 
-Sat Oct 22 13:26:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/Win32API/extconf.rb: refactoring.
 
-	* object.c (sym_inspect), parse.y (parser_yylex, rb_symname_p): check
-	  if valid as a symbol name more strictly.  [ruby-dev:27478]
+Tue Jun  4 00:45:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* test/ruby/test_symbol.rb: tests for [ruby-core:03573].
+	* ext/socket/addrinfo.h: typo.
 
-	* time.c (rb_strftime): removed meaningless volatile modifiers, and
-	  concatenate successive nul characters at once.  [ruby-dev:27472]
+	* ext/socket/getaddrinfo.c (gai_strerror): make literals const.
 
-Fri Oct 21 19:21:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/socket/socket.c (init_inetsock): ensures resources are
+	  freed at exceptions.
 
-	* rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
+	* ext/socket/socket.c (init_unixsock): ditto.
 
-Fri Oct 21 17:49:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/socket.c (udp_connect): ditto.
 
-	* bin/erb (ERB::Main::run): typo fixed.  [ruby-core:06337]
+Mon Jun  3 20:39:51 2002  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-Fri Oct 21 15:27:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/win32ole/extconf.rb : change PLATFORM with RUBY_PLATFORM.
 
-	* bignum.c (bignew_1): convertion from `int' to `char' discards
-	  upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
-	  nonzero and set 0 or 1 instead of simply casting ... as a flag usage.
-	  (but I believe this won't cause actual bug in current implementation)
-	  [ruby-dev:27055]
+Mon Jun  3 07:07:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* time.c: should use LONG_LONG instead of `long long'.
+	* parse.y (here_document): check if identifier is terminated.
+	  (ruby-bugs-ja:PR#239)
 
-Thu Oct 20 09:37:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* parse.y (yylex): should pushback proper char after '**'.
+	  (ruby-bugs-ja:PR#240)
 
-	* lib/mkmf.rb (create_makefile): Borland make seems not to allow
-	  empty dependency list. If this change is not good, please correct
-	  it.
+Mon Jun  3 05:56:17 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Oct 20 07:55:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_aset): should raise error if an indexing string
+	  is not found in the receiver.
 
-	* lib/mkmf.rb (create_makefile): get rid of a restriction
-	  of Borland make.  fixed: [ruby-dev:27460]
+	* sprintf.c (rb_f_sprintf): "%d" should convert objects into
+	  integers using Integer().
 
-Thu Oct 20 00:13:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Jun  1 19:20:07 2002  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* rubysig.h (CHECK_INTS): fix typo.
+	* ext/win32ole: merge from rough.
 
-Wed Oct 19 23:58:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri May 31 17:11:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/mkmf.rb (create_makefile): do not create unnecessary empty
-	  directories.  fixed: [ruby-dev:27451]
+	* lib/tempfile.rb (Tempfile::size): added.
 
-Wed Oct 19 19:26:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu May 30 12:52:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* parse.y (rb_gc_mark_parser): get rid of segfault with old yacc.
-	  fixed: [ruby-dev:27439]
+	* range.c (range_step): iteration done using "+" if elements are
+	  Numeric.  Otherwise using "succ".
 
-Wed Oct 19 08:28:32 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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".
 
-	* file.c (rb_file_join): elements may contain null pointer strings.
-	  report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326]
+	* range.c (range_member): comparison done using "each", if
+	  elements are non-Numeric or no-"succ" objects.  Otherwise
+	  compare using "<=>".
 
-Wed Oct 19 02:34:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* range.c (Init_Range): remove "size" and "length".
 
-	* eval.c, gc.c, time.c: made internal symbols static.  [ruby-dev:27435]
+Thu May 30 09:16:36 2002  Wakou Aoyama  <wakou@ruby-lang.org>
 
-Wed Oct 19 01:27:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/cgi.rb: if StringIO is usable then use it.
 
-	* regex.c (re_compile_pattern): numeric literal inside character class
-	  disabled succeeding backtrack.  fixed: [ruby-list:41328]
+Wed May 29 18:55:47 2002  KONISHI Hiromasa <H_Konishi@ruby-lang.org>
 
-Mon Oct 17 21:18:50 2005  Nobuyoshi Nakada  <nobu@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
 
-	* parse.y (parser_heap): byacc never free parser stack.
-	  fixed: [ruby-dev:27428]
+Wed May 29 17:32:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Mon Oct 17 16:04:47 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* time.c (tmcmp, search_time_t): activate unless HAVE_TIMEGM.
 
-	* file.c (chmod_internal, lchmod_internal): fixed type of 2nd argument.
+Wed May 29 13:45:15 2002  Wakou Aoyama  <wakou@ruby-lang.org>
 
-Sun Oct 16 22:16:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/cgi.rb: not use const if GET, HEAD. check multipart form head.
 
-	* ext/extmk.rb: omit non-existing directories.
+Tue May 28 17:56:02 2002  Sean Chittenden  <sean@ruby-lang.org>
 
-Sun Oct 16 14:30:05 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* parse.y: yyparse #defines moved from intern.h
 
-	* lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash
-	  tuple. fixed: [ruby-list:41227]
+	* ruby.c (proc_options): access prefixed "ruby_yydebug".
 
-	* test/rinda/test_rinda.rb: test it.
+	* applied modifies to pacify some of gcc -Wall warnings.
+	
+Tue May 28 14:07:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Oct 16 03:38:07 2005  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)".
 
-	* rubysig.h (CHECK_INTS): prevent signal handler to run during
-	  critical section.  [ruby-core:04039]
+	* parse.y (yylex): '-2' to be literal fixnum. [new]
 
-	* eval.c (load_wait): need not to call rb_thread_schedule()
-	  explicitly.  [ruby-core:04039]
+Tue May 28 12:13:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* eval.c (rb_thread_schedule): clear rb_thread_critical.
-	  [ruby-core:04039]
+	* eval.c (scope_node): trick to keep the node has a scope.
 
-Sat Oct 15 19:56:38 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* eval.c (rb_eval): NODE_EVSTR: write back local_tbl to the node.
 
-	* bin/erb: typo fixed, again. thanks, Doug Kearns.
+	* eval.c (rb_eval): NODE_SCOPE: hold the scope node in ruby_scope.
 
-Fri Oct 14 22:08:26 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (module_setup): ditto.
 
-	* win32/win32.c (ioctl): should set errno.
+	* eval.c (rb_call0): ditto.
 
-Fri Oct 14 16:57:32 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* node.h (NEW_DASGN, NEW_DASGN_CURR): remove surplus semicolons.
 
-	* lib/webrick/config.rb (Config::FileHandler): :UserDir should be nil.
-	  It is harmful to permit the access to ~/public_html by default.
-	  suggested by Hiroyuki Iwatsuki.
+Fri May 24 09:06:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Oct 13 23:29:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (time_arg): nil test against v[6] (usec).
 
-	* parse.y (HEAPCNT): bison allocates indivisible size.
-	  fixed: [ruby-core:06261]
+Thu May 23 16:39:21 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* io.c, pack.c, ext/syck/rubyext.c, ext/syck/syck.h, missing/isinf.c:
-	  get rid of warnings.  fixed: [ruby-core:06247]
+	* ruby.c (proc_options): option parsing problem.
+	  (ruby-bugs-ja:PR#233)
 
-Wed Oct 12 12:52:57 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu May 23 09:13:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl.c (Init_openssl): should call
-	  OpenSSL_add_ssl_algorithms().
+	* ruby.c (proc_options): removed "-*-" support for #! line.
 
-Wed Oct 12 11:08:54 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* io.c (rb_io_s_sysopen): new method to get a raw file
+	  descriptor. [new]
 
-	* file.c (rb_f_test): typo in RDoc comments.
+	* ext/socket/socket.c (tcp_sysaccept): new method to return an
+	  accepted socket fd (integer). [new]
 
-Tue Oct 11 21:41:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/socket.c (unix_sysaccept,sock_sysaccept): ditto.
 
-	* eval.c (rb_obj_respond_to): check if obj responds to the given
-	  method with the given visibility.  [ruby-dev:27408]
+Wed May 22 21:26:47 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* eval.c (rb_respond_to): conform to Object#respond_to?.  [ruby-dev:27411]
+	* ruby.c (proc_options): -T consumes digits only.
 
-Tue Oct 11 00:01:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed May 22 20:18:31 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* st.c (st_free_table): do not call free() but xfree().
-	  [ruby-core:06205]
+	* configure.in: need not link vsnprintf.o on MinGW.
 
-Sat Oct  8 20:04:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May 22 18:34:23 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* eval.c (Init_Binding): add Binding#dup method.  [yarv-dev:666]
+	* parse.y (yylex): Here-document label ate '-'.
 
-	* parse.y (rb_parser_malloc, rb_parser_free): manage parser stack on
-	  heap.  [ruby-list:41199]
+Tue May 21 13:25:18 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/iconv/charset_alias.rb: parse config.charset_alias file directly.
+	* misc/ruby-mode.el (ruby-font-lock-keywords): symbols end with
+	  '_'.
 
-Fri Oct  7 09:54:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue May 21 04:48:37 2002  Sean Chittenden <sean@chittenden.org>
 
-	* lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may
-	  not be parsed correctly.  A patch from August Z. Flatby
-	  (augustzf) in [ruby-Patches-2595].  [ruby-core:06183]
+	* 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.
 
-Thu Oct  6 20:12:16 2005  Minero Aoki  <aamine@loveruby.net>
+Tue May 21 01:16:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/strscan/strscan.c (strscan_free): remove useless code.
-	  [ruby-dev:26368] [ruby-dev:27389]
-	  (backported from trunk, rev 1.22)
+	* parse.y (bodystmt): ensure clause was excuted on else clause
+	  without rescue clause.
 
-Wed Oct  5 04:42:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue May 21 00:20:25 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-	* lib/xmlrpc/server.rb (XMLRPC::Server#initialize): should mount the
-	  servlet on "/".
+	* ext/dl/ptr.c: rename PtrData::alloc to PtrData::malloc.
 
-Wed Oct  5 03:59:09 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/dl/lib/dl/struct.c: rename Struct#alloc to Struct#malloc.
 
-	* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
-	  of "join".
+Mon May 20 14:29:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Oct  3 00:04:00 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* object.c (Init_Object): should do exact match for Module#==.
 
-	* pack.c (EXTEND16): [ruby-dev:27383]
+	* compar.c (cmp_eq): returns 'false' if <=> returns 'nil'.
 
-Thu Sep 29 10:26:18 2005  Tanaka Akira  <akr@m17n.org>
+	* compar.c (cmp_gt,cmp_ge,cmp_lt,cmp_le,cmp_between): ditto.
 
-	* ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
-	  [ruby-dev:27317]
+Mon May 20 13:28:52 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Thu Sep 29 07:22:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (rb_io_clone): writing stream was not copied properly.
 
-	* evalc. (rb_f_send): underscores need to be escaped.
-	  fixed by Doug Kearns.  [ruby-core:06053]
+Sat May 18 21:38:11 2002  Tadayoshi Funaba  <tadf@dotrb.org>
 
-Thu Sep 29 00:57:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/date.rb, lib/date/format.rb, lib/parsedate.rb:
+	  updated to the new version (based on date2 3.2.1).
 
-	* eval.c (ev_const_get), variable.c (rb_const_get_0): retry only when
-	  autoload succeeded.
+Sat May 18 21:18:00 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* variable.c (rb_autoload_load): now return true if autoload
-	  succeeded.  fixed: [ruby-dev:27331]
+	* win32/Makefile.sub (config.h): add VC++4/5 support about noreturn
+	  directive.
 
-Wed Sep 28 23:42:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat May 18 02:16:41 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* file.c (apply2files): add prototype.
+	* pack.c (pack_pack): should propagate taintedness.
 
-	* file.c (rb_stat_inspect): constified.
+	* pack.c (pack_unpack): ditto.
 
-	* class.c (rb_mod_init_copy, rb_class_init_copy), file.c (rb_stat_init_copy),
-	  numeric.c (num_init_copy), object.c (rb_obj_init_copy, Init_Object),
-	  re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
-	  undocumented.
+Fri May 17 16:16:19 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Wed Sep 28 23:09:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* sampl/test.rb: use eval instead of './miniruby -c',
+	  in order to check a syntax error.
 
-	* lib/delegate.rb: document update from James Edward Gray II
-	  <james@grayproductions.net>.  [ruby-core:06027]
+Thu May 16 14:46:34 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Wed Sep 28 15:14:19 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (rb_thread_select): cleanup conditional compilation.
 
-	* lib/webrick/cgi.rb (WEBrick::CGI#start): req.query_string should
-	  refer the value of QUERY_STRING. [ruby-list:41186]
+Wed May 15 06:13:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#query_string=):
-	  add new method.
+	* eval.c (rb_thread_schedule): need to preserve errno before
+	  calling rb_trap_exec().
 
-Wed Sep 28 10:45:44 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* regex.c (calculate_must_string): a bug in charset/charset_not
+	  parsing.
 
-	* ext/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x
-	  [ruby-dev:27335].
+Tue May 14 18:17:44 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Wed Sep 28 08:12:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/Makefile.sub: config.h inlined.  and catch up with the
+	  latest change.
 
-	* io.c (read_buffered_data): check if reached EOF.  fixed: [ruby-dev:27334]
+	* win32/config.h.in: no longer used.
 
-Wed Sep 28 07:56:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May 14 14:49:05 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo.
-	  [ruby-dev:27237], [ruby-core:05854]
+	* gc.c (is_pointer_to_heap): avoid GCC 3.1 warnings.
 
-	* lib/yaml/tag.rb (Module#yaml_as): suppress warnings.
+	* missing/strftime.c (timezone): it should take no argument on Cygwin.
 
-	* lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto.
+Tue May 14 03:07:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Sep 28 03:23:35 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (rb_clear_cache_by_class): new function.
 
-	* rubysig.h: fixed build problem with --enable-pthread on platforms
-	  which don't have setitimer().
+	* eval.c (set_method_visibility): should have clear cache for
+	  updated visibility.
 
-Mon Sep 26 22:32:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon May 13 14:38:33 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* eval.c (set_trace_func): add rb_secure(4) to prevent adding
-	  tracing function.
+	* djgpp/config.hin, djgpp/config.sed: catch up with the latest change.
 
-Sun Sep 25 12:05:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon May 13 01:59:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bin/erb: typo fixed.
+	* numeric.c (flo_to_s): default format precision to be "%.16g".
 
-Sun Sep 25 01:46:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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
 
-	* misc/ruby-mode.el (ruby-calculate-indent): arrange deep-indent
-	  closing parenthesis at same column as the opening.
+Sun May 12 03:01:08 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Sun Sep 25 00:42:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* missing.h: add for missing/*.c.
 
-	* misc/ruby-mode.el (ruby-expr-beg): deal with heredoc separately.
-	  fixed: [ruby-list:41168]
+	* ruby.h: add `#include "missing.h"'.
 
-	* misc/ruby-mode.el (ruby-calculate-indent): not to deepen indent
-	  level for continuous line inside parentheses.
-	  http://nabeken.tdiary.net/20050915.html#p02
+	* Makefile.in: add the dependency of missing.h by gcc -MM.
 
-Sun Sep 25 00:18:11 2005  Tanaka Akira  <akr@m17n.org>
+	* MANIFEST: add missing.h
 
-	* eval.c (unknown_node): show more information.  [ruby-dev:26196]
+Sat May 11 23:24:52 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-Sat Sep 24 08:56:01 2005  Minero Aoki  <aamine@loveruby.net>
+	* ext/dl: enable dl's stack emulation for constructing function call.
 
-	* lib/fileutils.rb (cd): no longer accept :noop option, related
-	  code is useless (backported from trunk, rev 1.67).
-	  [ruby-core:05858] [ruby-Bugs:2494]
+Sat May 11 10:52:09 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Sat Sep 24 08:38:07 2005  Minero Aoki  <aamine@loveruby.net>
+	* dir.c (glob_helper): remove escaping backslashes.
 
-	* lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
-	  DryRun (backported from trunk, rev 1.66). [ruby-core:05954]
+Sat May 11 02:46:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/fileutils/test_nowrite.rb: test it.
+	* eval.c (avalue_to_yvalue): new function to distinguish yvalue
+	  (no-arg == Qundef) from svalue (no-arg == Qnil).
 
-	* test/fileutils/test_dryrun.rb: new file.
+	* eval.c (rb_yield_0): use avalue_to_yvalue().
 
-	* test/fileutils/test_verbose.rb: new file.
+	* eval.c (assign): warn if val == Qundef where it means rhs is
+	  void (e.g. yield without value or call without argument).
 
-Sat Sep 24 02:40:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri May 10 19:00:47 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/delegate.rb: document update from James Edward Gray II
-	  <james@grayproductions.net>.  [ruby-core:05942]
+	* parse.y (here_document): preserve line number begins here
+	  document.
 
-Thu Sep 22 23:36:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri May 10 01:55:44 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* lib/mkmf.rb (find_executable0): default path if environment is not
-	  set.  [ruby-dev:27281]
+	* eval.c (rb_thread_join): added an argument to limit time to wait
+	  the thread.
 
-Thu Sep 22 16:33:12 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* eval.c (rb_thread_join_m): new. and added optional argument.
 
-	* test/readline/test_readline.rb (TestReadline::replace_stdio):
-	  merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223].
+Wed May  8 23:48:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Sep 21 23:30:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (value_expr): need not to warn for WHILE and UNTIL,
+	  since they can have return value (via valued break).
 
-	* lib/mkmf.rb (configuration): generalized nmake dependent code.
+Tue May  7 17:13:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Wed Sep 21 09:07:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in: forgot to add '-Wl,' to the gcc option on Cygwin/MinGW.
 
-	* stable version 1.8.3 released.
+Tue May  7 15:41:33 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Wed Sep 21 08:52:25 2005  why the lucky stiff  <why@ruby-lang.org>
+	* ext/iconv/iconv.c (iconv_try): should initialize exceptions
+	  properly. (ruby-bugs-ja:PR#232)
 
-	* ext/syck/token.c: correctly compute identation of a block
-	  scalar's parent node. [ruby-talk:150620]
+Tue May  7 15:28:03 2002  Minero Aoki  <aamine@loveruby.net>
 
-Wed Sep 21 08:20:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_yield_0): The destination of the goto jump was wrong.
 
-	* README.EXT, README.EXT.ja: add new features.
+Tue May  7 09:17:51 2002  Minero Aoki  <aamine@loveruby.net>
 
-Wed Sep 21 07:43:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (superclass): undesirable "unexpected return" when the
+	  superclass is not a Class.
 
-	* lib/optparse.rb (default_argv, Arguable#options): defaults strings
-	  to be parsed to Arguable instance.
+Sun May  5 06:53:45 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Sep 21 02:44:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb: exclude topdir from the system configuration
+	  section and prevent it from being overridden.
 
-	* file.c (path_check_0): disallow sticky world writable directory
-	  in PATH (and $LOAD_PATH).  [ruby-dev:27226]
+Fri May  3 20:19:00 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* file.c (fpath_check): typo fixed.
+	* configure.in: add #include <errno.h> in AC_CHECK_DECLS().
 
-Tue Sep 20 22:29:49 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* win32/config.h.in: define HAVE_DECL_SYS_NERR.
 
-	* test/wsdl/simpletype/rpc/test_rpc.rb, test/wsdl/ref/test_ref.rb,
-	  test/wsdl/any/test_any.rb test/soap/wsdlDriver/test_calc.rb:
-	  suppress deliberate warnings with $VERBOSE = nil.
+Thu May  2 23:42:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Sep 20 21:26:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* re.c (rb_reg_s_quote): # also should be quoted.
 
-	* ext/io/wait/lib/nonblock.rb: disable on platforms non-blocking flag
-	  is not available.  fixed: [ruby-dev:27187]
+Thu May  2 18:27:13 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Sep 20 18:23:04 2005  Tanaka Akira  <akr@m17n.org>
+	* ext/extmk.rb.in, lib/mkmf.rb: use 'do...end' instead of '{}' for
+	  Borland make.
 
-	* eval.c (thread_mark): mark th->last_status.  [ruby-dev:27179]
+Thu May  2 08:01:56 2002  Chris Thomas  <kenshin@apple.com>
 
-Tue Sep 20 18:20:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* error.c: use HAVE_DECL_SYS_NERR instead of platform names.
 
-	* lib/yaml.rb: require 'yaml/constants'.  [ruby-core:5776]
+Tue Apr 30 09:23:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Sep 20 17:48:34 2005  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>.
 
-	* lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): add charset
-	  information to content-type header.[ruby-core:5127]
+Tue Apr 30 05:59:42 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
 
-	* lib/xmlrpc/server.rb (CGIServer::serve): ditto.
+	* range.c (range_step): step (for Range#step method) <= 0 makes no
+	  sence, thus ArgError will be raised.
 
-	* lib/xmlrpc/server.rb (ModRubyServer::serve): ditto.
+	* range.c (range_each): Range#each method is special case for
+	  Range#step(1)
 
-	* lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.
+Mon Apr 29 18:46:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Sep 20 17:34:46 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* file.c (rb_find_file): load must be done from an abolute path if
+	  $SAFE >= 4.
 
-	* test/webrick/test_cgi.rb: set ENV["PATH"] to CGIEnvPath on
-	  windows. bcc32's runtime is not installed into system directory,
-	  so it cannot be found without this setting. [ruby-dev:27166]
+Sun Apr 28 17:01:56 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Sep 20 17:10:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c (insert): fix prototype for ANSI C.
 
-	* test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove
-	  test_s_open_error test to detect duplicate open.
-	  [ruby-dev:27202]
+Fri Apr 26 13:47:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Sep 20 17:08:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* enum.c (enum_partition): new method. [new]
 
-	* io.c: PIPE_BUF is not defined on BeOS. use _POSIX_PIPE_BUF instead.
-	  [ruby-dev:27185]
+Fri Apr 26 13:41:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Sep 20 16:53:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* re.c (rb_reg_s_quote): quote whitespaces for /x cases.
 
-	* test/readline/test_readline.rb (TestReadline::replace_stdio):
-	  BSD seek support from [ruby-dev:25223].  fixed: [ruby-dev:27150]
+Fri Apr 26 06:48:23 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-Tue Sep 20 15:39:40 2005  why the lucky stiff  <why@ruby-lang.org>
+	* ext/dl/ptr.c (cary2ary): missing break in switch statements.
 
-	* ext/syck/emitter.c (syck_scan_scalar): prevent indicators from
-	  appearing alone or at the end of plain scalars. [ruby-core:5826]
+Fri Apr 26 09:35:47 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/syck/emitter.c (syck_emit_scalar): treat typed scalar nodes
-	  as complex keys.
+	* eval.c (rb_proc_new): make Proc from C function. [new]
 
-	* lib/syck.h: version 0.60.
+	* intern.h (rb_proc_new): prototype.
 
-	* lib/yaml/basenode.rb (YAML::BaseNode#at): transform keys during
-	  key searches.
+Wed Apr 24 14:56:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* ext/syck/rubyext.c: loading of binary-typed nodes.  prevent
-	  emission of plain strings that look like symbols, but which aren't.
+	* eval.c (proc_to_proc): return self. [new]
 
-Tue Sep 20 05:50:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (block_pass): no need to convert if block is Proc.
 
-	* test/xmlrpc/test_webrick_server.rb (setup_http_server):
-	  should not include 'webrick/https' unless 'use_ssl' because
-	  it fails where openssl is not installed.
+Wed Apr 24 14:21:41 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Sep 20 00:34:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in: set size of the initial stack from
+	  2MB to 32MB on MinGW/Cygwin.
 
-	* io.c (io_close): call rb_io_close() directly if io is a T_FILE
-	  object.  [ruby-dev:27156]
+Wed Apr 24 14:06:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Sep 19 19:09:08 2005  Minero Aoki  <aamine@loveruby.net>
+	* numeric.c (num_step): try to reduce residual on Float operations.
 
-	* file.c (rb_file_chown): should accept nil. [ruby-dev:27171]
-	  (backport from trunk, rev 1.208)
+Wed Apr 24 06:48:31 2002  Koji Arai  <jca02266@nifty.ne.jp>
 
-Mon Sep 19 18:35:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_io_mode_flags): both 'r+b' and 'rb+' should be allowed.
 
-	* ext/dl/dl.c (rb_io_to_ptr): fix DragonFlyBSD support.
-	  [ruby-dev:27151]
+	* io.c (rb_io_mode_modenum): ditto.
 
-Mon Sep 19 14:17:04 2005  Minero Aoki  <aamine@loveruby.net>
+Wed Apr 24 01:16:14 2002  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/syck/emitter.c (syck_emit): passing an int* value to the
-	  long* parameter causes unaligned access on LP64 systems.
-	  [ruby-dev:27161]
+	* ext/stringio/stringio.c (strio_mark): must check if ptr is NULL
+	  first.  [ruby-talk:38873]
 
-Mon Sep 19 13:44:03 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* lib/mkmf.rb (create_makefile): should print depend file when
+	  make is other than nmake.
 
-	* ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
-	  [ruby-dev:27133]
+Wed Apr 24 00:37:12 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Mon Sep 19 10:36:06 2005  Minero Aoki  <aamine@loveruby.net>
+	* ext/extmk.rb.in (create_makefile): use `{$(srcdir)}' directive instead
+	  of `$(srcdir)/' when including depend file.
 
-	* lib/fileutils.rb (cp_r): default is :dereference_root=>true for
-	  backward compatibility. [ruby-dev:27145]
+	* lib/mkmf.rb (create_makefile): add `{$(srcdir)}' when including depend
+	  file.
 
-	* test/fileutils/test_fileutils.rb (test_cp_r): test it.
+Tue Apr 23 12:58:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Sep 19 09:57:39 2005  Minero Aoki  <aamine@loveruby.net>
+	* gc.c (rb_memerror): rename from mem_error, and exported.
 
-	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
-	  (again) [ruby-dev:27145]
+	* gc.c (Init_GC): pre-allocate NoMemoryError instance.
 
-Mon Sep 19 07:45:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* 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.
 
-	* ext/openssl/ossl_pkey.h, ossl_pkey_rsa.c, ossl_pkey_dsa.c:
-	  an instance variable "private" is added to OpenSSL::PKey class.
-	  this ivar is a flag that shows whether there is a private key
-	  in the instance.
+Mon Apr 22 09:31:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_engine.c: (ossl_engine_load_privkey): set private
-	  key flag.
+	* eval.c (block_pass): convert Method to Proc using
+	  rb_check_convert_type().
 
-Mon Sep 19 06:41:32 2005  Minero Aoki  <aamine@loveruby.net>
+	* object.c (rb_check_convert_type): always convert T_DATA
 
-	* lib/fileutils.rb: backported from trunk (rev 1.65):
+	* eval.c (rb_thread_cleanup): should not terminate main_thread by
+	  Fatal error.
 
-	* lib/fileutils.rb (rm_r): new option :secure.
+	* regex.c (is_in_list): need to not exclude NUL and NEWLINE.
 
-	* lib/fileutils.rb (rm_rf): new option :secure.
+Sat Apr 20 00:19:13 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/fileutils.rb: new method #remove_entry_secure.
+	* re.c (rb_reg_expr_str): wrong backslash escapement.
 
-	* lib/fileutils.rb (cd): remove option :noop.
+	* re.c (rb_reg_expr_str): do not escape embedded space
+	  characters.
 
-	* lib/fileutils.rb (cp_r): new option :dereference_root.
+Fri Apr 19 22:03:40 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* lib/fileutils.rb (cp_r): new option :dereference_root.
+	* win32/Makefile.sub: add -DNT to $CFLAGS instead of $CPPFLAGS.
 
-	* lib/fileutils.rb: new method #remove_entry.
+	* win32/setup.mak: ditto.
 
-	* lib/fileutils.rb: new method #chmod_R.
+Fri Apr 19 17:24:22 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/fileutils.rb: new method #chown.
+	* 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.
 
-	* lib/fileutils.rb: new method #chown_R.
+	* marshal.c (r_object): ditto.
 
-	* lib/fileutils.rb: new method .commands.
+Fri Apr 19 17:10:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/fileutils.rb: new method .options.
+	* numeric.c (num_step): Integer#step is moved to Numeric#step;
+	  Fixnum#step is merged into this method.
 
-	* lib/fileutils.rb: new method .have_option?.
+	* numeric.c (int_dotimes): Fixnum#times is merged.
 
-	* lib/fileutils.rb: new method .options_of.
+	* numeric.c (int_upto): Fixnum#upto is merged.
 
-	* lib/fileutils.rb: new method .collect_method.
+	* numeric.c (int_downto): Fixnum#downto is merged.
 
-	* lib/fileutils.rb: use module_function instead of single extend.
+Fri Apr 19 16:22:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
+	* ext/socket/extconf.rb: include <windows.h>, <winsock.h> on _WIN32.
 
-Mon Sep 19 03:17:48 2005  Tanaka Akira  <akr@m17n.org>
+	* win32/win32.c: include <mswsock.h> on __MINGW32__.
 
-	* file.c (rb_thread_flock): wrap the flock system call by
-	  TRAP_BEG/TRAP_END to enable signals.  [ruby-dev:27122]
+	* configure.in: cleanup for autoconf 2.5x.
 
-	* ext/socket/socket.c (bsock_send): wrap the sendto and send system
-	  call by TRAP_BEG/TRAP_END to enable signals when writing to a socket
-	  which is full.  [ruby-dev:27132]
+	* configure.in: use gcc -shared instead of dllwrap on Cygwin/MinGW.
 
-	* io.c (rb_io_syswrite): wrap the write system call by
-	  TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
-	  full.  [ruby-dev:27134]
+	* ext/extmk.rb, lib/mkmf.rb: get rid of "--def=".
 
-Mon Sep 19 03:02:08 2005  Tanaka Akira  <akr@m17n.org>
+Fri Apr 19 14:57:44 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* io.c (io_fwrite): wrap the write system call by TRAP_BEG/TRAP_END to
-	  enable signals when writing to a pipe which is full.
+	* re.c (rb_reg_to_s): remove redundant shy group.
 
-Sun Sep 18 02:10:47 2005  why the lucky stiff  <why@ruby-lang.org>
+Fri Apr 19 01:08:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/yaml/rubytypes.rb: remove comments that are bungling up
-	  the rdoc and ri output.  output symbols as plain scalars.
+	* eval.c (rb_thread_cleanup): current thread may be THREAD_STOPPED,
+	  for example when terminated from signal handler.
 
-	* ext/syck/rubyext.c (syck_emitter_reset): emit headless
-	  documents always.
+Thu Apr 18 19:03:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/syck/emitter.c (syck_scan_scalar): quote scalars with any
-	  kind of surrounding line space, tabs or spaces alike.
+	* regex.c (re_compile_pattern): remove /p support.
 
-	* ext/syck/token.c: accept tabs as whitespace, not for indentation,
-	  but strip from plain scalars.
+	* regex.h: ditto.
 
-	* test/yaml/test_yaml.rb: remove outdated tests.
+	* parse.y (parse_regx): ditto.
 
-Sat Sep 17 23:25:04 2005  sheepman  <sheepman@sheepman.sakura.ne.jp>
+Thu Apr 18 17:01:43 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-	* lib/mathn.rb (Rational::inspect): should preserve original
-	  operand.  [ruby-core:05806]
+	* ext/dl/ptr.c (rb_dlptr_cast): removed.
 
-Sat Sep 17 23:20:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Apr 18 17:01:43 2002  Tanaka Akira  <akr@m17n.org>
 
-	* lib/cgi.rb (CGI::Cookie): should handle multiple values for a
-	  cookie name.  [ruby-talk:156140]
+	* re.c (rb_reg_to_s): new function for Regexp#to_s.
 
-Sat Sep 17 10:42:13 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Apr 17 23:55:34 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
-	  should call Kernel.eval on caller's safe-level instead of slave's
-	  safe-level (Of course, the given script should be evaluated on
-	  slave's safe-level).
+	* ext/Setup*, ext/bigfloat/*: Back out the import of BigFloat in
+	  favor of its forthcoming successor, BigDecimal.
 
-Sat Sep 17 09:45:26 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Apr 17 16:53:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (rb_str_substr): should propagate taintness even for
-	  empty strings.  [ruby-dev:27121]
+	* re.c (rb_reg_expr_str): should treat backslash specially in
+	  escaping.
 
-	* string.c (rb_str_aref): should infect result if range argument
-	  is tainted.  [ruby-dev:27121]
+Wed Apr 17 08:16:41 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
 
-Sat Sep 17 08:35:39 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* io.c: complete off_t handling; missing argument for
+	  fptr_finalize(); polished rb_scan_args call.
 
-	* lib/rss/maker/base.rb (RSS::Maker::ItemsBase#normalize): fixed
-	strange RSS::Maker::Item#max_size behavior.
-	Thanks to Kazuhiko <kazuhiko@fdiary.net>.
+Wed Apr 17 00:01:59 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
 
-	* test/rss/test_maker_1.0.rb (RSS::TestMaker10#test_items): ditto.
+	* dir.c: wrap multi-statment macro by do { } while (0)
 
-Fri Sep 16 23:09:20 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* eval.c, numeric,c, sprintf.c, util.c: ditto.
 
-	* ext/win32ole/win32ole.c (ole_search_event_at): bug fix
-	  in ext/win32ole/sample/ienavi.rb.
+Tue Apr 16 08:59:50 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/win32ole/win32ole/tests/testOLEEVENT.rb: ditto.
+	* eval.c (assign): convert mrhs to mvalue.
 
-Fri Sep 16 22:41:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Apr 15 18:12:57 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* file.c (rb_file_s_extname): empty string for path name ending with a
-	  period.  fixed: [ruby-core:05651]
+	* bignum.c (rb_big_eq): check `y == x' if y is neither Fixnum,
+	  Bignum, nor Float.
 
-	* file.c (rb_file_join): smarter behavior at edge cases.
-	  fixed: [ruby-core:05706]
+Mon Apr 15 09:27:31 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Sep 16 18:34:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* pack.c (pack_unpack): should treat 'U' in character unit, not in
+	  byte unit.
 
-	* ext/syck/node.c (syck_replace_str): was using return from the
-	  void function.  a patch from MIYAMUKO Katsuyuki
-	  <miyamuko at mtb.biglobe.ne.jp>.  [ruby-dev:27111]
+	* error.c (exc_initialize): should clear backtrace information.
 
-Fri Sep 16 14:48:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Apr 13 23:42:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: fix typo on MultiTkIp#bg_eval_string
+	* io.c (rb_io_fptr_cleanup): should close IO created by IO.new(fd).
 
-Fri Sep 16 12:02:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* rubyio.h: remove FMODE_FDOPEN
 
-	* ext/syck/rubyext.c (syck_resolver_transfer): remove C++ style
-	  comment (//).  [ruby-core:05793]
+Fri Apr 12 12:54:04 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-Fri Sep 16 00:14:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* win32/Makefile.sub: use missing/acosh.c.
 
-	* test/logger/test_logger.rb: unintentionally overwritten changes by
-	  Usa.  reverted.
+	* win32/config.h.in: define HAVE_COSH, HAVE_SINH, and HAVE_TANH.
 
-Fri Sep 16 00:06:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Apr 12 02:58:55 2002  Koji Arai  <jca02266@nifty.ne.jp>
 
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
-	  $stdout.binmode.
+	* struct.c (rb_struct_select): fix typo.
 
-Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Apr 12 00:34:17 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5.
+	* MANIFEST (missing/acosh.c): added.
 
-	  #nnn is a ticket number at http://dev.ctor.org/soap4r
+	* Makefile.in (missing/acosh.c): ditto.
 
-	  * SOAP
+	* Makefile.in (missing/fileblocks.c): ditto.
 
-	    * allow to configure an envelope namespace of SOAP request. (#124)
-	   	TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope'
-	  	@client.options["soap.envelope.requestnamespace"] =
-		  TemporaryNamespace
-	 	@client.options["soap.envelope.responsenamespace"] =
-		  TemporaryNamespace
-		@client.do_proc(...)
+	* configure.in (AC_REPLACE_FUNCS): check acosh() on behalf of
+	  inverse hyperbolic functions, asinh() and atanh().
 
-	    * let SOAP request XML indent space configuable.  see
-	      "soap.envelope.no_indent" option. (#130)
+	* missing/acosh.c: added for acosh(), asinh() and atanh().
 
-	    * let external CES configuable.
-	      ex. client["soap.mapping.external_ces"] = 'SJIS'.  $KCODE is used
-	      by default. (#133)
-		external CES ::= CES used in Ruby object of client and server
-		internal CES ::= CES used in SOAP/OM
+Thu Apr 11 20:01:44 2002  Masahiro Tomita  <tommy@tmtm.org>
 
-	    * add iso-8859-1 external CES support. (#106)
+	* io.c (io_write): check error if written data is less than
+	  specified size to detect EPIPE.
 
-	    * fixed illegal 'qualified' handling of elements.  it caused
-	      ASP.NET inteoperability problem. (#144)
+Thu Apr 11 19:10:37 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	    * added 'soap.envelope.use_numeric_character_reference' (boolean)
-	      option to let query XML use numeric character reference in XML,
-	      not plain UTF-8 character.  !GoogleSearch server seems to not
-	      allow plain UTF-8 character since 2005-08-15 update. (#147)
+	* io.c (remain_size): IO#read returns "" if file.size == 0.
 
-	    * SOAP::Header::SimpleHeader (de)serialization throws an exception
-	      on !SimpleHeader.on_(in|out)bound when header is a String.  so we
-	      could not use a simple single element headerItem.  fixed.  thanks
-	      to emil. (#129)
+	* random.c (rand_init): add check for initstate(3).
 
-	    * out parameter of rpc operation did not work.  (#132)
+	* configure.in: ditto.
 
-	    * follow HTTP redirect only if using http-access2.  (#125) (#145)
+Thu Apr 11 09:31:19 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-	    * add a workaround for importing an WSDL whose path begins with
-	      drive letter.  (#115)
+	* ext/dl/ptr.c: raise() -> rb_raise(). (Thanks Tetsuya Watanabe)
 
-	  * WSDL
+	* ext/dl/sym.c: ditto.
 
-	    * SOAP Data which is defined as a simpletype was not mapped
-	      correctly to Ruby obj when using wsdl2ruby.rb generated classdef
-	      file. (#123)
+Thu Apr 11 07:57:48 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
 
-	    * rpc/literal support. (#118)
+	* eval.c (assign): ruby_verbose should be surrounded by RTEST().
 
-	    * re-implemented local element qualify/unqualify control.  handles
-	      elementFormDefault and form in WSDL.  (#119)
+	* object.c (rb_str2cstr): ditto.
 
-	    * Array of an element which has simpleType causes a crash. (#128)
+	* parse.y (void_expr): ditto.
 
-	    * prarmeterOrder may not contain return part so it can be shorter
-	      than parts size.  Thanks to Hugh.  (#139)
+	* parse.y (void_stmts): ditto.
 
-	  * Samples
+	* variable.c (rb_ivar_get): ditto.
 
-	    * added !BasicAuth client sample. (#117)
+	* variable.c (rb_cvar_set): ditto.
 
-	    * added Base64 client/server sample.
+	* variable.c (rb_cvar_get): ditto.
 
-	    * added Flickr SOAP interface client sample. (#122)
+Thu Apr 11 07:02:31 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-	    * added !SalesForce client sample. (#135)
+	* ext/dl: Add dl.txt instead of README and README.html.
 
-	    * updated Thawte CA certificate for !GoogleAdWords sample.
+Thu Apr 11 01:55:52 2002  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	    * updated a client script with the newer version made by Johan.
-	      thanks!
+	* lib/cgi/session.rb: support for multipart form.
 
-	    * shortened long file names. (#120)
+Wed Apr 10 18:42:23 2002  Tachino Nobuhiro <tachino@jp.fujitsu.com>
 
-	    * fixed typo in authheader sample. (#129)
+	* dir.c (glob_helper): should have proceed link when link->path
+	  was non existing symbolic link.
 
-	    * updated deprecated method usage.  (#138)
+Wed Apr 10 17:30:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Sep 15 23:02:57 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* variable.c (rb_obj_remove_instance_variable): raise NameError if
+	  specified instance variable is not defined.
 
-	* win32/win32.h (rb_w32_stat): added prototype.
+	* variable.c (generic_ivar_remove): modified to check ivar
+	  existence.
 
-Thu Sep 15 22:35:55 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Apr 10 14:16:45 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* test/ruby/test_signal.rb (test_exit_action): skip the test using
-	  fork on fork-less platforms.
+	* misc/ruby-mode.el (ruby-font-lock-keywords): fontify symbols for
+	  unary operators and aset.
 
-Thu Sep 15 11:39:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Apr  9 13:40:31 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,
-	  TkDialogObj#name raises an exception. [ruby-talk:156109]
+	* lib/mkmf.rb (try_link0): need expand macro in command, sync with
+	  ext/extmk.rb.in.
 
-Thu Sep 15 01:39:19 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/mkmf.rb (try_cpp): ditto.
 
-	* lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
-	  up method. Tabs converted to spaces.
+	* lib/mkmf.rb (egrep_cpp): ditto.
 
-Thu Sep 15 00:18:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Apr  9 12:44:59 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
-	  readpartial.  [ruby-talk:127641]
+	* ext/stringio/stringio.c (check_modifiable): performance
+	  improvement.  avoid calling rb_str_modify() twice.
 
-Wed Sep 14 22:40:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/stringio/stringio.c (strio_ungetc): ditto.
 
-	* dir.c (ruby_glob): glob function not using ruby exception system.
+	* ext/stringio/stringio.c (strio_putc): ditto.
 
-Wed Sep 14 01:26:03 2005  Minero Aoki  <aamine@loveruby.net>
+	* ext/stringio/stringio.c (strio_write): ditto, and use
+	  rb_str_cat() as possible.
 
-	* lib/net/https.rb: backported from trunk, rev 1.3.
-	  [ruby-dev:25673] (again), [ruby-dev:26617] (again),
-	  [ruby-dev:27062]
+Tue Apr  9 05:17:48 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/openssl/lib/net/https.rb: removed.
+	* re.c (match_select): fix index references and make
+	  MatchData#select actually work.
 
-	* ext/openssl/lib/net/protocols.rb: removed.
+Tue Apr  9 00:20:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https.
+	* file.c (rb_file_s_extname): new method based on the proposal
+	  (and patch) from Mike Hall. [new]
 
-Tue Sep 13 22:09:40 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Apr  8 04:50:51 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/logger.rb (Logger): added formatter accessor to logger for
-	  dictating the way in which the logger should format the messages it
-	  displays.  Thanks to Nicholas Seckar (cf. [ruby-talk:153391]) and
-	  Daniel Berger.
+	* eval.c (error_handle): default to 1 unless status is set.
 
-	* lib/logger.rb (Logger): added VERSION constant.
+	* eval.c (ruby_options): guard error_handle() with PROT_NONE.
 
-	* lib/logger.rb: removed document for LogDevice. It is an
-	  implementation detail and is not a public interface.
+	* eval.c (ruby_stop): ditto.
 
-	* test/logger/test_logger.rb: added tests.
+Mon Apr  8 01:22:24 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Sep 13 21:47:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* math.c (math_acosh): added. [new]
 
-	* eval.c (BEGIN_CALLARGS): pop halfly pushed status.
-	  fixed: [ruby-dev:26881]
+	* math.c (math_asinh): ditto.
 
-Tue Sep 13 16:26:45 2005  Minero Aoki  <aamine@loveruby.net>
+	* math.c (math_atanh): ditto.
 
-	* lib/net/http.rb: backported from trunk, rev 1.128.
-	  [ruby-dev:25673] [ruby-dev:26617]
+	* struct.c (rb_struct_each_pair): method added. [new]
 
-	* lib/net/protocol.rb: backported from trunk, rev 1.78.
+Sat Apr  6 02:04:49 2002  Guy Decoux  <ts@moulon.inra.fr>
 
-	* lib/net/protocol.rb: new method #old_open to support net/smtp
-	  and net/pop.
+	* class.c (rb_singleton_class): wrong condition; was creating
+	  unnecessary singleton class.
 
-	* lib/net/smtp.rb: use #old_open.
+Sat Apr  6 01:09:41 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/net/pop.rb: ditto.
+	* sprintf.c (remove_sign_bits): simplifies the condition.
 
-Tue Sep 13 12:33:05 2005  why the lucky stiff  <why@ruby-lang.org>
+	* bignum.c (get2comp): calculate proper carry over.
 
-	* lib/yaml.rb: reworking YAML::Stream to use the new
-	  emitter.
+Fri Apr  5 05:07:28 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-	* lib/yaml/stream.rb: ditto.
+	* ext/dl: Add dl/struct.rb.
 
-	* lib/yaml/rubytypes.rb: added Object#yaml_new.
+Thu Apr  4 14:08:52 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-	* lib/yaml/tag.rb: the tag_subclasses? method now
-	  shows up in the class.  allow taguri to be set using an accessor.
-	  continue support of Object#to_yaml_type.
+	* ext/dl/lib/dl/import.rb: Get rid of ineffective
+	  encoding/decoding procedures.
 
-	* ext/syck/rubyext.c: new emitter code.  yaml_new and yaml_initialize
-	  get called, should they be present.  consolidated all the diaspora of internal
-	  node types into the family below YAML::Syck::Node -- Map,
-	  Seq, Scalar -- all of whom are SyckNode structs pointing to
-	  Ruby data.  moved Object#yaml_new into the node_import and made it the
-	  default behavior.  the target_class is always called wih yaml_new, prepended
-	  a parameter, which is the klass.  loaded nodes through GenericResolver show their style.
-	  new Resolver#tagurize converts type ids to taguris.
+Thu Apr  4 01:08:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/syck/implicit.re: were 'y' and 'n' seriously omitted??
+	* numeric.c (int_step): step may be a float less than 1.
 
-	* ext/syck/emitter.c: renovated emitter, walks the tree in advance.
-	  consolidated redundant block_styles struct into
-	  the scalar_style struct.  (this means loaded nodes can now
-	  be sent back to emitter and preserve at least its very basic
-	  formatting.)
+Wed Apr  3 20:42:34 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-	* ext/syck/gram.c: headless documents of any kind allowed.
+	* ext/dl: Merge Nakada's patch.
 
-	* ext/syck/node.c: new syck_replace_str methods and syck_empty_*
-	  methods for rewriting node contents, while keeping the ID
-	  and other setup info.  added syck_seq_assign.
+	* ext/dl/dl.h: define StringValuePtr for ruby-1.6.
 
-	* ext/syck/syck.h: reflect block_styles and new node functions.
+Wed Apr  3 15:37:24 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-Mon Sep 12 20:53:06 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/dl: Add dl/types.rb.
 
-	* test/openssl/test_pkcs7.rb (test_enveloped): skip this test
-	  to avoid a bug of PKCS7_enctypt() (only if ext/openssl is
-	  compiled with OpenSSL-0.9.7d or earlier versions).
-	  http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
+Wed Apr  3 01:54:10 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Mon Sep 12 14:03:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/extmk.rb.in (enable_config): follow lib/mkmf.rb.
 
-	* test/dbm/test_dbm.rb: remove locking test, which may not be
-	  supported on some platforms.  [ruby-dev:27030]
+Tue Apr  2 19:59:13 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-Mon Sep 12 10:45:58 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/dl: Merge from rough.
 
-	* ext/dl/dl.c (rb_io_to_ptr): merged a patch for DragonFly BSD
-	  from Takahiro Kambe <taca at back-street.net>.  [ruby-dev:27023]
+Tue Apr  2 15:17:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Sep 11 22:05:51 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* Makefile.in (CPPFLAGS): remove @includedir@.
 
-	* bin/erb (ERB::Main#run): set ERB#filename so that it is used
-	  when reporting syntax/runtime errors. Tabs converted to spaces.
+	* lib/mkmf.rb (create_makefile): ditto.
 
-Sat Sep 10 10:17:03 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/extmk.rb.in (create_makefile): ditto.
 
-	* ext/openssl/ossl_engine.c (ossl_engine_s_by_id):
-	  OpenSSL::Engine.by_id calls given block before calling
-	  ENGINE_init (block parameter is the return value of this method
-	  itself).  this functionality is useful to load dynamic shared
-	  engines. the following code is a sample of loading a key using
-	  OpenSC PKCS #11 module.
+Tue Apr  2 15:09:05 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-		require "openssl"
-		pkcs11 = OpenSSL::Engine.by_id("dynamic"){|e|
-		  e.ctrl_cmd("SO_PATH", "/usr/lib/opensc/engine_pkcs11.so")
-		  e.ctrl_cmd("LIST_ADD", "1")
-		  e.ctrl_cmd("LOAD")
-		}
-		pkcs11.ctrl_cmd("PIN", "secret")
-		key = pkcs11.load_private_key
+	* ext/socket/socket.c (sock_addrinfo): should clear addrinfo hints.
 
-	* ext/openssl/ossl_engine.c (ossl_engine_ctrl_cmd): new method
-	  OpenSSL::Engine#ctrl_cmd. it wraps ENGINE_ctrl_cmd_string.
+Mon Apr  1 23:48:12 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
 
-	* ext/openssl/ossl_engine.c (ossl_engine_get_cmds): new method
-	  OpenSSL::Engine#cmds. it returms engine command definitions.
+	* lib/mkmf.rb: install any files using $INSTALLFILES.
+	  (see also [ruby-dev:16683])
 
-Sat Sep 10 10:09:47 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Apr  1 17:25:50 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_asn1.c (asn1str_to_str): new function.
+	* io.c (rb_io_fptr_cleanup): need flush even when io will not be
+	  closed. 
 
-	* ext/openssl/ossl_pkcs7.c: new class OpenSSL::PKCS7::RecipientInfo.
-	  this class wraps PKCS7_RECIP_INFO struct.
+	* io.c (rb_io_initialize): was calling wrong function
+	  rb_io_mode_flags().
 
-	* ext/openssl/ossl_pkcs7.c: OpenSSL::PKCS7::Signer is renamed to
-	  OpenSSL::PKCS7::SignerInfo. ("Signer" remains as an alias of
-	  SignerInfo.)
+Mon Apr  1 16:52:00 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* test/openssl/test_pkcs7.rb: new file.
+	* ext/sdbm/init.c (each_pair): moved prototype before the
+	  definition.
 
-Sat Sep 10 10:05:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/racc/cparse/cparse.c (call_scaniter): ditto.
 
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): assume that
-	  the argument is a DER string if Base64 decoding failed.
+Mon Apr  1 15:11:40 2002  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
+	* ext/racc/cparse/cparse.c: prototype; call_scaniter().
 
-	* test/openssl/test_ns_spki.rb: add new file.
+	* ext/sdbm/init.c: prototype; each_pair().
 
-Sat Sep 10 09:56:24 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/tcltklib/tcltklib.c: prototypes; _timer_for_tcl() and ip_ruby(),
+	  Nobu's patch at [ruby-dev:14483].
 
-	* ext/openssl/lib/digest.rb: added SHA224, SHA256, SHA384 and SHA512.
-	  these features are enabled if this library is compiled with
-	  OpenSSL 0.9.8 or later.
+Mon Apr  1 10:56:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/openssl/test_digest.rb: add test for new digests.
+	* re.c (match_setter): it's OK to assign nil to $~.
 
-Sat Sep 10 09:51:30 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Apr  1 03:55:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
-	  to get last error on the current thread. And should report
-	  errors on the stack while OpenSSL.debug is true.
+	* io.c (rb_io_fptr_cleanup): do not close IO created by for_fd().
 
-	* ext/openssl/ossl.c (ossl_get_errors): new method for debugging
-	  this library.
+	* io.c (rb_io_initialize): mark IO created by for_fd
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
+	* ext/socket/socket.c (bsock_s_for_fd): ditto.
 
-	* ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
-	  of unused variable.
+Fri Mar 29 20:21:58 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
-	  set @time to avoid warning.
+	* lib/mkmf.rb (create_makefile): default FLAGS to empty strings.
 
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths,
-	  X509_STORE_add_cert, X509_STORE_add_crl): should raise error if
-	  wrapped functions failed.
+Fri Mar 29 16:36:52 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* test/openssl/test_x509store.rb: add test for errors.
+	* lib/mkmf.rb (arg_config): should use Shellwords::shellwords like
+	  ext/extmk.rb.in.
 
-Fri Sep  9 22:13:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb (enable_config): default had priority over command
+	  line options and configure_args.
 
-	* eval.c (rb_call0): prohibit calling tainted method (>2) when
-	  $SAFE == 0.
+	* lib/mkmf.rb: support autoconf 2.53 style variables from
+	  environment.
 
-Fri Sep  9 16:45:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/mkmf.rb: add directory options.
 
-	* string.c (rb_str_times): make empty strings to keep taintness,
-	  and a little improvement.  [ruby-dev:26900]
+Fri Mar 29 15:49:29 2002  Usaku Nakamura <usa@ruby-lang.org>
 
-	* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
-	  characters in command line option.  fixed: [ruby-talk:155369]
+	* win32/README.win32: follow recent changes.
 
-Thu Sep  8 14:58:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Mar 29 14:44:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* merged a patch from Takahiro Kambe <taca at back-street.net> to
-	  support DragonFly BSD.  [ruby-dev:26984]
+	* io.c (io_fflush): DRY patch from /Christoph applied.
 
-Wed Sep  7 12:55:08 2005  Tanaka Akira  <akr@m17n.org>
+Thu Mar 28 18:58:13 2002  Usaku Nakamura <usa@ruby-lang.org>
 
-	* lib/open-uri.rb: abolish mod === tempfile to avoid a problem
-	  [ruby-dev:26967].
+	* win32/Makefile.sub (config.status): reflect user defined $CC in
+	  config.status.
 
-Wed Sep  7 10:45:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar 28 18:03:51 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* eval.c (rb_thread_switch): convert all exceptions to
-	  SystemExit.  fixed: [ruby-core:05724]
+	* ext/strscan/strscan.c: add taint check.
 
-	* eval.c (rb_thread_terminated): show backtrace before propagate
-	  exceptions to main thread.
+	* ext/strscan/strscan.c: #getch/#get_byte should set regexp
+	  registers.
 
-Wed Sep  7 08:35:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/strscan/strscan.c: remove useless #include directive.
 
-	* Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
-	  extension libraries.
+	* ext/strscan/strscan.c: refactor struct strscanner.
 
-	* bignum.c (bignew_1, bigadd): K&R style argument actually can't be
-	  defined as char.
+Thu Mar 28 14:51:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* missing/vsnprintf.c: ANSI compiler supports const keyword.
+	* ext/socket/socket.c (sock_addrinfo): should specify socktype
+	  from outside.
 
-	* ext/digest/sha2/extconf.rb: reject platforms which has inttypes.h
-	  but no 64bit integer.
+Wed Mar 27 17:04:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/mkmf.rb (what_type?): guesstimate type.
+	* io.c (argf_binmode): should call next_argv() to initialize ARGF.
 
-	* ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
-	  char*.  fixed: [ruby-core:05470]
+	* io.c (argf_filename): ditto.
 
-Wed Sep  7 08:32:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (argf_file): ditto.
 
-	* object.c (rb_mod_cvar_get, rb_mod_cvar_set): document fix from
-	  sheepman <sheepman@sheepman.sakura.ne.jp>; a bug in visibility
-	  description.  [ruby-dev:26965]
+Wed Mar 27 14:47:32 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* sprintf.c (rb_f_sprintf): warn "too many argument" on verbose
-	  mode (-v/-w); backported from 1.9.  [ruby-dev:26963]
+	* io.c (READ_DATA_PENDING): configure.in has supported for uClibc,
+	  so remove uClibc stuff.
 
-Mon Sep  5 17:03:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Mar 27 13:14:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/ostruct.rb: a patch from Florian Gross <florgro at gmail.com>
-	  merged to allow recursive inspect (and to_s) for OpenStruct.
-	  [ruby-core:05532]
+	* io.c (rb_io_sysseek): new method based on a patch from Aristarkh
+	  A Zagorodnikov <xm@bolotov-team.ru>. [new]
 
-Mon Sep  5 07:01:12 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* io.c (READ_DATA_PENDING): use !feof(fp) for default behavior.
 
-	* ext/openssl/openssl/lib/openssl/buffering.rb (Buffering#do_write):
-	  should clear data from the buffer which already been output.
+Tue Mar 26 20:28:50 2002  Minero Aoki  <aamine@loveruby.net>
 
-Fri Sep  2 23:51:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/http.rb: HTTP.get accepts URI.
 
-	* lib: do not use __send__ to access private methods.  [ruby-dev:26935]
+	* lib/net/http.rb: new method HTTP.get_uri.
 
-Fri Sep  2 03:29:00 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+	* lib/net/http.rb: add some HTTP 1.1 response codes.
 
-	* lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
-	  [ruby-dev:26872], [ruby-dev: 26920]
+Tue Mar 26 20:25:28 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/irb/locale.rb: support to print help message when OS locale is
-	  ja_JP.utf-8. [ruby-dev:26872]
+	* doc/net/protocol.rd.ja, smtp.rd.ja, pop.rd.ja: removed.
 
-Thu Sep  1 17:11:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* MANIFEST: remove doc/net/* entries.
 
-	* eval.c (rb_call0): wrong condition for $SAFE restoration.
+Tue Mar 26 18:45:15 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Sep  1 14:12:45 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* configure.in (FILE_READPTR): check bufread instead of bufend
+	  for uClibc.
+	
+	* ext/extmk.rb.in (arg_config): should use Shellwords::shellwords.
 
-	* ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't
-	  work (gives wrong order of arguments).
+Tue Mar 26 01:56:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#invoke_hidden_on_namespace
-	  to support '-namespace' option of 'interp invokehidden' command
-	  on Tcl8.5.
+	* parse.y (primary): while/until statement modifiers to "begin"
+	  statement now work as "do .. while" even when begin statement
+	  has "rescue" or "ensure" [new].
 
-Wed Aug 31 14:43:15 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (bodystmt): rescue/ensure is allowed at every bodies,
+	  i.e. method bodies, begin bodies, class bodies[new], and module
+	  bodies[new].
 
-	* win32/Makefile.sub (OPTFLAGS): default global optimization to
-	  disabled for all VC++ versions.  fixed: [ruby-dev:26897]
+Mon Mar 25 22:10:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Aug 31 11:35:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/socket/socket.c (sock_addrinfo): should specify ai_socktype
+	  for getaddrinfo hints.
 
-	* test/gdbm/test_gdbm.rb (teardown): should remove GDBM temporary
-	  file.
+Mon Mar 25 17:18:48 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Wed Aug 31 10:30:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* dir.c (rb_push_glob): local variable 'maxnest' was
+	  uninitialized.
 
-	* process.c (proc_detach, proc_setmaxgroups): missing argument type
-	  declaration. (I recommend ANSI-style function)
+Mon Mar 25 16:53:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Aug 30 23:20:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_f_abort): embed aborting message into exception
+	  object [new].
 
-	* eval.c (rb_rescue2): initialization miss.  fixed: [ruby-dev:26917]
+	* eval.c (terminate_process): utility function for exit and abort.
 
-	* lib/mkmf.rb (xsystem, xpopen): no longer expand by Config.
+Tue Mar 26 14:04:47 2002  okabe katsuyuki <HGC02147@nifty.ne.jp>
 
-	* lib/mkmf.rb (link_command, cc_command, cpp_command): expand
-	  variables at once, and quote hdrdir.  fixed: [ruby-core:05680]
+	* win32/mkexports.rb: support VC++.NET.
 
-	* lib/mkmf.rb (libpathflag): quote paths.
+Tue Mar 26 14:00:17 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Aug 30 19:34:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/bigfloat/bigfloat.c: Fix the initializer's function name
+	  according to the new library name. (pointed out by nobu)
 
-	* ext/digest/md5/md5ossl.h, ext/digest/rmd160/rmd160ossl.h,
-	  ext/digest/sha1/sha1ossl.h: include <stddef.h> to avoid
-	  error in compilation with OpenSSL-0.9.8. [ruby-list:41068]
+Tue Mar 26 11:12:01 2002  Minero Aoki  <aamine@loveruby.net>
 
-Mon Aug 29 19:54:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/fileutils.rb: new file.
 
-	* lib/rdoc/usage.rb: improper exceptions. [ruby-dev:26870]
+Tue Mar 26 03:23:50 2002  Tanaka Akira  <akr@m17n.org>
 
-	* lib/rdoc/usage.rb: support the case when non-ruby code exists before
-	  shebang. (this is needed when ri.bat is executed on windows)
+	* lib/pp.rb (pp): return nil like p.
 
-Mon Aug 29 17:48:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Mar 26 01:48:01 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* eval.c (method_arity): should return proper arity value.
-	  [ruby-dev:26390]
+	* ext/bigfloat/extconf.rb: Downcase the library name. (BigFloat.so
+	  -> bigfloat.so)
 
-Mon Aug 29 01:19:57 2005  Tanaka Akira  <akr@m17n.org>
+	* ext/bigfloat/bigfloat.c (BigFloat_inspect): Alter the inspect
+	  format not to look like an array. (pointed out by akr)
 
-	* lib/time.rb (Time.parse): extract fractional seconds using
-	  Date._parse.  [ruby-talk:153859]
+	* ext/bigfloat/bigfloat.c (BigFloat_hash): Implement BigFloat#hash.
 
-Sat Aug 27 20:20:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/bigfloat/bigfloat.c (BigFloat_dump, BigFloat_load):
+	  Support marshaling.
 
-	* ext/curses/curses.c ({curses,window}_clrtoeol): added. suggested
-	  by Reyn Vlietstra.
+Tue Mar 26 00:38:11 2002  Tanaka Akira  <akr@m17n.org>
 
-	* ext/curses/curses.c: chtype in curses is not `char', rahter `long'.
-	  [ruby-Bugs:2298]
+	* configure.in (FILE_READPTR): check _p for 4.4BSD.
 
-	* ext/curses/view.rb: String =~ String is deprecated.
+Mon Mar 25 23:39:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Wed Aug 24 10:53:28 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* configure.in (FILE_READPTR): new.  for IO#gets improvement.
 
-	* test/logger/test_logger.rb (test_shifting_size): should close log
-	  device before unlink, since some platform cannot unlink opened
-	  file.
+	* io.c (READ_DATA_PENDING_PTR): ditto.
 
-Sun Aug 21 00:13:27 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* io.c (remain_size): separated from read_all().
 
-	* lib/wsdl/xmlSchema/importer.rb (WSDL::XMLSchema::Importer#fetch): add
-	  a workaround for importing an WSDL whose path begins with drive
-	  letter.  [ruby-dev:26242]
+	* io.c (read_all): argument chagend.
 
-Sat Aug 20 22:37:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* io.c (appendline): new.  get a line and append to string.
 
-	* lib/logger.rb (write, shift_log?, shift_log): file shifting race
-	  condition bug fixed.  [ruby-dev:26764]
+	* io.c (swallow): new.  swallow continuous line delimiters.
 
-	* test/logger/test_logger.rb: tests.
+	* io.c (rb_io_getline_fast): add delimiter argument.
 
-Fri Aug 19 18:13:39 2005  Tanaka Akira  <akr@m17n.org>
+	* io.c (rb_io_getline): performance improvement.
 
-	* lib/time.rb (Time.apply_offset): fix a problem with last day of
-	  month.  reported by Lucas Nussbaum.  [ruby-talk:152866]
+Mon Mar 25 19:30:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Aug 18 12:46:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/extmk.rb.in (arg_config): get rid of single quotes
+	  for autoconf 2.53.
 
-	* bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24.
-	  I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally.
-	  [ruby-dev:26806]
+Mon Mar 25 17:49:41 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* win32/win32.h: include winsock2.h instead of winsock.h. (bcc32)
+	* regex.c (mbc_startpos_func): VC6 seems to be unable to
+	  understand forward declaration for static variables.
 
-Wed Aug 17 23:58:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c (rb_push_glob): local variable 'maxnest' was
+	  uninitialized.
 
-	* object.c (rb_to_integer): argument constified.
+Mon Mar 25 13:24:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (terminate_process): take String message.
+	* ext/socket/socket.c (bsock_do_not_rev_lookup_set): should not be
+	  allowed when $SAFE > 3.
 
-	* eval.c (rb_thread_switch): propagate the exception caused thread
-	  termination directly.  fixed: [ruby-core:05552]
+	* eval.c (rb_thread_ready): THREAD_TO_KILL threads should not turn
+	  into THREAD_RUNNABLE on wakeup.
 
-Wed Aug 17 00:05:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_thread_list): THREAD_TO_KILL threads should be in the
+	  list. 
 
-	* eval.c (rb_add_method): preserve safe level in the environment
-	  where a method is defined .
+	* eval.c (thgroup_list): ditto; by moving gid clearance from
+	  rb_thread_cleanup().
 
-	* eval.c (rb_call0): restore preserved safe level in the method
-	  execution.
+Mon Mar 25 11:06:19 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Mon Aug 15 00:38:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dln.c (dln_argv0): unused unless USE_DLN_A_OUT.
 
-	* eval.c (rb_rescue2): reduce PUSH_TAG() as well as NODE_RESCUE.
-	  [ruby-dev:26800]
+	* regex.c (mbc_startpos_func): should be static.
 
-	* range.c (range_check, range_init): reduce useless exceptions.
+Sun Mar 24 12:19:09 2002  Koji Arai  <jca02266@nifty.ne.jp>
 
-Sat Aug 13 18:51:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c (fnmatch): "*/bar" (with FNM_PATHNAME flag) does not
+	  match "foo/bar".
 
-	* eval.c (rb_block_pass): distinguish current block from others.
-	  fixed: [ruby-dev:26274]
+Sun Mar 24 00:46:05 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/stringio/stringio.c (strio_set_string): disallow nil.
-	  http://www.rubyist.net/~nobu/t/20050811.html#c05
+	* util.c (push_element): avoid warning for djgpp.
 
-Thu Aug 11 23:29:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Mar 23 01:50:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/stringio/stringio.c: keep holding string after closed.
+	* io.c (read_all): files on /proc filesystem with zero stat size,
+	  may have contents.
 
-Thu Aug 11 13:01:48 2005  Kouhei Sutou  <kou@cozmixng.org>
+Fri Mar 22 18:07:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss: fixed sort bug. [ruby-list:41018]
+	* ext/socket/socket.c (tcp_s_gethostbyname): refactored.
 
-	* lib/rss/1.0.rb (RSS::RDF::Channel#setup_maker_attributes):
-	  removed self.
+	* ext/socket/socket.c (sock_s_gethostbyname): ditto.
 
-	* lib/rss/maker/base.rb (RSS::Maker::ItemsBase#<=>): use #date
-	  instead of @date.
-	  (RSS::Maker::Base::self.def_array_element): added #size.
+Fri Mar 22 16:46:54 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/rss/maker/1.0.rb
-	  (RSS::Maker::RSS10::Channel#to_rss,
-	   RSS::Maker::RSS10::Items::Item#to_rss): cleared dc_dates set
-	  upped by using #date.
+	* ext/extmk.rb.in: replace mkdir with mkpath to compile racc/cparse.
 
-	* lib/rss/maker/dublincore.rb
-	  (RSS::Maker::ChannelBase, RSS::Maker::ItemsBase::ItemBase):
-	  fixed opposite alias.
+Fri Mar 22 16:22:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/rss/test_setup_maker_1.0.rb
-	  (RSS::TestSetupMaker10::test_setup_maker_items_sort): added some
-	  tests for RSS::Maker::ItemsBase#do_sort.
+	* the VMS support patch submitted by Akiyoshi, Masamichi
+	  <Masamichi.Akiyoshi@jp.compaq.com> is merged.
 
-Wed Aug 10 10:29:40 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Mar 22 16:27:24 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/tk/lib/tk.rb: fix bug on handling __ruby2val_optkeys().
+	* lib/racc/parser.rb: new file.
 
-	* ext/tk/lib/tk/itemconfig.rb: fix bug on handling
-	  __item_ruby2val_optkeys().
+	* ext/racc/MANIFEST, cparse.c, depend, extconf.rb: new files.
 
-	* ext/tk/lib/tk/canvas.rb: didn't check __item_ruby2val_optkeys().
+	* lib/README: add racc/parser.rb.
 
-	* ext/tk/lib/tkextlib/blt/component.rb: ditto.
+	* ext/Setup*: add racc/cparse.
 
-Tue Aug  9 15:12:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Mar 22 15:04:03 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c: remove dangerous 'rb_jump_tag's.
+	* eval.c (exec_under): changing ruby_class is OK, but should not
+	  alter cbase.
 
-	* ext/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
-	  help to convert option values between ruby and tcl.
+	* eval.c (yield_under_i): ditto.
 
-	* ext/tk/lib/tk/itemconfig.rb: add __item_val2ruby_optkeys and
-	  __item_ruby2val_optkeys to help to convert option values between
-	    ruby and tcl.
+Fri Mar 22 15:44:38 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/tk/lib/tk/radiobutton.rb: use __ruby2val_optkeys for 'variable'
-	  option (for the reason of backward compatibility).
+	* ext/strscan/MANIFEST, strscan.c, depend, extconf.rb: new files.
 
-	* ext/tk/lib/tk/composite.rb: clarify the arguments of super().
+	* ext/Setup*: add strscan entry.
 
-	* ext/tk/lib/tk/spinbox.rb: ditto.
+Fri Mar 22 14:32:14 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/tk/lib/tk/text.rb: ditto.
+	* lib/net/protocol.rb: Protocol#start should return self.
 
-	* ext/tk/lib/tk/validation.rb: ditto.
+Fri Mar 22 14:14:21 2002  Tanaka Akira  <akr@m17n.org>
 
-	* ext/tk/lib/tkextlib/*: support to treat tkvariable-type
-	  configure options.
+	* lib/resolv.rb: fix arguments to create exceptions.
+	  Patch from matt@lickey.com.  (ruby-bugs:PR#278)
 
-Tue Aug  9 20:30:19 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+Fri Mar 22 13:51:11 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* bignum.c (rb_big_coerce): allow bignum x bignum coercing.
-	  [ruby-dev:26778]
+	* ext/bigfloat/.cvsignore, ext/bigfloat/MANIFEST: BigFloat 1.1.8
+	  has been imported.  Add .cvsignore and MANIFEST.
 
-Mon Aug  8 20:43:02 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Mar 22 04:07:55 2002  Koji Arai  <jca02266@nifty.ne.jp>
 
-	* test/ruby/test_method.rb: added.  [ruby-dev:26761]
+	* sprintf.c (rb_f_printf): discard meaningless prefix ".." for '%u'.
 
-Sun Aug  7 23:50:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Mar 21 01:11:37 2002  Usaku Nakamura <usa@ruby-lang.org>
 
-	* test/ruby/test_super.rb: added from HEAD. [ruby-dev:26743]
+	* win32/Makefile.sub (config.status): fix install path (prefix).
 
-Sun Aug  7 01:31:15 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Thu Mar 21 01:03:05 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/win32ole/win32ole.c (WIN32OLE_EVENT#on_event): should set
-	  only one event handler.
+	* ext/configsub.rb: latest autoconf style support.
 
-	* ext/win32ole/tests/testOLEEVENT.rb: ditto.
+Wed Mar 20 22:16:25 2002  Usaku Nakamura <usa@ruby-lang.org>
 
-	* ext/win32ole/tests/testOLEPARAM.rb: remove re-defined
-	  test_ole_type_detail method.
+	* mkconfig.rb: close duplicated $stdout before renaming rbconfig.rb.
 
-Sat Aug  6 12:35:24 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Mar 20 21:54:17 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/{tk.rb,tk/itemconfig.rb}: configure creates
-	  TkVariable if key name is 'variable' or 'textvariable'
-	  by default. [ruby-dev:26749]
+	* win32/Makefile.sub: made variables configurable.
 
-	* ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
-	  {variable,textvariable} function.
+	* win32/Makefile.sub (config.h): updates RUBY_PLATFORM from
+	  Makefile.
 
-	* ext/tk/lib/tk/variable.rb: retains backward conpatibility.
+	* win32/Makefile.sub (config.status): ditto. and use recent
+	  autoconf format.
 
-Fri Aug  5 12:50:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* win32/Makefile.sub (clean): separate ext and local clean up.
 
-	* ext/tcltklib/tcltklib.c: fixed memory leak when tk_funcall raised
-	  exception. (copies argv into heap in tk_funcall instead of
-	  caller)
+	* win32/Makefile.sub (distclean): ditto.
 
-Fri Aug  5 12:42:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* win32/config.status.in: no longer used.
 
-	* lib/mkmf.rb (create_makefile): need to convert path separetor
-	  before invoking install command.
+Wed Mar 20 20:12:35 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Fri Aug  5 00:27:04 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* variable.c (rb_const_list): a temporary table must be freed.
 
-	* ext/tcltklib/tcltklib.c: refactoring - extract ruby string <->
-	  tcl object conversion as get_str_from_obj and get_obj_from_str.
+Wed Mar 20 19:44:09 2002  Tanaka Akira  <akr@m17n.org>
 
-Fri Aug  5 00:19:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* mkconfig.rb: don't touch rbconfig.rb if there is a trouble.
 
-	* extmk.rb (extmake): needs to be wrapped in an Array.
+Wed Mar 20 16:05:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Aug  4 18:38:36 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (is_defined): should check receiver only once.
 
-	* ext/tcltklib/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
+	* eval.c (is_defined): should handle NODE_NEWLINE.
 
-	* ext/tcltklib/tcltklib.c: add nativethread consistency check.
+Wed Mar 20 11:29:25 2002  Aristarkh A Zagorodnikov  <xm@xml-objects.com>
 
-	* ext/tcltklib/stubs.c: ditto.
+	* file.c (rb_file_s_expand_path): memory leak fixed.
 
-	* ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding=
-	  when Tcl is 7.6 or 8.0.
+Wed Mar 20 00:36:43 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/tk/lib/tk/wm.rb: support to make some methods as options of
-	  root or toplevel widget. [ruby-talk:150336]
+	* util.c (ruby_getcwd): the content of buf is uncertain and must
+	  not be printed when getcwd(buf, size) has failed.
 
-	* ext/tk/lib/tk/root.rb: ditto.
+Mon Mar 18 22:19:52 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tk/toplevel.rb: ditto.
+	* ext/stringio/stringio.c (check_modifiable): wrong declaration.
 
-	* ext/tk/lib/tkextlib/SUPPRT_STATUS: update RELEASE_DATE
+Mon Mar 18 18:04:05 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Thu Aug  4 08:03:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/digest: add depend file.
 
-	* ext/extmk.rb (extmake): should not modify $mflags for each
-	  extentions.
+	* ext/digest/md5: ditto.
 
-Thu Aug  4 00:25:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/digest/rmd160: ditto.
 
-	* common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
-	  macro definitions.
+	* ext/digest/sha1: ditto.
 
-	* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.
+	* ext/digest/sha2: ditto.
 
-	* {win32,wince}/Makefile.sub: separate config.h for compiler versions.
+	* ext/iconv/MANIFEST: ditto.
 
-Wed Aug  3 21:59:16 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/stringio/MANIFEST: ditto.
 
-	* ext/tk/lib/tk/variable.rb: TkVariable#trace didn't work on
-	  TkVariable retrived from TkVariable.new_hash.ref. [ruby-dev:26721]
+	* ext/syslog: ditto.
 
-Wed Aug  3 08:22:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Mar 18 17:18:06 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
-	  changes at 2004-09-07.  [ruby-dev:26656]
+	* eval.c (rb_f_abort): should not bypass cleanup.
 
-Tue Aug  2 10:20:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/stringio/stringio.c (check_modifiable): void function.
 
-	* ext/tcltklib/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
-	  Tcl_Obj[GS]etVar2. (avoid Tcl_NewStringObj on supported platforms)
+Mon Mar 18 12:52:01 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c: use ip_{get,set,unset}_variable2_core from
-	  ip_{get,set,unset}_variable.
+	* ext/iconv/extconf.rb: workaround for GNU libiconv.
 
-	* ext/tcltklib/tcltklib.c: replaced Tcl_Panic with rb_bug.
+Mon Mar 18 10:55:03 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Tue Aug  2 01:41:28 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (parse_string): part of multi-byte sequence must not
+	  match to paren.
 
-	* lib/ping.rb (Ping.pingecho): should rescue StandardError.
-	  [ruby-dev:26677]
+	* parse.y (parse_qstring): ditto.
 
-Mon Aug  1 19:09:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* parse.y (parse_quotedwords): ditto.
 
-	* ext/tcltklib/tcltklib.c: refactoring - replaced rb_ivar_defined &
-	  rb_ivar_get with single rb_attr_get call.
+	* parse.y (str_extend): handle multi-byte characters.
 
-Mon Aug  1 18:45:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Mar 18 10:31:20 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tcltklib/tcltklib.c (Tcl_GetStringResult): refactoring - define
-	  alternative macro on Tcl7.x or earlier.
+	* enum.c (enum_find): catch a value before recycle.
 
-Mon Aug  1 13:57:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* enum.c (enum_all): ditto.
 
-	* ext/tcltklib/tcltklib.c (deleted_ip): refactoring - interpreter
-	  deletion check. [ruby-dev:26664]
+	* enum.c (enum_any): ditto.
 
-Mon Aug  1 01:17:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* enum.c (enum_min): ditto.
 
-	* lib/drb/drb.rb (check_insecure_method): use private_methods and
-	  protected_methods instead of respond_to? to check method visibility.
-	  [ruby-dev:26616]
+	* enum.c (enum_max): ditto.
 
-	* test/drb/drbtest.rb: ditto.
+Sun Mar 17 20:08:04 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* test/drb/ut_drb.rb: ditto.
+	* ext/iconv/depend: added. 
 
-Mon Aug  1 00:07:32 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-	* lib/irb/context.rb: fix `irb --readline` option. [ruby-list:40955]
+	* ext/stringio/depend: added. 
 
-Fri Jul 29 09:59:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Mar 16 22:43:53 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* eval.c (rb_yield_0): push yielded node instead of yielding.
-	  fixed: [yarv-dev:549]
+	* missing/fileblocks.c: add for autoconf.
 
-Thu Jul 28 18:09:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Mar 16 15:30:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tcltklib/stubs.c: When --enable-tcltk-stubs, the initialize
-	  routine creates a Tcl/Tk interpreter and deletes it. However,
-	  init cost of Tk's MainWindow is not so small. And that makes it
-	  impossible to use libraries written with Tcl functions only on
-	  an environment without a graphical display. This changes support
-	  delaying initalization of Tk_Stubs until the script needs Tk.
+	* re.c (rb_reg_search): should clear last_match if pos is out of
+	  string range.
 
-	* ext/tcltklib/stubs.h: New file. Define prototypes and return
-	  codes of functions on stubs.c.
+	* string.c (rb_str_index_m): ditto.
 
-	* ext/tcltklib/tcltklib.c: Support delaying initalization of
-	  Tk_Stubs until the script needs Tk.
+	* string.c (rb_str_rindex): ditto.
 
-	* ext/tcltklib/tcltklib.c: Show friendly error messages for errors
-	  on initialization.
+Sat Mar 16 09:04:58 2002  Koji Arai <JCA02266@nifty.ne.jp>
 
-	* ext/tcltklib/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
-	  exiting and $DEBUG is true. (Not fix. If you know the reason of
-	  why, please fix it.)
+	* enum.c (enum_inject): use the first iterated element as the
+	  initial value when omitted.
 
-	* ext/tk/tkutil.c (ary2list, ary2list2): bug fix on handling of
-	  encoding.
+	* enum.c (inject_i): ditto.
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
-	  don't work propery.
+	* enum.c (Init_Enumerable): Enumerable#inject now takes variable
+	  count arguments.
 
-	* ext/tk/lib/tk.rb: Forget extending Tk::Encoding module to Tk.
-	* ext/tk/lib/tk/variable.rb: TkVarAccess fails to initialize the
-	  object for an element of a Tcl's array variable.
+Fri Mar 15 19:47:31 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Wed Jul 27 23:23:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c (StartSockets): remove duplicated lines.
 
-	* gc.c (obj_free): make message format consistent with one from
-	  gc_mark().  [ruby-talk:149668]
+Fri Mar 15 17:44:08 2002  Usaku Nakamura <usa@ruby-lang.org>
 
-Wed Jul 27 22:11:37 2005  Kouhei Sutou  <kou@cozmixng.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.
 
-	* sample/rss/tdiary_plugin: removed. because the plugin
-	  is imported in the tDiary plugin packages.
+	* numeric.c, intern.h, ruby.h (rb_num2ll, rb_num2ull): ditto.
 
-Wed Jul 27 10:59:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.h: use _I64_MAX and _I64_MIN if they are defined (for VC++).
 
-	* dir.c (dir_each): rewinddir(3) before iteration.
-	  [ruby-talk:149628]
+Fri Mar 15 14:02:43 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Tue Jul 26 12:57:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/iconv/iconv.c: fixed document, Iconv#new is no longer an
+	  iterator. thanks to Tanaka Akira <akr@m17n.org>.
 
-	* ext/openssl/openssl_missin.c: include <openssl/engine.h> before
-	  <openssl/x509_vfy.h> to avoid compilation error of mswin32.
-	  suggested by NAKAMURA Usaku.
+Thu Mar 14 22:17:45 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Mon Jul 25 21:30:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/iconv: imported.
 
-	* {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby
-	  source to XCFLAGS.
+Thu Mar 14 16:42:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jul 25 13:45:18 2005  NAJIMA Hiroki  <najima@mickey.ai.kyutech.ac.jp>
+	* class.c (rb_define_class): should handle autoload.
 
-	* io.c: check HAVE_SYS_IOCTL_H before including the header.
-	  [ruby-dev:26610]
+	* class.c (rb_define_module): ditto.
 
-Mon Jul 25 14:10:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Mar 14 16:18:12 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
+	* configure.in: autoconf 2.53 support. use AC_LIBOBJ.
 
-Sat Jul 23 16:49:04 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Mar 14 00:29:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
-	  OPENSSL_NO_STATIC_ENGINE.
+	* re.c (rb_reg_match): should clear $~ if operand is nil.
 
-Fri Jul 22 21:06:08 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+	* re.c (rb_reg_match2): ditto.
 
-	* bignum.c (rb_big_eq): reduce isnan().  [ruby-dev:26600]
+Thu Mar 14 12:32:59 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le): ditto.
+	* ext/stringio/stringio.c: fixed frozen string bug.  ungetc no
+	  longer raises on readonly stream unless modifies actually.
 
-Fri Jul 22 15:02:39 2005  Kouhei Sutou  <kou@cozmixng.org>
+Thu Mar 14 08:57:41 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/rss/rss.rb: moved copyright description to lib/rss.rb.
+	* dir.c (rb_push_glob): avoid SEGV when a block given.
 
-	* lib/rss.rb: added for convenience.
+Thu Mar 14 00:16:02 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* sample/rss/re_read.rb: added #to_s sample.
+	* string.c (rb_str_subpat_set): must make str independent after
+	  rb_reg_search() matched.
 
-	* sample/rss/blend.rb: use 'require "rss"' instead of
-	  'require "rss/*"'.
-	* sample/rss/list_description.rb: ditto.
-	* sample/rss/rss_recent.rb: ditto.
-	* sample/rss/tdiary-plugin/rss-recent.rb: ditto.
+Wed Mar 13 19:05:15 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* sample/rss/tdiary-plugin/rss-recent.rb: 0.0.6 -> 0.0.7.
+	* dir.c: FNM_PERIOD is obsoleted and FNM_DOTMATCH is introduced
+	  instead, which has the opposite meaning of FNM_PERIOD.
 
-Fri Jul 22 14:37:43 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* dir.c: Dir::glob now accepts optional FNM_* flags via the second
+	  argument, whereas Dir::[] doesn't.
 
-	* lib/rss/parser.rb (RSS::Parser#initialize): accept HTTP/FTP
-	  URI and local file path too.
+Wed Mar 13 18:36:55 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/rss/test_parser.rb (RSS::TestParser#test_parse): test
-	  for the above.
+	* lib/getopts.rb: single_options can be nil[*], and is not not
+	  optional. ([*]Pointed out by gotoken)
 
-Fri Jul 22 07:01:42 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Mar 13 17:23:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/tkutil.c (tk_conv_args): forget to revert thread_critical
-	  and gc_disable when raise ArgumentError.
+	* configure: merge Jonathan Baker's large file support patch
+	  [ruby-talk:35316], with read_all patch in [ruby-talk:35470].
 
-	* ext/tk/lib/remote-tk.rb: RemoteTkIp doesn't need to include TkUtil.
+Wed Mar 13 04:06:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp#has_mainwindow? method.
+	* eval.c (rb_f_abort): optional message argument that be printed
+	  on termination.
 
-	* ext/tk/lib/tk.rb: add Tk.has_mainwindow? method.
+Tue Mar 12 17:12:06 2002  Tanaka Akira  <akr@m17n.org>
 
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#has_mainwindow? method.
+	* lib/resolv.rb: don't complete domains for absolute FQNs.
 
-	* ext/tk/lib/remote-tk.rb: add RemoteTkIp#has_mainwindow? method.
+Mon Mar 11 23:08:48 2002  Tanaka Akira  <akr@m17n.org>
 
-	* ext/tk/lib/multi-tk.rb: slave IP fail to exit itself when $SAFE==4.
+	* lib/tsort.rb: new file.
 
-	* ext/tk/lib/multi-tk.rb: remove constants from MultiTkIp module to
-	  avoid access from external.
+Mon Mar 11 21:03:37 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/multi-tk.rb: check_root flag is ignored on slave IPs'
-	  mainloop.
+	* ext/stringio: new.
 
-	* ext/tk/lib/multi-tk.rb: hang-up Tk.mainloop called on a slave IP
-	  with $SAFE==4.
+Mon Mar 11 18:03:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#bg_eval_proc doesn't work
-	  properly.
+	* regex.c (re_compile_pattern): '\0111' should be '\011' plus '1',
+	  since octal literals are formed by three digits at most.
 
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#set_cb_error(proc) and
-	  cb_error(exc) to log errors at callbacks on safe slave IPs.
+Mon Mar 11 14:44:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: fail to get an available slave IP object
-	  when call Tk.mainloop in the block which is given to new_* method,
-	    because cannot finish initialize while the root widget is alive.
+	* marshal.c (w_object): module inclusion using extend() should
+	  also be detected.
 
-	* ext/tk/lib/multi-tk.rb: fail to control a slave IP when Tk.mainloop
-	  runs on the IP.
+	* eval.c (rb_eval_cmd): cbase should not be NULL; it should be
+	  either ruby_wrapper or Object.
 
-Wed Jul 20 19:20:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Mar 10 02:18:22 2002  Koji Arai  <jca02266@nifty.ne.jp>
 
-	* io.c (S_ISREG): need to define S_ISREG before it is used first.
+	* enum.c (enum_each_with_index): should return self.
 
-Wed Jul 20 18:40:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* process.c (proc_setpgrp): should return value for non-void function.
 
-	* io.c (wsplit_p): patch for the environment where
-	  fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
-	  set FMODE_WSPLIT without fcntl check. [ruby-dev:26566]
+	* process.c (proc_getpgid): should raise exception if getpgid() return -1.
 
-Wed Jul 20 18:07:11 2005  Tanaka Akira  <akr@m17n.org>
+	* string.c (rb_str_ljust): should return a duplicated string.
 
-	* io.c (rb_io_ctl): update FMODE_WSPLIT_INITIALIZED and FMODE_WSPLIT
-	  by F_SETFL.
+	* string.c (rb_str_rjust): ditto.
 
-Wed Jul 20 10:04:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_center): ditto.
 
-	* variable.c (rb_class_path): need to adjust snprintf() len for
-	  teminating NUL.  [ruby-dev:26581]
+Sat Mar  9 08:45:58 2002  Tanaka Akira  <akr@m17n.org>
 
-Wed Jul 20 04:01:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/socket/extconf.rb (have_struct_member): don't print checked
+	result.
 
-	* ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
-	  so reverted.
+Fri Mar  8 12:19:15 2002  Tanaka Akira  <akr@m17n.org>
 
-	* ext/socket/extconf.rb: should not define HAVE_CLOSESOCKET
-	  on windows.
+	* lib/resolv.rb: use its own thread group for background threads.
 
-Wed Jul 20 03:16:43 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Mar  8 02:21:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/socket/socket.c: should not undef close() on win32.
-	  it's defined to rb_w32_close(), otherwise handle leaks.
-	  [ruby-Bugs-2131]
+	* eval.c (cvar_cbase): utility function to find innermost non
+	  singleton cbase.
 
-Wed Jul 20 00:48:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (is_defined): adopt new cvar behavior.
 
-	* error.c (syserr_initialize): don't use str before StringValue()
-	  check.  [ruby-dev:26579]
+	* eval.c (rb_eval): ditto.
 
-Tue Jul 19 22:47:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (assign): ditto.
+
+Thu Mar  7 20:08:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* error.c (syserr_initialize): add 1 byte for snprintf() size for
-	  NUL at the end.  [ruby-dev:26574]
+	* gc.c (rb_source_filename): added. holds unique strings for file
+	  names with GC space.
 
-Tue Jul 19 16:39:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (rb_gc_mark): mark source file name.
 
-	* io.c (rb_io_inspect): replace sprintf() with "%s" format all
-	  over the place by snprintf() to avoid integer overflow.
+	* gc.c (gc_sweep): ditto.
 
-Tue Jul 19 14:08:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* gc.c (Init_GC): initialize source file name table.
 
-	* ext/tcltklib/tcltklib.c: rbtk_eventloop_depth is used as int.
+	* intern.h (rb_source_filename): added.
 
-	* ext/tcltklib/tcltklib.c: rbtk_pending_exception is tested with
-	  NIL_P, so should assign Qnil instead of 0 (Qfalse).
+	* eval.c (rb_eval_string): use rb_source_filename().
 
-	* ext/tcltklib/tcltklib.c (ip_invoke_real): fixed memory leak when
-	  ip is deleted.
+	* parse.y (yycompile): ditto.
 
-Tue Jul 19 13:19:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ruby.c (proc_options): ditto.
 
-	* ext/tk/lib/tk/variable.rb: For symmetry, add TkVariable#string. It
-	  returns a string even if the default value type of the TkVariable
-	  object is not "string".
+	* ruby.c (load_file): ditto.
 
-Mon Jul 18 21:40:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ruby.c (ruby_script): ditto.
 
-	* eval.c (rb_call0): make the pointer to NODE volatile
-	  instead of NODE itself.
+	* ruby.c (ruby_prog_init): ditto.
 
-Mon Jul 18 14:32:21 2005  Tanaka Akira  <akr@m17n.org>
+Wed Mar  6 17:58:08 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* eval.c (rb_call0): make body volatile to avoid optimization problem.
-	  [ruby-dev:26195]
+	* dln.c (dln_load): use LoadLibrary instead of LoadLibraryEx.
 
-Mon Jul 18 12:23:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Mar  6 16:50:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/io/wait/wait.c: wrong backport from trunk.  fixed: [ruby-dev:26562]
+	* class.c (rb_mod_clone): should not call rb_obj_clone(), since
+	  Module does not provide "allocate".
 
-Mon Jul 18 09:36:25 2005  Tanaka Akira  <akr@m17n.org>
+	* 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.
 
-	* rubyio.h (FMODE_WSPLIT, FMODE_WSPLIT_INITIALIZED): new constant.
+	* time.c (time_s_alloc): now follows allocation framework.
 
-	* io.c (wsplit_p): new function.
-	  (io_fwrite): split writing data by PIPE_BUF if wsplit_p is true in
-	  multi-threaded mode.
-	  [ruby-dev:26540]
+Tue Mar  5 05:56:29 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Jul 17 13:46:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.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.
 
-	* ext/io/wait/extconf.rb, ext/io/wait/wait.c: Win32 platforms support.
+Mon Mar  4 13:19:18 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Jul 15 23:59:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.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.
 
-	* lib/rdoc/parsers/parse_c.rb (handle_class_module): handle a
-	  module enclosed in a built-in module.  fixed: [ruby-talk:148239]
+Mon Mar  4 00:09:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rdoc/parsers/parse_c.rb (find_body): allow macros as methods.
+	* eval.c (rb_eval): should initialize outer class variables from
+	  methods in singleton class definitions.
 
-	* lib/rdoc/parsers/parse_c.rb (find_call_seq): allow :nodoc: modifier
-	  in C.  [ruby-core:04572]
+	* eval.c (assign): ditto.
 
-Fri Jul 15 18:00:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Mar  1 11:29:10 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* bcc32/Makefile.sub (COMMON_HEADERS): ruby_1_8 is using winsock.h.
-	  failed to compile ext/socket on bcc5.6.4. [ruby-dev:26193]
+	* ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): add const
+	  qualifier only for uClibc.
 
-Fri Jul 15 07:58:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Mar  1 11:22:51 2002  Amos Gouaux  <amos+ruby@utdallas.edu>
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
-	  sockets should be non-blocking mode. [ruby-dev:26405]
+	* lib/net/imap.rb: added document.
 
-	* lib/webrick/utils.rb (WEBrick::Utils.set_non_blocking): new method.
+	* lib/net/imap.rb (getquotaroot): new method.
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_chunked):
-	  should call sock.read repeatedly until the preferred size data
-	  is obtained.
+	* lib/net/imap.rb (setacl): remove the rights if the rights
+	  parameter is nil.
 
-Thu Jul 14 18:27:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/net/imap.rb (getacl): return an array of MailboxACLItem.
 
-	* win32/win32.c (rb_w32_strerror): should return correct message
-	  for ENAMETOOLONG and ENOTEMPTY. (bcc32) [ruby-dev:26533]
+Fri Mar  1 06:25:49 2002  Tanaka Akira  <akr@m17n.org>
 
-	* win32/win32.c (rb_w32_strerror): stripped CR LF on the tail.
-	  (bcc32) [ruby-dev:26533]
+	* ext/socket/extconf.rb (have_struct_member): new method.
+	  check msg_control and msg_accrights in struct msghdr.  check
+	  sys/uio.h.
 
-Thu Jul 14 00:45:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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.
 
-	* LEGAL (ext/nkf/nkf-utf8): updated from nkf1.7 to nkf-utf8.
+	* dln.c (dln_load): fix typo.
 
-Wed Jul 13 19:37:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Feb 27 16:30:50 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c (rb_w32_mkdir): should set EEXIST (not EACCES)
-	  if file or directory already exists. (bcc32) [ruby-dev:26508]
+	* eval.c (rb_mod_include): load modules in argument order.
 
-	* win32/win32.c (rb_w32_rmdir): should set ENOTDIR (not EINVAL)
-	  if it is not directory. (bcc32, win32)
+	* st.c (st_init_table_with_size): num_bins should be prime numbers
+	  (no decrement).
 
-	* win32/win32.c (rb_w32_rmdir, rb_w32_unlink): restore
-	  FILE_ATTRIBUTE_READONLY flag on function failure.
+	* st.c (rehash): ditto.
 
-Wed Jul 13 12:40:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Feb 27 13:18:49 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c: TclTkLib.do_one_event doesn't work.
+	* io.c (READ_DATA_PENDING): uClibc support.
 
-	* ext/tk/lib/tk.rb: Tk.thread_update is available.
+	* random.c (rand_init): ditto.
 
-Tue Jul 12 23:32:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): ditto.
 
-	* lib/mkmf.rb: keep curdir unexpanded.
+Wed Feb 27 07:05:17 2002  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Jul 11 08:31:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/digest/sha2/sha2.c: Merge from rough.  Fix a couple of
+	  off-by-one errors in Aaron Gifford's code.
 
-	* regex.c (read_special): fix parsing backslashes following \c in
-	  regexp.  fixed: [ruby-dev:26500]
+	  Obtained from:  KAME via FreeBSD
+	  KAME PR:        393
+	  FreeBSD PR:     kern/34242
 
-Mon Jul 11 02:53:00 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Feb 27 03:36:47 2002  Koji Arai  <jca02266@nifty.ne.jp>
 
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
-	  mistook in merging the patch of [ruby-dev:26235] at
-	  revision 1.4.2.6.
+	* ext/dbm/dbm.c (fdbm_select): 1.7 behavior.
 
-Sun Jul 10 23:58:04 2005  Tanaka Akira  <akr@m17n.org>
+	* ext/gdbm/gdbm.c (fgdbm_select): ditto.
 
-	* lib/pathname.rb (Pathname#unlink): try Dir.unlink first to
-	  avoid unlink a directory by root.
-	  cf. [ruby-dev:26237]
+	* ext/sdbm/sdbm.c (fsdbm_select): ditto.
 
-Sun Jul 11 05:18:17 2005  Michael Neumann  <mneumann@ruby-lang.org>
+	* ext/dbm/dbm.c (fdbm_delete): adopt Hash#delete behavior.
 
-	* lib/xmlrpc/server.rb (XMLRPC::Server): Switch from GServer over to
-	  WEBrick. This makes file lib/xmlrpc/httpserver.rb obsolete (at least it is
-		no further used by the XML-RPC library).
+	* ext/sdbm/sdbm.c (fsdbm_delete): ditto.
 
-Sun Jul 10 12:47:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/gdbm/gdbm.c: need not to dup key to the block.
 
-	* lib/debug.rb (debug_command): added a deficient format specifier.
-	  fixed: [ruby-core:05419]
+	* ext/sdbm/sdbm.c : replace RuntimeError with SDBMError.
 
-Sat Jul  9 21:28:46 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Tue Feb 26 21:34:07 2002  Usaku Nakamura <usa@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
-	  in Ruby and C by INT2NUM and NUM2INT.
+	* bignum.c (rb_big_2comp): void function cannot return any value.
 
-	* ext/win32ole/win32ole.c (ole_invoke2): ditto.
+Tue Feb 26 16:52:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/win32ole/test/testWIN32OLE.rb: ditto.
+	* eval.c (rb_f_missing): NoMethod error messages for true, false,
+	  nil must respond visibility like for other objects.
 
-	* ext/win32ole/test/testOLEMETHOD.rb: ditto.
+Tue Feb 26 15:41:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jul  8 15:45:04 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* eval.c (rb_eval): call trace_func for if/while conditions.
 
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.4 -> 0.1.5.
+	* marshal.c (r_object): separate r_regist from proc calling.
 
-	* test/rss/test_version.rb (RSS::TestVersion#test_version):
-	  ditto.
+Tue Feb 26 11:25:50 2002  akira yamada  <akira@arika.org>
+
+	* lib/uri/generic.rb: merge0 shuld 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.
 
-	* lib/rss/0.9.rb (RSS::Rss::Channel::Item::Category):
-	  domain attribute of <category> is optional. Thanks to
-	  Chris Lee <clee@kde.org>.
+	* io.c (rb_io_printf): ditto.
 
-	* test/rss/test_parser.rb (RSS::TestParser#test_category20):
-	  adjusted test case.
+	* io.c (rb_io_print): ditto.
 
-Tue Jul  5 23:44:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (rb_io_puts): ditto.
 
-	* instruby.rb: expand source library path.
+Wed Feb 20 13:41:35 2002  Usaku Nakamura <usa@ruby-lang.org>
 
-Tue Jul  5 23:27:14 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (rb_io_close): return Qnil.
 
-	* array.c (sort_2): get rid of yet another bcc's bug.
-	  fixed: [ruby-core:05152]
+Wed Feb 20 12:41:59 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_thread_save_context): must not switch contexts during
-	  re-allocating stack.  fixed: [ruby-core:05219]
+	* hash.c (rb_any_cmp): should handle Qundef in keys.
 
-Tue Jul  5 15:15:10 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (remove_method): should not remove a empty method to
+	  implement "undef".
 
-	* ext/tk/tkutil.c: fix typo.
+	* eval.c (rb_eval): should allow singleton class def for
+	  true/false/nil.
 
-Tue Jul  5 14:51:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Feb 19 21:43:32 2002  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/tcltklib/tcltklib.c: bug fix on treating Unicode strings.
+	* lib/net/protocol.rb: rename Protocol.port to default_port.
 
-	* ext/tcltklib/tcltklib.c: add methods to treat encoding mode.
+	* lib/net/smtp.rb: ditto.
 
-	* ext/tcltklib/MANUAL.eng: add description of TclTkLib#encoding,
-	  encoding_system, and so on.
+	* 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: devide 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 nagative
+	  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 chech 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>
 
-	* ext/tcltklib/MANUAL.euc: ditto.
+	* parse.y (yycompile): should inherit "in_single" if eval happened
+	  in a singleton method.
 
-	* ext/tk/tkutil.c: fail to create a Tcl's list string from an
-	  array including multiple kind of encoded strings.
+	* eval.c (rb_eval): class variables from singleton methods defined
+	  within singleton class statement should work like ones defined
+	  by sington def statements.
 
-	* ext/tk/lib/tk.rb: ditto.
+Thu Feb  7 13:44:08 2002  akira yamada  <akira@arika.org>
 
-	* ext/tk/lib/multi-tk.rb: 2nd arg of _{to|from}UTF8 is omissible.
+	* uri/common.rb (URI::join): new method.
 
-	* ext/tk/lib/remote-tk.rb: ditto.
+	* uri/generic.rb (Generic#merge): URI.parse("http://a/")+"b" should
+	  return "http://a/b" but it returned "http://a//b".
 
-	* ext/tk/lib/tk.rb: override TclTkLib#encoding and encoding= to
-	  use TkCore::INTERP.encoding and encoding=.
+	* uri/generic.rb (Generic#check_path): corrected error message, 
+	  @path -> v
 
-	* ext/tk/lib/tk.rb: when "require 'tk'" and $KCODE=='NONE', check
-	  DEFAULT_TK_ENCODING to decide Ruby/Tk's system encoding mode.
+Thu Feb  7 00:18:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/encodedstr.rb: check both of Tk.encoding and
-	  Tk.encoding_system. Tk.encoding has higher priority.
+	* io.c (io_write): flag when buffered write is done.
 
-	* ext/tk/lib/tk/optiondb.rb: ditto.
+	* io.c (fptr_finalize): do not raise error on EBADF if write
+	  buffer is empty.
 
-	* ext/tk/lib/tk/spinbox.rb: ditto.
+Wed Feb  6 17:18:54 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tk/validation.rb: ditto.
+	* configure.in: keep old config.h unless changed.
 
-	* ext/tk/lib/tk/namespace.rb: arguemnts for TclTkIp#_merge_tklist
-	  should be UTF-8 strings.
+Wed Feb  6 13:28:53 2002  Amos Gouaux  <amos+ruby@utdallas.edu>
 
-Mon Jul  4 14:35:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/imap.rb: OpenSSL support.
 
-	* sample/svr.rb: service can be stopped by ill-behaved client; use
-	  tsvr.rb instead.
+	* lib/net/imap.rb (setquota): unset quota if the second argument
+	is nil.
 
-Mon Jul  4 13:25:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Feb  6 13:05:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* missing/erf.c: original erf.c by prof. Okumura is confirmed to
-	  be public domain.  reverted BSD implementation.
+	* io.c (rb_io_readlines): avoid calling GetOpenFile() repeatedly.
 
-Mon Jul  4 11:15:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* io.c (rb_io_each_line): ditto.
 
-	* test/{dbm,gdbm,sdbm}/test_{dbm,gdbm,sdbm}.rb: skip some tests
-	  which using fork on fork-less platforms.
+	* io.c (argf_getline): ditto.
 
-Sun Jul  3 23:26:30 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* process.c: should include <time.h> to get proper CLK_TCK.
 
-	* test/wsdl/document/test_rpc.rb: compare formatted time string of
-	  Time objects instead of comparing Time objects itself to avoid
-	  unintended conflict of usec part.  [ruby-dev:26220]
+Wed Feb  6 02:10:30 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Sat Jul  2 22:41:04 2005  Tanaka Akira  <akr@m17n.org>
+	* io.c (fptr_finalize): ignore EBADF when f and f2 use same
+	  descriptor.
 
-	* ext/socket/socket.c (unix_send_io, unix_recv_io): support x86-64 and
-	  IA64.
+Tue Feb  5 16:17:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jul  2 17:06:23 2005  Tanaka Akira  <akr@m17n.org>
+	* io.c (fptr_finalize): should raise error when fclose fails.
 
-	* defines.h (FLUSH_REGISTER_WINDOWS): defined for IA64.
-	  (flush_register_windows): declare flush_register_windows.
+	* eval.c (method_inspect): proper output format to distinguish
+	  methods and singleton methods.
 
-	* eval.c (flush_register_windows): new function.
+Mon Feb  4 22:44:58 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Fri Jul  1 17:48:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (rb_file_s_expand_path): should terminate.
 
-	* bignum.c (get2comp): revert all prior changes, and calculate
-	  proper 2's complement for negative numbers.  backported from
-	  HEAD.
+Mon Feb  4 15:38:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jul  1 15:50:12 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* object.c (rb_class_real): should not follow ICLASS link
 
-	* missing/erf.c: need to include some headers for some platforms.
+	* variable.c (classname): should follow ICLASS link explicitly.
 
-	* win32/win32.h (copysign, scalb): define for compatibility with
-	  other platforms. [ruby-dev:26430]
+	* eval.c (rb_call): ditto.
 
-Fri Jul  1 15:37:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Feb  1 19:10:04 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* missing/crypt.c: modified to make it compilable on platforms
-	  other than BSD.  [ruby-dev:26430]
+	* intern.h: prototypes for new functions; rb_cstr_to_inum(),
+	  rb_str_to_inum(), rb_cstr_to_dbl(), rb_str_to_dbl()
 
-	* missing/erf.c: ditto.  code from <exp.c> merged.
+	* bignum.c (rb_cstr_to_inum): changed from rb_cstr2inum(), and
+	  added argument badcheck to be consistent with parser. [new]
 
-Fri Jul  1 12:44:56 2005  Tanaka Akira  <akr@m17n.org>
+	* bignum.c (rb_str_to_inum): ditto.
 
-	* lib/open-uri.rb (OpenURI.open_http): refine post_connection_check
-	  call.
+	* bignum.c (rb_cstr2inum): wapper of rb_cstr_to_inum() now.
 
-Fri Jul  1 11:34:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (rb_str2inum): ditto.
 
-	* missing/crypt.c: replaced with 4.4BSD version.
+	* object.c (rb_cstr_to_dbl): float number parser. [new]
 
-	* missing/erf.c: ditto.
+	* object.c (rb_str_to_dbl): ditto.
 
-	* missing/vsnprintf.c: removed the third provision from the old
-	  BSD license.  [ruby-core:05177]
+	* object.c (rb_Float): use rb_cstr_to_dbl() for strict check.
 
-Fri Jul  1 01:45:21 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (rb_Integer): use rb_str_to_inum() for strict check.
 
-	* enum.c (enum_min, enum_max): must not return Qundef.
-	  fixed: [ruby-core:05299]
+	* string.c (rb_str_to_f): use rb_str_to_dbl() with less check.
 
-Fri Jul  1 00:18:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_to_i): use rb_str_to_inum() with less check.
 
-	* lib/delegate.rb (Delegator::respond_to): respond_to? must check
-	  destination object.  [ruby-talk:146894]
+	* string.c (rb_str_hex): ditto.
 
-Thu Jun 30 19:00:21 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-	* lib/irb/ruby-lex.rb (RubyLex::identify_number): alternative implements
-	  for [ruby-dev:26410]. And support a numeric form of 0d99999.
+	* string.c (rb_str_oct): ditto.
 
-Thu Jun 30 17:28:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* sprintf.c (rb_f_sprintf): ditto.
 
-	* lib/irb/ruby-lex.rb (RubyLex::identify_number): should not treat
-	  plain zero as an octal number.  [ruby-dev:26410]
+	* time.c (obj2long): ditto.
 
-Thu Jun 30 15:13:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (yylex): use rb_cstr_to_inum() for strict check.
 
-	* eval.c (rb_eval): pre-evaluate argument for unambiguous
-	  evaluation order.  [ruby-dev:26383]
+Fri Feb  1 17:46:39 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Thu Jun 30 09:53:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (mbc_startpos): become macro.
 
-	* lib/delegate.rb (Delegator::method_missing): forward unknown
-	  method to the destination.  suggested by
-	  <christophe.poucet@gmail.com>.  [ruby-talk:146776]
+	* regex.c (euc_startpos): added for improvement.
 
-Tue Jun 28 21:59:29 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* regex.c (sjis_startpos): ditto.
 
-	* dir.c, eval.c, hash.c, process.c, ruby.c: avoid warning "unused
-	  variable" [ruby-dev:26387]
+	* regex.c (utf8_startpos): ditto.
 
-Sat Jun 25 17:15:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Feb  1 00:03:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
-	  discard if key=val pair is empty. patch from Gary Wright.
+	* file.c (rb_stat_inspect): print dev, rdev in hexadecimal.
 
-Sat Jun 25 23:30:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jan 31 20:45:33 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* process.c (detach_process_watcher): terminate process watcher
-	  thread right after rb_waitpid() succeed.  [ruby-talk:146430]
+	* lib/mkmf.rb (dir_config): prior --with flag.
 
-Sat Jun 25 15:49:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/mkmf.rb (arg_config): avoid special variables for
+	  font-lock-mode.
 
-	* enum.c (enum_min, enum_max): do not ignore nil as the first element.
+Thu Jan 31 13:22:36 2002  Tanaka Akira  <akr@m17n.org>
 
-Sat Jun 25 14:40:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/pp.rb (File::Stat#pretty_print): print rdev_major and rdev_minor.
 
-	* ext/sdbm/init.c (fsdbm_select): SDBM#select had returned the array
-	  which contained each elements twice. [ruby-dev:26358]
+Wed Jan 30 15:58:04 2002  K.Kosako  <kosako@sofnec.co.jp>
 
-Fri Jun 25 05:06:47 2005  Michael Neumann  <mneumann@ruby-lang.org>
+	* regex.c (re_adjust_startpos): fix for SJIS and UTF-8. 
 
-	* lib/xmlrpc/*, test/xmlrpc/*: backported changes from HEAD into 1.8
+	* regex.c (mbc_startpos): ditto.
 
-Fri Jun 24 17:00:00 2005  Shigeo Kobayashi  <shigeo@tinyforest.jp>
+Wed Jan 30 13:37:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/bigdecimal/bigdecimal.c: patch from "NATORI Shin"
-	  (u-tokyo.ac.jp) applied to fix rounding bug.
+	* re.c (rb_reg_search): should set regs.allocated.
 
-Fri Jun 24 13:06:45 2005  akira yamada  <akira@ruby-lang.org>
+Wed Jan 30 02:25:38 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/uri/common.rb, lib/uri/generic.rb: fixed typo in documents and
-	  replaced some existent domain name with "example.com".
+	* regex.c (re_adjust_startpos): search start of multibyte
+	  backward.
 
-Fri Jun 24 12:23:19 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* regex.c (mbc_startpos): ditto.
 
-	* ext/tk/lib/tk.rb: fix typo on Tk.grid_propagate.
+Tue Jan 29 17:59:20 2002  Tanaka Akira  <akr@m17n.org>
 
-	* ext/tk/lib/tk.rb: Tk.event_generate and TkWindow#event_generate
-	  accept TkEvent::Event object as context argument.
+	* file.c: `major' and `minor' macro needs sys/mkdev.h on SunOS 5.x.
 
-	* ext/tk/lib/tk/event.rb: add TkEvent::Event#valid_fields and
-	  valid_for_generate to get field parameters of event_generate.
+	* configure.in: add check for `sys/mkdev.h'.
 
-Thu Jun 23 23:55:59 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/pp.rb: don't print a mode File::Stat as decimal number.
 
-	* runruby.rb: should load built rbconfig.rb.
+Mon Jan 28 19:16:58 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Thu Jun 23 16:53:15 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* array.c (rb_ary_fill): shouldn't yield unless block given.
 
-	* ext/tk/lib/tk/canvastag.rb: TkcGroup.new cannot include given items.
-	  TkcGroup#exclude calls wrong method.
-	  Add alias TkcGroup#add [ruby-talk:146049].
+Mon Jan 28 18:33:18 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tk/canvas.rb: TkCanvas#dtag and some subcommands of
-	  TkCanvas#addtag fail to treat a TkcTag argument.
+	* parse.y (yylex): strict check for numbers.
 
-	* ext/tk/lib/tk/event.rb: add TkEvent::Event#generate to help to send
-	  current event to other widgets.
+Mon Jan 28 18:01:01 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jun 20 18:44:04 2005  Tanaka Akira  <akr@m17n.org>
+	* file.c (rb_stat_rdev_major): added. [new]
 
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): DUMMY_SETJMP is replaced
-	  because setjmp is not enough to fix getcontext and SPARC register
-	  window problem.
+	* file.c (rb_stat_rdev_minor): added. [new]
 
-Mon Jun 20 16:48:36 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* file.c (rb_stat_inspect): print mode in octal.
 
-	* ext/dbm/dbm.c (fdbm_closed): new method DBM#closed?
+Mon Jan 28 13:29:41 2002  K.Kosako  <kosako@sofnec.co.jp>
 
-	* ext/gdbm/gdbm.c (fgdbm_closed): new method GDBM#closed?
+	* eval.c (is_defined): defined?(Foo::Baz) should check constants
+	  only, no methods.
 
-	* ext/sdbm/init.c (fsdbm_closed): new method SDBM#closed?
+	* eval.c (is_defined): should not dump core on defined?(a::b)
+	  where a is not a class nor a module.
 
-	* test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb
-	  (teardown): close all db objects before deleting data files.
+Mon Jan 28 02:50:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.{ch} (unlink): hook runtime function to change
-	  file attribute before unlinking.
-	  fixed: [ruby-dev:26360]
+	* object.c (Init_Object): remove dup and clone from TrueClass,
+	  FalseClass, and NilClass.
 
-Mon Jun 20 02:15:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_fill): Array#fill takes block to get the value to
+	  fill.
 
-	* gc.c (define_final): document fix: finalizers never get called
-	  before target object is destroyed.
+Sat Jan 26 20:05:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jun 20 01:26:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* string.c (rb_str_to_i): to_i(0) auto-detects base radix.
 
-	* ext/openssl/openssl_missing.c, ext/openssl/ossl.h,
-	  ext/openssl/ossl_asn1.c, ext/openssl/ossl_bio.c,
-	  ext/openssl/ossl_pkcs12.h, ext/openssl/ossl_x509req.c: avoid
-	  compiler warnings. suggested by Michal Rokos.
+	* array.c (rb_ary_initialize): fill by the block evaluation value
+	  if block is given.
 
-Sun Jun 19 14:09:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jan 25 17:48:43 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* gc.c (run_final): reduce unnecessary object allocation during
+	* 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 clar method cache for NODE_CLASS,
+	  NODE_SCLASS.
+
+	* gc.c (obj_free): need not to clear method cache on class/module
 	  finalization.
 
-	* gc.c (rb_gc_call_finalizer_at_exit): deferred finalizers list should
-	  be cleared before calling them.  fixed: [ruby-talk:145790]
+Fri Jan 18 23:38:03 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jun 17 13:01:40 2005  Tanaka Akira  <akr@m17n.org>
+	* array.c (rb_ary_fetch): index out of range raises exception
+	  unless optional second argument is specified.
 
-	* lib/time.rb (Time.parse): fix previous leap seconds support.
-	  (Time.rfc2822): ditto.
-	  (Time.xmlschema): ditto.
+Fri Jan 18 17:32:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jun 16 15:06:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* io.c (rb_io_s_new): block check moved from initialize to this
+	  method.
 
-	* ext/tcltklib/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
-	  was missing.
+	* io.c (rb_io_s_open): open should call initialize too. IO#for_fd
+	  also calls initialize. [new]
 
-Thu Jun 16 13:34:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Jan 18 10:26:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: add Tk.getMultiple{Open|Save}File() which return
-	  an Array of selected files.
+	* error.c (rb_sys_fail): replace INT2FIX() by INT2NUM() since
+	  errno value may not fit in Fixnum size on Hurd.
 
-Thu Jun 16 12:53:24 2005  Tanaka Akira  <akr@m17n.org>
+	* error.c (set_syserr): ditto.
 
-	* lib/time.rb (Time.parse): "Fri Jan  1 08:59:60 +0900 1999" was
-	  parsed as "Fri Jan 01 09:00:00 JST 1999" even on an environment
-	  which supports leap seconds.
-	  (Time.rfc2822): ditto.
-	  (Time.xmlschema): ditto.
+Fri Jan 18 10:12:00 2002  Usaku Nakamura <usa@ruby-lang.org>
 
-Thu Jun 16 08:29:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/socket/socket.c (tcp_svr_s_open): fix typo.
 
-	* ext/dl/sym.c (rb_dlsym_call): needs FREE_ARGS before return.
-	  fixed memory leak. [ruby-Bugs-2034]
+Fri Jan 18 02:27:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Jun 15 18:26:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* dir.c (dir_s_glob): returns nil if block given.
 
-	* ext/tk/lib/tk.rb: support "tk inactive" sub-command [for Tcl/Tk8.5a3]
+	* io.c (rb_io_each_byte): should return self.
 
-	* ext/tk/lib/tk/namespace.rb: support "namespace path" sub-command and
-	  'namespace ensemble' sub-command [for Tcl/Tk8.5a3]
+	* io.c (rb_io_close_m): close check added.
 
-Tue Jun 14 02:02:43 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* dir.c (dir_seek): should return pos.
 
-	* ext/tk/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...) &
-	  _define_attribute_aliases(hash) to get substitution-argument from
-	  attributes (e.g. subst_arg(:x,:y,:num,:button) --> "%x %y %b %b ").
+Fri Jan 18 01:21:53 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/event.rb: use _define_attribute_aliases().
+	* parse.y (fixpos): orig may be (NODE*)1, which should not be
+	  dereferenced.
 
-Mon Jun 13 13:01:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jan 17 16:21:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
+	* eval.c (block_pass): allow "retry" from within argument passed
+	  block. [new]
 
-Mon Jun 13 01:54:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (localjump_error): should preserve exit status in the
+	  exception object. [new]
 
-	* signal.c (sigexit): call rb_thread_signal_exit() instead of
-	  rb_exit().  [ruby-dev:26347]
+	* eval.c (proc_invoke): should raise exception for "break" if it's
+	  yielding, not calling. [new]
 
-	* eval.c (rb_thread_signal_exit): a new function to exit on main
-	  thread.
+	* eval.c (block_pass): should NOT raise exception for "break". [new]
 
-	* eval.c (rb_thread_switch): exit status should be retrieved from
-	  ruby_errinfo.
+	* eval.c (block_pass): should allow block argument relay even in
+	  the tainted mode.
 
-	* eval.c (rb_f_exit): ensure exit(0) should call
-	  exit(EXIT_SUCCESS).
+Thu Jan 17 04:51:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jun 13 01:20:02 2005  Tanaka Akira  <akr@m17n.org>
+	* ext/socket/socket.c: support subclassing by proper "initialize"
+	  calling convention. [new]
 
-	* eval.c (rb_gc_mark_threads): curr_thread may not be part of the
-	  thread list.  [ruby-dev:26312]
+Wed Jan 16 18:25:08 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jun 10 23:35:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* st.c: primes should be primes.
 
-	* missing/mkdir.c: remove. [ruby-core:05177]
+Wed Jan 16 12:29:14 2002  Tanaka Akira  <akr@m17n.org>
 
-Fri Jun 10 22:54:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/timeout.rb (timeout): new optional argument to specify an
+	  exception class.
 
-	* missing.h: fd_set stuffs need sys/types.h.  fixed: [ruby-core:05179]
+	* lib/resolv.rb: use Resolv::ResolvTimeout for internal timeout to
+	  avoid problem with timeout of application.
 
-Thu Jun  9 23:58:12 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 16 11:12:30 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/Win32API/Win32API.c (Win32API_Call): disable global
-	  optimization. fixed: [ruby-core:05143]
+	* object.c (rb_Float): remove underscores between digits.
 
-Thu Jun  9 23:35:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_cstr2inum): reject prefix followed by spaces only.
 
-	* enum.c (enum_inject): default the result value to Qundef to use
-	  first element as initial value if not given.
+	* class.c (rb_class_inherited): should use Object when no super
+	  class.
 
-Thu Jun  9 19:55:41 2005  Tanaka Akira  <akr@m17n.org>
+Tue Jan 15 01:11:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (ruby_longjmp): new macro to call longjmp, setcontext, etc.
-	  (ruby_setjmp): new macro to call setjmp, getcontext, etc.
-	  (ruby_setjmp): call setjmp before getcontext to avoid IA64 register
-	  stack problem.
-	  [ruby-talk:144939]
+	* eval.c (is_defined): method defined? check should honor
+	  protected too.
 
-	* gc.c (Init_stack): remove IA64_MAGIC_STACK_LIMIT.
+Mon Jan 14 13:06:02 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jun  9 11:55:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (block_pass): should not pass tainted block, if $SAFE > 0.
 
-	* lib/delegate.rb (SimpleDelegator::__setobj__): need check for
-	  recursive delegation.  [ruby-core:04940]
+Sun Jan 13 09:31:41 2002  Koji Arai  <jca02266@nifty.ne.jp>
 
-Wed Jun  8 18:47:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* variable.c (rb_mod_remove_cvar): should pass the char*.
 
-	* misc/ruby-mode.el (ruby-expr-beg): fix looking point drift.
+Fri Jan 11 05:06:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Wed Jun  8 11:11:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* class.c (rb_make_metaclass): [new]
 
-	* bignum.c (get2comp): calculate proper 2's complement for
-	  negative numbers.  a bug in normalizing negative numbers
-	  reported from Honda Hiroki <hhonda@ipflex.com>.
+	* class.c (rb_define_class_id): use rb_make_metaclass(), don't
+	  call Class#inherited hook.
 
-Wed Jun  8 08:33:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* class.c (rb_class_inherited): [new]
 
-	* enum.c (enum_min_by, enum_max_by): return nil if no iteration.
-	  fixed: [ruby-dev:26245]
+	* class.c (rb_define_class): call Class#inherited hook here.
 
-	* eval.c (rb_need_block): ensure a block is given.
+	* class.c (rb_define_class_under): ditto after class path is set.
 
-	* eval.c (backtrace): skip successive frames sharing same node.
+	* class.c (rb_singleton_class): use rb_make_metaclass().
 
-Wed Jun  8 00:15:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_eval): same as rb_define_class_under().
 
-	* ext/socket/socket.c (ruby_getaddrinfo__aix): merged a patch from
-	  KUBO Takehiro <kubo at jiubao.org> to support AIX.  [ruby-list:40832]
+	* intern.h: prototypes of rb_make_metaclass() and
+	  rb_class_inherited().
 
-Wed Jun  8 00:09:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* object.c (rb_class_s_new): use rb_make_metaclass() and
+	  rb_class_inherited().
 
-	* lib/yaml/rubytypes.rb (Array::to_yaml): merged a patch from
-	  Tilman Sauerbeck <tilman at code-monkey.de>.  [ruby-core:05055]
+	* object.c (Init_Object): use rb_make_metaclass().
 
-	* lib/yaml/rubytypes.rb (Hash::to_yaml): ditto.
+	* struct.c (make_struct): use rb_class_inherited().
 
-Wed Jun  8 00:00:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jan 10 19:15:15 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/curses/curses.c (curses_insertln): merged a patch from
-	  TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>.  [ruby-ext:02305]
+	* eval.c (rb_add_method): should clear cache by id always.
 
-Tue Jun  7 19:34:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_disable_super): no longer need to clear cache before
+	  rb_add_method().
 
-	* lib/irb/init.rb (IRB::IRB.rc_file_generators): more flexible
-	  IRB.rc_file_generators.  [ruby-core:05163]
+	* eval.c (rb_export_method): ditto.
 
-Tue Jun  7 18:39:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_attr): ditto.
 
-	* lib/thread.rb: RDoc documentation from Eric Hodel
-	  <drbrain at segment7.net> added.  [ruby-core:05148]
+	* eval.c (rb_undef): ditto.
 
-Tue Jun  7 18:30:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): ditto.
 
-	* lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file.
-	  fixed: [ruby-dev:26294]
+	* eval.c (rb_mod_modfunc): ditto.
 
-Tue Jun  7 17:39:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_mod_define_method): ditto.
 
-	* object.c (rb_mod_cvar_get): Module#class_variable_get(): back
-	  ported from CVS HEAD.  [ruby-talk:144741]
+Thu Jan 10 11:42:47 2002  Usaku Nakamura <usa@ruby-lang.org>
 
-	* object.c (rb_mod_cvar_set): Module#class_variable_set().
-	  [ruby-talk:144741]
+	* win32/resource.rb: Modify copyright in resource script.
 
-Tue Jun  7 16:32:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jan 10 07:15:44 2002  takuma ozawa  <metal@mine.ne.jp>
 
-	* sprintf.c (rb_f_sprintf): raise exception on debug mode (-d),
-	  not verbose mode (-v/-w).  [ruby-core:05123]
+	* re.c (match_select): should propagate taintness.
 
-Tue Jun  7 10:30:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Jan 10 00:54:57 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures
-	  delegated by master-ip.
+	* hash.c (rb_hash_set_default): Hash#default= should return the
+	  new value.
 
-Sun Jun  5 23:00:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Jan  9 20:21:09 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tk/console.rb: create console when required
+	* misc/ruby-mode.el (ruby-calculate-indent): indentation after
+	  comment at beginning of buffer failed.
 
-	* ext/tk/sample/tkextlib/tile/demo.rb: fix TypeError & create Console
+	* misc/ruby-mode.el (font-lock-defaults): unless XEmacs, set
+	  font-lock variables in ruby-mode-hook.
 
-Sat Jun  4 14:55:18 2005  Tanaka Akira  <akr@m17n.org>
+Tue Jan  8 15:56:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/dbm/test_dbm.rb: merged from ext/dbm/testdbm.rb.
+	* string.c (rb_str_to_i): accepts optional base argument. [new]
 
-	* test/gdbm/test_gdbm.rb: merged from ext/gdbm/testgdbm.rb.
+	* numeric.c (rb_fix2str): should not handle negative fixnum values
+	  int32 via calling sprintf() directly.
 
-	* test/sdbm/test_sdbm.rb: renamed from ext/sdbm/testsdbm.rb with
-	  modification to use test/unit.
+Tue Jan  8 15:54:02 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Fri Jun  3 14:06:12 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_add_method): clear replaced method from the cache.
 
-	* ext/tk/lib/multi-tk.rb: fix typo.
+Mon Jan  7 12:38:47 2002  Tanaka Akira  <akr@m17n.org>
 
-Wed Jun  1 11:32:42 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/time.rb (Time#xmlschema): new optional argument
+	fractional_seconds to specify a number of digits of
+	fractional part of the time.
 
-	* bcc32/Makefile.sub: can use single quote character in DESTDIR.
-	  [ruby-dev:26205]
+Sat Jan  5 13:18:11 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Mon May 30 23:48:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* range.c (range_member): beginning check was
+	  wrong. [ruby-talk:30252]
 
-	* ext/tk/lib/tk/macpkg.rb: add PACKAGE_NAME information of Tcl/Tk
-	  Extension.
+Sat Jan  5 03:07:34 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/msgcat.rb: ditto.
+	* string.c (rb_str_new2): NULL pointer check added.
 
-	* ext/tk/lib/tk/winpkg.rb: ditto.
+Sat Jan  5 00:19:12 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tkextlib/*: ditto.
+	* parse.y (yycompile): strdup()'ed twice.
 
-Sat May 28 16:40:15 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Jan  4 18:29:10 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
 
-	* test/openssl/test_x509store.rb: add test for expired CRL
-	  and refine some assertions.
+	* class.c (rb_define_module_under): should locate predefined
+	  module using rb_const_defined_at().
 
-Sat May 28 05:15:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Jan  4 17:23:49 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
-	  not set internal flag directry.
+	* misc/ruby-mode.el (ruby-forward-string): forward a string. [new]
 
-Sat May 28 02:00:11 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* misc/ruby-mode.el (ruby-parse-region): handle nested parentheses
+	  in a string and terminators in #{}.
 
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
-	  ENV["REQUEST_URI"] is better to get correct Request-URI
-	  than ENV["SCRIPT_NAME"] + ENV["PATH_INFO"].  [ruby-dev:26235]
+	* misc/ruby-mode.el (ruby-calculate-indent): ditto.
 
-Fri May 27 16:32:04 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Jan  2 23:34:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/mkmf.rb: use the semicolon as the path separator
-	  in the environment of MSYS.  fixed: [ruby-dev:26232]
+	* lib/mkmf.rb (create_makefile): add -I. to CPPFLAGS.
 
-Thu May 26 06:08:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/mkmf.rb (create_makefile): srcdir support(.def and depend file).
 
-	* ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
+Wed Jan  2 11:51:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed May 25 22:52:42 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* process.c (rb_f_system): abandon vfork.
 
-	* lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
-	  (backported from HEAD)
+	* io.c (pipe_open): ditto.
 
-Wed May 25 21:55:40 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Jan  1 02:16:48 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/readline/readline.c: supported libedit. (backported from HEAD)
+	* ext/curses/extconf.rb: add dir_config.
 
-	* ext/readline/extconf.rb: ditto.
+	* Makefile.in (fake.rb): set RUBY_VERSION.
 
-	* test/readline/test_readline.rb: ditto.
+Mon Dec 31 14:20:46 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Wed May 25 20:06:27 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* parse.y (yycompile): always store copy of filename.
 
-	* ext/tk/lib/tk.rb: TkComm#tk_split_*list fail to split a kind of SJIS
-	  strings. To avoid the trouble, add arguments to control converting
-	  encoding, and do split on a UTF8 string.
+	* parse.y (rb_compile_file): no longer need to strdup() here.
 
-	* ext/tk/lib/multi-tk.rb: modify to attend encoding.
+Mon Dec 31 05:26:40 2001  Ferris McCormick  <fmccor@inforead.com>
 
-	* ext/tk/lib/remote-tk.rb: ditto.
+	* defines.h: sparc linux needs different FLUSH_REGISTER_WINDOWS
 
-	* ext/tk/lib/tk/itemconfig.rb: ditto.
+Mon Dec 31 04:27:28 2001  Minero Aoki  <aamine@mx.edit.ne.jp>
 
-	* ext/tk/lib/tk/listbox.rb: ditto.
+	* lib/net/protocol.rb: Protocol#start returns the return value of
+	  block.
 
-	* ext/tk/lib/tk/namespace.rb: ditto.
+	* lib/net/protocol.rb: set timeout limit by default.
 
-	* ext/tk/lib/tk/panedwindow.rb: ditto.
+	* lib/net/protocol.rb: new methods WriteAdapter#write, puts,
+	  print, printf.
 
-	* ext/tk/lib/tk/text.rb: ditto.
+	* lib/net/http.rb: rename HTTP#get2 to request_get, post2 to
+	  request_post ...
 
-	* ext/tk/lib/tk/textmark.rb: ditto.
+	* lib/net/smtp.rb: should not resolve HELO domain automatically.
 
-	* ext/tk/lib/tk/texttag.rb: ditto.
+Sun Dec 30 00:59:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/lib/tk/variable.rb: ditto.
+	* ext/extmk.rb.in, lib/mkmf.rb (have_library): accept -lm
+	  unconditionally on mswin32/mingw32.
 
-	* ext/tk/lib/tk/winfo.rb: ditto.
+Sat Dec 29 01:55:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
+	* regex.c (re_search): abandon stclass optimization.
 
-	* ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
+Fri Dec 28 14:39:05 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tk.rb: add TkWindow#lower_window/raise_window and
-	  Tk#lower_window/raise_window by reason of method-name conflict
+	* array.c (rb_cmpint): fixed typo.
 
-	* ext/tk/lib/tk/canvas.rb: bug fix on TkCanvas#delete when given
-	  non-TkcItem arguments.
+Thu Dec 27 18:43:04 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto.
+	* bignum.c (rb_cstr2inum): deny "0_".
 
-Wed May 25 12:59:48 2005  Tanaka Akira  <akr@m17n.org>
+Thu Dec 27 01:54:02 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/open-uri.rb (OpenURI::Meta::RE_QUOTED_STRING): a content of
-	  quoted-string should be zero or more characters.
+	* bignum.c (rb_cstr2inum): allow "0\n" and so on.
 
-Tue May 24 23:42:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Dec 26 19:24:21 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* numeric.c (fix_pow): support Fixnum ** Float case directly
-	  without coercing.  [ruby-talk:142697] [ruby-talk:143054]
+	* error.c (rb_invalid_str): utility function to show inspect()'ed
+	  string.
 
-Tue May 24 16:57:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (rb_cstr2inum): prints invalid strings in inspect()'ed
+	  format.
 
-	* ruby.c (require_libraries): caused SEGV when continuation jumped
-	  in to the required library code.
+	* object.c (rb_Float): ditto.
 
-Tue May 24 11:56:25 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Dec 26 02:41:29 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/getopts.rb: should warn only if verbose mode.
-	  fixed: [ruby-dev:26201]
+	* object.c (rb_convert_type): no longer use rb_rescue().
 
-Tue May 24 06:45:31 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 25 18:32:16 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): string
-	  literals to be matched non-greedy.
+	* re.c (rb_reg_search): initialize taint status of match object.
 
-Tue May 24 00:34:32 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Dec 25 02:37:49 2001  Tanaka Akira  <akr@m17n.org>
 
-	* test/soap/calc: method name 'set' was able to crash with a class Set.
-	  [ruby-dev:26210]
+	* lib/pp.rb, lib/prettyprint.rb: new files.
 
-	* test/wsdl/document/test_rpc.rb: dateTime comparison failed under
-	  TZ=right/Asia/Tokyo (with leap second.) [ruby-dev:26208]
+Tue Dec 25 02:11:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon May 23 16:24:05 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* object.c (rb_convert_type): check method responce check before
+	  invoking rb_rescue().
 
-	* ext/tcltklib/extconf.rb: Framework support on MacOS X Tiger.
+	* object.c (rb_check_convert_type): ditto.
 
-	* ext/tcltklib/README.1st: add description of Framework support options.
+Mon Dec 24 02:37:40 2001  Le Wang  <lewang@bigfoot.com>
 
-Mon May 23 12:21:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords):
+	  fix font-lock problem [ruby-talk:29296].
 
-	* re.c (make_regexp): should not return junk address during
-	  compile time.  [ruby-dev:26206]
+Sat Dec 22 22:52:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun May 22 21:54:06 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* time.c (time_timeval): wrong cast to time_t.
 
-	* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.
+	* time.c (time_plus): ditto.
 
-	  == SOAP client and server ==
+Fri Dec 21 20:33:34 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	  === for both client side and server side ===
+	* parse.y (str_extend): make up "#$;" handling.
 
-	  * improved document/literal service support.
-	    style(rpc,document)/use(encoding, literal) combination are all
-	    supported.  for the detail about combination, see
-	    test/soap/test_style.rb.
+Fri Dec 21 16:18:17 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	  * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to
-	    WSDL as well as obj2soap.  closes #70.
+	* dln.h, ruby.h, util.h: enable prototypes in C++.
 
-	  * let SOAP::Mapping::Object handle XML attribute for doc/lit service.
-	    you can set/get XML attribute via accessor methods which as a name
-	    'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name).
+Fri Dec 21 15:12:41 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	  === client side ===
+	* time.c (time_plus): result should not be negative unless
+	  NEGATIVE_TIME_T is defined.
 
-	  * WSDLDriver capitalized name operation bug fixed.  from
-	    1.5.3-ruby1.8.2, operation which has capitalized name (such as
-	    KeywordSearchRequest in AWS) is defined as a method having
-	    uncapitalized name. (converted with GenSupport.safemethodname
-	    to handle operation name 'foo-bar').  it introduced serious
-	    incompatibility; in the past, it was defined as a capitalized.
-	    define capitalized method as well under that circumstance.
+	* time.c (time_new_internal): should check tv_sec overflow too.
 
-	  * added new factory interface 'WSDLDriverFactory#create_rpc_driver'
-	    to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver
-	    are merged).  'WSDLDriverFactory#create_driver' still creates
-	    WSDLDriver for compatibility but it warns that the method is
-	    deprecated.  please use create_rpc_driver instead of create_driver.
+	* time.c (time_timeval): should check time_t range when time is
+	  initialized from float.
 
-	  * allow to use an URI object as an endpoint_url even with net/http,
-	    not http-access2.
+	* time.c (time_plus): uses modf(3).
 
-	  === server side ===
+Fri Dec 21 03:15:52 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	  * added mod_ruby support to SOAP::CGIStub.  rename a CGI script
-	    server.cgi to server.rb and let mod_ruby's RubyHandler handles the
-	    script.  CGIStub detects if it's running under mod_ruby environment
-	    or not.
+	* eval.c (rb_mod_define_method): must not convert Method to Proc.
 
-	  * added fcgi support to SOAP::CGIStub.  see the sample at
-	    sample/soap/calc/server.fcgi.  (almost same as server.cgi but has
-	    fcgi handler at the bottom.)
+Fri Dec 21 01:17:57 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	  * allow to return a SOAPFault object to respond customized SOAP fault.
+	* lib/mkmf.rb (with_destdir): new.
 
-	  * added the interface 'generate_explicit_type' for server side
-	    (CGIStub, HTTPServer).  call 'self.generate_explicit_type = true'
-	    if you want to return simplified XML even if it's rpc/encoded
-	    service.
+	* lib/mkmf.rb: prefix target directories with $(DESTDIR) all.
 
-	  == WSDL ==
+	* lib/mkmf.rb: no need to mkdir $(libdir)
 
-	  === WSDL definition ===
+Thu Dec 20 14:08:20 2001  Minero Aoki  <aamine@loveruby.net>
 
-	  * improved XML Schema support such as extension, restriction,
-	    simpleType, complexType + simpleContent, ref, length, import,
-	    include.
+	* lib/net/protocol.rb: rename Net::Socket to Net::BufferedSocket
 
-	  * reduced "unknown element/attribute" warnings (warn only 1 time for
-	    each QName).
+Thu Dec 20 13:51:52 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	  * importing XSD file at schemaLocation with xsd:import.
+	* variable.c (rb_cvar_set): add frozen class/module check.
 
-	  === code generation from WSDL ===
+	* variable.c (rb_cvar_declare): add frozen class/module check.
 
-	  * generator crashed when there's '-' in defined element/attribute
-	    name.
+Thu Dec 20 01:01:50 2001  takuma ozawa  <metal@mine.ne.jp>
 
-	  * added ApacheMap WSDL definition.
+	* re.c (match_to_a): should propagate taint.
 
-	* sample/{soap,wsdl}: removed.
+	* re.c (rb_reg_s_quote): ditto.
 
-Sun May 22 19:11:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Dec 19 16:58:29 2001  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#intialize):
-	  should initialize session id context. [ruby-core:4663]
+	* 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=.
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): add session id support.
+Wed Dec 19 14:05:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat May 21 10:24:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (rb_mod_define_method): define_method should follow
+	  default method visibility.
 
-	* bcc32/Makefile.sub: tds files were not deleted when DESTDIR
-	  included '\' path delimiter. [ruby-dev:26193]
+	* eval.c (rb_attr): should warn if the default method visibility
+	  is "module_function" (can be error). 
 
-Thu May 19 19:04:29 2005  speakillof  <speakillof@yahoo.co.jp>
+	* eval.c (rb_mod_define_method): should define class/module method
+	  also if the visibility is "module_function".
 
-	* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
-	  swapped. [ruby-core:4772]
+	* eval.c (rb_mod_define_method): should call hook method
+	  "method_added", and "singleton_method_added".
 
-Wed May 18 23:42:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Dec 19 11:42:13 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* error.c (exc_exception): reverted to call Exception#initialize
-	  directly.  fixed: [ruby-dev:26177]
+	* string.c: use RESIZE_CAPA for capacity change.
 
-Wed May 18 23:39:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Dec 19 03:08:40 2001  Tanaka Akira  <akr@m17n.org>
 
-	* dir.c (glob_helper): get rid of using String.  [ruby-dev:26180]
+	* lib/time.rb: date.rb is not required anymore.
 
-	* dir.c (push_braces): should skip balanced braces.
+	* lib/resolv.rb: fix document.  refine IPv6 regex.
 
-	* eval.c (ruby_options), win32/win32.c (NtInitialize): move argument
-	  intialization back.  [ruby-dev:26180]
+Tue Dec 18 23:24:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue May 17 15:31:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/socket/socket.c (Init_socket): add listen method to
+	  TCPServer and UNIXServer.
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
-	  break the loop if the socket reached to EOF. [ruby-talk:142285]
+Tue Dec 18 17:54:53 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue May 17 11:52:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* sample/test.rb: Hash#indexes -> Hash#select.
 
-	* win32/win32.c (unixtime_to_filetime): use localtime() instead of
-	  gmtime() when using FileLocalTimeToFileTime().
+Tue Dec 18 01:02:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon May 16 22:28:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_thread_schedule): should not select a thread which is
+	  not yet initialized.
 
-	* win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
-	  to get rid of redefinition warnings on mingw.
+Mon Dec 17 18:53:49 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* class.c (rb_class_init_copy): singleton class is disallowed to copy,
-	  from its definition.  fixed: [ruby-talk:142749]
+	* string.c (rb_str_replace): swap arguments of OBJ_INFECT.
 
-Mon May 16 08:52:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Dec 17 16:52:20 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* win32/win32.{h,c}: define rb_[pgu]id_t.
+	* 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()
 
-Mon May 16 00:21:02 2005  Tanaka Akira  <akr@m17n.org>
+	* ruby.h: added declaration.
+	  rb_defout, rb_stdin, rb_stdout, rb_stderr, ruby_errinfo
 
-	* lib/pathname.rb (Pathname#unlink): use SystemCallError instead of
-	  Errno::EISDIR because EISDIR is not portable.
-	  [ruby-core:5001]
+	* rubyio.h: changed double include guard macro to RUBYIO_H.
 
-Sun May 15 22:11:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* array.c (inspect_call): make static.
 
-	* lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
-	  [ruby-dev:26164]
+	* eval.c (dvar_asgn): ditto.
 
-Sun May 15 18:56:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (rb_io_close_read): ditto.
 
-	* configure.in, ruby.h: define rb_[pgu]id_t macros instead of typedefs
-	  to get rid of types which might not be defined yet.  [ruby-dev:26165]
+	* lex.c (rb_reserved_word): ditto.
 
-Sun May 15 14:35:46 2005  Tanaka Akira  <akr@m17n.org>
+	* ruby.c: (req_list_head, req_list_last): ditto.
 
-	* lib/pathname.rb (Pathname#unlink): unlink a symlink to a directory
-	  was failed.  [ruby-core:4992]
+	* ruby.c (require_libraries): ditto.
 
-Sun May 15 09:57:30 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec 17 15:41:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c (unixtime_to_filetime): deal with DST.
-	  [ruby-talk:141817]
+	* time.c (time_plus): wrong boundary check.
 
-Sat May 14 23:59:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (time_minus): ditto.
 
-	* error.c (exc_exception, {exit,name_err,syserr}_initialize): call
-	  Execption#initialize.  fixed: [ruby-talk:142593]
+Mon Dec 17 15:19:32 2001  Tanaka Akira  <akr@m17n.org>
 
-Sat May 14 23:57:26 2005  Erik Huelsmann  <ehuels@gmail.com>
+	* time.c: new method `gmtoff', `gmt_offset' and `utc_offset'.
+	(time_utc_offset): new function.
+	(Init_Time): bind above methods to `time_utc_offset'.
 
-	* configure.in: Check for the availability of pid_t, gid_t and uid_t and
-	  remove AC_TYPE_UID_T.  fixed: [ruby-core:04745]
+	* 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.
 
-	* defines.h: Remove pid_t typedef.
+	* 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.
 
-	* ruby.h: Define rb_pid_t, rb_gid_t and rb_uid_t in accordance with
-	 the available system types.
+	* missing/strftime.c: fix overflow by tm_year + 1900.
 
-	* process.c: Change instances of pid_t and gid_t to their rb_*
-	 counterparts.
+	* lib/time.rb: use Time#utc_offset.
 
-	* ext/pty/pty.c: Change pid_t to rb_pid_t.
+Mon Dec 17 00:02:04 2001  Guy Decoux  <ts@moulon.inra.fr>
 
-	* vms/config.h: Define HAVE_{P,G,U}ID_T to 1.
+	* variable.c (find_class_path): should initialize iv_tbl if it's
+	  NULL.
 
-	* win32/Makefile.sub: Remove #define for {g,u}id_t.
+Fri Dec 14 04:23:36 2001  Minero Aoki  <aamine@loveruby.net>
 
-	* win32/win32.c: Change pid_t to rb_pid_t.
+	* lib/net/pop.rb: new method Net::POP3.APOP
 
-	* wince/Makefile.sub: Remove #define for {g,u}id_t.
+	* lib/net/http.rb: set default Content-Type to
+	  x-www-form-urlencoded (causes warning)
 
-	* wince/sys/types.h: Remove definitions of {p,g,u}id_t.
+	* lib/net/protocol.rb: remove Net::NetPrivate module.
 
-Fri May 13 23:44:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/smtp.rb: ditto.
 
-	* ext/extmk.rb: keep srcdir unexpanded.
+	* lib/net/pop.rb: ditto.
 
-	* lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
-	  fixed: [ruby-core:04932]
+	* lib/net/http.rb: ditto.
 
-	* lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
-	  also INSTALL_PROG and INSTALL_DATA system dependent.
-	  fixed: [ruby-core:04931]
+Fri Dec 14 00:16:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri May 13 17:54:39 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* class.c (rb_define_class): should return the existing class if
+	  the class is already defined and its superclass is ideintical to
+	  the specified superclass.
 
-	* variable.c (generic_ivar_get): rb_attr_get should not warn.
-	  [ruby-dev:26010]
+	* class.c (rb_define_class_under): ditto.
 
-Fri May 13 12:28:43 2005  Daniel Berger  <djberge@qwest.com>
+	* class.c (rb_define_module): should return the existing module if
+	  the module is already defined.
 
-	* array.c (rb_ary_select): can remove argc check. [ruby-core:4911]
+Thu Dec 13 09:52:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/ruby/test_array.rb: add test for find_all.
+	* time.c (time_new_internal): avoid loop to calculate negative
+	  div, mod.
 
-Fri May 13 11:29:00 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* time.c (time_cmp): should handle Bignums.
 
-	* eval.c (unknown_node): add volatile directive to prototype.
+Tue Dec 11 17:39:16 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-Thu May 12 17:08:48 2005  Tanaka Akira  <akr@m17n.org>
+	* array.c (rb_ary_pop): should ELTS_SHARED flag check before
+	  REALLOC.
 
-	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
-	  (swallow, rb_io_each_byte, rb_io_getc): revert previous change.
+Tue Dec 11 12:45:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (rb_io_eof, io_fread, appendline, swallow, rb_io_each_byte)
-	  (rb_io_getc, rb_getc): call clearerr before getc to avoid
-	  stdio incompatibility.
+	* string.c (rb_str_match_m): should convert an argument into
+	  regexp if it's a string.
 
-Thu May 12 16:52:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Dec 11 03:40:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rdoc/parsers/parse_c.rb: more readability for mixing
-	  progress "c..." and warning message.
+	* array.c (rb_ary_select): Array#select(n,m,...) now works like
+	  Array#indexes(n,m,..). [new, experimental]
 
-Thu May 12 16:31:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+	* hash.c (rb_hash_select): ditto.
 
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
+	* hash.c (env_select): ditto.
 
-Thu May 12 16:15:01 2005  Tanaka Akira  <akr@m17n.org>
+	* re.c (match_select): ditto.
 
-	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
-	  (swallow, rb_io_each_byte, rb_io_getc): don't rely EOF flag.
-	  [ruby-talk:141527]
+	* struct.c (rb_struct_select): ditto.
 
-Thu May 12 15:56:20 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+Tue Dec 11 03:17:19 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/rdoc/parsers/parse_c.rb: show parsing progress for C files.
-	  [ruby-core:4341]
+	* object.c (rb_class_real): follow included modules.
 
-Thu May 12 13:47:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Dec 10 23:37:51 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* test/drb/test_drb{ssl,unix}.rb: can test drb
-	  before install. (backported from HEAD) [ruby-dev:26146]
+	* util.h: change prototype of ruby_qsort() to accord with its
+	  definition.
 
-Thu May 12 09:53:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec 10 20:30:01 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* version.c (ruby_show_version): flush for non-tty stdout.
+	* gc.c (STR_ASSOC): use FL_USER3 instead of FL_USER2.
 
-Thu May 12 09:07:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Dec 10 17:40:02 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* test/ruby/envutil.rb, test/drb/drbtest.rb: can test drb
-	  before install. (backported from HEAD) [ruby-Bugs-1672]
+	* parse.y (str_extend): make up pushback call.
 
-Thu May 12 01:23:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec 10 02:09:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
-	  parser.  fixed: [ruby-dev:26113]
+	* array.c (rb_ary_modify): should copy the internal buffer if the
+	  modifying buffer is shared.
 
-	* eval.c (unknown_node): ignore broken NODE to get rid of accessing
-	  possibly inaccessible address.  fixed: [ruby-dev:26122]
-	  should emit more useful information like [ruby-dev:26126], though.
+	* array.c (ary_make_shared): make an internal buffer of an array
+	  to be shared.
 
-Wed May 11 16:20:01 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* array.c (rb_ary_shift): avoid sliding an internal buffer by
+	  using shared buffer.
 
-	* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
-	  and WEBrick::CGI#config. (backported from HEAD)
+	* array.c (rb_ary_subseq): avoid copying the buffer.
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
-	  not use String#split("/"). (backported from HEAD)
+Mon Dec 10 01:06:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed May 11 15:58:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (gettable): should freeze __FILE__ string.
 
-	* eval.c (break_jump): break should not cross functions.
-	  [ruby-list:40818]
+Sun Dec  9 18:06:26 2001  Minero Aoki  <aamine@loveruby.net>
 
-Wed May 11 10:39:37 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/net/protocol.rb: calls on_connect before conn_command
 
-	* lib/tempfile.rb (Tempfile#unlink): fixed typo.
+Sat Dec  8 23:27:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed May 11 01:03:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (rb_io_puts): old behavoir 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().
 
-	* eval.c (TMP_ALLOC): use macro NEW_NODE() to get rid of warnings on
-	  platforms which have no alloca().  fixed: [ruby-talk:141301]
+Sat Dec  8 22:40:38 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun May  8 23:17:47 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* hash.c (rb_hash_initialize): now accepts a block to calculate
+	  the default value. [new]
 
-	* ext/tk/lib/tk/timer.rb: fix typo.
+	* hash.c (rb_hash_aref): call "default" method to get the value
+	  corrensponding to the non existing key.  
 
-Sun May  8 16:52:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* hash.c (rb_hash_default): get the default value based on the
+	  block given to 'new'.  Now it takes an optinal "key" argument.
+	  "default" became the method to get the value for non existing
+	  key.  Users may override "default" method to change the hash
+	  behavior.
 
-	* lib/profiler.rb: fixed "undefined method `[]' for nil:NilClass"
-	  [ruby-core:4775] [ruby-talk:140401] [ruby-dev:26118]
+	* hash.c (rb_hash_set_default): clear the flag if a block is given
+	  to 'new'
 
-Sat May  7 22:58:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Dec  8 02:29:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/mkmf.rb (have_var): no libs argument is given.
+	* object.c (Init_Object): undef Data.allocate, left Data.new.
 
-Sun May  1 09:58:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec  7 19:12:14 2001  Minero Aoki  <aamine@loveruby.net>
 
-	* ruby.c (process_sflag): replace '-' in variable names with '_'.
-	  [ruby-dev:26107]
+	* lib/net/smtp.rb: SMTP.new requires at least one arg.
 
-	* ruby.c (set_arg0): use also environment variable space for setting
-	  $0.  [ruby-core:04774]
+	* lib/net/pop.rb: POP.new requires at least one arg.
 
-Wed Apr 27 23:42:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/pop.rb: uses "raise *Error.new" instead of simple raise.
 
-	* win32/Makefile.sub (OPTFLAGS): default global optimization to
-	  disabled only for VC++6.
+	* lib/net/http.rb: HTTP.new requires at least one arg.
 
-Tue Apr 26 22:58:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/net/http.rb: changes implicit start algorithm.
 
-	* ext/tcltklib/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
-	  command when can't get information of target command.
+Fri Dec  7 15:49:39 2001  Usaku Nakamura <usa@ruby-lang.org>
 
-Mon Apr 25 01:18:43 2005  Tanaka Akira  <akr@m17n.org>
+	* ext/extmk.rb.in: ignore adding -Wl,-R to DLDFLAGS when the directory
+	  is $topdir.
 
-	* regex.c: declare rb_warn to have variadic argument.  [ruby-core:4751]
+Fri Dec  7 13:58:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Apr 23 19:45:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/curses/curses.c (window_scrollok): use RTEST().
 
-	* ext/tcltklib/tcltklib.c (ip_RubyExitCommand): exit with status code
-	  via TclTkIp#_eval didn't work. [ruby-talk:139390]
+	* ext/curses/curses.c (window_idlok): ditto.
 
-Fri Apr 22 16:41:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/curses/curses.c (window_keypad): ditto.
 
-	* ext/tcltklib/tcltklib.c (ip_set_exc_message): fixed memory leak.
+	* ext/curses/curses.c (window_idlok): idlok() may return void on
+	  some platforms; so don't use return value.
 
-	* ext/tcltklib/tcltklib.c: eTkCallbackReturn was not initialized.
+	* ext/curses/curses.c (window_scrollok): ditto for consistency.
 
-Thu Apr 21 00:07:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/curses/curses.c: replace FIX2INT() by typechecking NUM2INT().
 
-	* lib/mkmf.rb (create_makefile): support platforms have file separator
-	  other than /.
+Fri Dec  7 09:51:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* {bcc32,win32,wince}/Makefile.sub (BUILD_FILE_SEPARATOR): separator
-	  of building platform.
+	* parse.y (str_extend): should not process immature #$x and
+	  #@x interpolation, e.g #@#@ etc.
 
-	* {bcc32,win32,wince}/Makefile.sub (CP, INSTALL): use COPY command.
+Fri Dec  7 03:21:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Apr 20 23:22:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enum.c (enum_sort_by): sort_by does not have to be stable always.
 
-	* Makefile.in, common.mk: miniruby depens on MINIOBJS.
+	* enum.c (enum_sort_by): call qsort directly to gain performance.
 
-	* dmydln.c (dln_load): dummy function to raise LoadError.
+Thu Dec  6 18:52:28 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* cygwin/GNUmakefile.in, {bcc32,win32,wince}/Makefile.sub: miniruby
-	  can't load extensions on Windows.
+	* ext/extmk.rb.in: add -Wl,-R flags to DLDFLAGS on netbsdelf.
 
-Wed Apr 20 23:01:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/mkmf.rb: ditto.
 
-	* win32/ifchange.bat: delete testing files.
+Thu Dec  6 09:15:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Apr 20 07:27:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* util.c (ruby_qsort): ruby_qsort(qs6) is now native thread safe.
 
-	* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
-	  add extout option.
+	* error.c (rb_sys_fail): it must be a bug if it's called when
+	  errno == 0.
 
-	* bcc32/setup.mak: make configuration variables overridable.
+Wed Dec  5 23:36:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Apr 20 04:15:27 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+	* regex.c (WC2MBC1ST): should not pass through > 0x80 number in UTF-8.
 
-	* lib/irb.rb lib/irb/* doc/irb: IRB 0.9.5
+Wed Dec  5 20:05:18 2001  Florian Frank  <flori@ping.de>
 
-Tue Apr 19 23:37:09 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/socket/socket.c (bsock_send): should raise EWOULDBLOCK
+	  exception.
 
-	* lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
+	* ext/socket/socket.c (s_recvfrom): ditto.
 
-Tue Apr 19 00:06:20 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/socket.c (s_accept): ditto.
 
-	* ext/extmk.rb: expand path for ext/**/extconf.rb.
+	* ext/socket/socket.c (udp_send): ditto.
 
-Mon Apr 18 11:25:14 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Dec  4 17:43:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/zlib/zlib.c (zstream_run): fixed SEGV. [ruby-core:4712]
+	* ruby.h (DUPSETUP): new SETUP macro for duplication.
 
-Sun Apr 17 23:57:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (time_dup): implement in Time class using DUPSETUP.
 
-	* ext/extmk.rb (extmake, parse_args): do not expand destdir.
+	* time.c (time_getlocaltime): new method;  probably requires
+	  better name than getlocaltime. [new,experimental]
 
-	* ext/extmk.rb (relative_from): treat mere drive letter as an absolute
-	  path.
+	* 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>
 
-Sat Apr 16 17:01:16 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* enum.c (enum_sort_by): should replace with last elements.
 
-	* sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss):
-	  use the first date information of items as site date information
-	  if channel doesn't have date information.
+Mon Dec  3 16:06:57 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Sat Apr 16 15:27:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/extconf.rb: remove -L/usr/local/lib.
 
-	* configure.in (RUBY_PROG_INSTALL): not add -p option to INSTALL.
-	  files need timestamps to be kept are only ar-archive on a few
-	  platforms, and be installed by instruby.rb but not INSTALL.
-	  fixed: [ruby-core:04721]
+	* configure.in: add -Wl,-export-dynamic on NetBSD.
 
-	* mkconfig.rb: purge autoconf value variables.
+Mon Dec  3 16:04:16 2001  Usaku Nakamura <usa@ruby-lang.org>
 
-Sat Apr 16 10:36:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* configure.in: not use X11BASE, since it's not always set.
 
-	* bcc32/Makefile.sub: quick hack... prepend DESTDIR.
-	  still have restriction on DESTDIR ("", "/", "e:")
+Mon Dec  3 13:53:49 2001  Tanaka Akira  <akr@m17n.org>
 
-Sat Apr 16 03:59:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* time.c (rb_strftime): buffer length condition was wrong.
 
-	* ext/openssl/extconf.rb: check for OPENSSL_cleanse.
+	* time.c (time_strftime): should backup buf to the original
+	  buffer.
 
-	* ext/openssl/openssl_missing.h: ditto.
+Mon Dec  3 09:59:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Apr 14 19:18:30 2005  Minero Aoki  <aamine@loveruby.net>
+	* time.c (time_plus): must detect result overflow.
 
-	* lib/fileutils.rb (remove_file): ignore exceptions caused by
-	  chmod.
+	* time.c (time_minus): ditto.
 
-	* lib/fileutils.rb (remove_dir): try to get rights to rmdir.
-	  [ruby-Bugs:1502] (2 items backportted from HEAD, rev 1.53-54)
+	* time.c (time_new_internal): round usec overflow and underflow
+	  here. 
 
-Thu Apr 14 16:57:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (time_plus): move operand overflow/underflow check to
+	  time_new_internal().
 
-	* bcc32/Makefile.sub: failed to remove debug information files.
-	  fixed: [ruby-dev:26034]
+	* time.c (time_minus): ditto.
 
-Wed Apr 13 23:40:21 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* time.c (time_cmp): should consider tv_usec too.
 
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.3 -> 0.1.4.
+Mon Dec  3 03:32:22 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* lib/rss/rss.rb (RSS::Element#converter): fixed converter
-	  transmission bug.
+	* configure.in: apply patch from NetBSD's pkgsrc (patch-aa).
 
-Wed Apr 13 21:20:35 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sun Dec  2 22:01:52 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* configure.in (mingw32): extract msvcr*.dll from objdump result.
+	* configure.in: use GCC, not without_gcc. remove without_gcc.
 
-Wed Apr 13 20:24:30 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/curses/extconf.rb: check for curses.h.
 
-	* configure.in (mingw32): use actual runtime DLL name as ruby DLL
-	  name and default load path.
+	* ext/dbm/extconf.rb: check if $CFLAGS includes DBM_HDR.
 
-	* win32/Makefile.sub, win32/setup.mak: ditto.
+Sat Dec  1 12:13:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Apr 12 15:33:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* time.c (time_gmtime): time_modify() should be called even if tm
+	  struct is not calculated yet.
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): better modification than the
-	  previous commit [ruby-dev:26029].
+Fri Nov 30 17:02:55 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Apr 12 12:38:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* configure.in: set target_cpu to i386 on cygwin and mingw32.
+	
+	* configure.in: default --enable-shared to yes on cygwin and mingw32.
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
-	  modifies the argument string to eval.
+Fri Nov 30 00:25:28 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-Tue Apr 12 02:21:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* README.EXT: Appendix B is duplicated.
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): add existence check of
-	  Tcl commands before calling Tcl_GlobalEval().
+	* README.EXT.ja: ditto.
 
-Mon Apr 11 23:47:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Thu Nov 29 00:28:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/drb/drb.rb: [druby-ja:123] fix: When reference of my object is
-	  loaded, the object is tainted.
+	* string.c (rb_str_equal): object with to_str must be treated as a
+	  string.
 
-	* test/drb/test_drb.rb: ditto.
+Wed Nov 28 18:46:28 2001  Ville Mattila  <mulperi@iki.fi>
 
-Mon Apr 11 22:18:23 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (rb_thread_select): should subtract timeofday() from
+	  limit, not reverse.
 
-	* dir.c, file.c (lstat): avoid warnings for mingw.
+Wed Nov 28 16:03:28 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-Mon Apr 11 20:11:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* util.c (scan_hex): x is not a hexadecimal digit.
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV
-	  when exit on Tcl/Tk8.3.x.
+Wed Nov 28 13:38:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Apr 11 15:26:25 2005  NAKAMURA Usaku  <usa@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.
 
-	* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
+Tue Nov 27 02:15:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Apr 11 12:09:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* marshal.c (w_float): must distinguish -0.0 from 0.0.
 
-	* {bcc32,win32,wince}/Makefile.sub: ri data was not installed
-	  into correct path. [ruby-dev:26011]
+Mon Nov 26 20:57:24 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* bcc32/Makefile.sub: defaulted install-nodoc. [ruby-dev:26011]
+	* ext/Setup*, ext/syslog/*: import the "syslog" module from the
+	  rough ruby project.
 
-Sun Apr 10 10:12:42 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Mon Nov 26 16:14:42 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
-	  to VT_EMPTY.
+	* gc.c (gc_mark_all): tweak mark order for little bit better scan.
 
-	* ext/win32ole/win32ole/tests/testWIN32OLE.rb: correct error
-	  message string "Unknown" => "unknown".
+	* gc.c (rb_gc_mark): ditto.
 
-Sat Apr  9 18:20:31 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c (rb_gc): ditto.
 
-	* ext/tk/lib/tk/image.rb: support to create TkImage object without
-	  creating a new image object on Tk.
+Mon Nov 26 16:54:59 2001  Usaku Nakamura <usa@ruby-lang.org>
 
-	* ext/tk/lib/tk/menu.rb: use TkCommandNames on create_self()
+	* win32/win32.c (mypopen): fixed that mypclose() didn't really close
+	  pipe.
 
-	* ext/tk/lib/tk/root.rb: TkRoot.to_eval() returns '.'.
+	* win32/win32.c (CreateChild): set STARTF_USESTDHANDLES flag only
+	  when some handles are passed.
 
-	* ext/tk/lib/tk/text.rb: add methods to create a TkText::IndexString
-	  from (x, y) coords.
+Mon Nov 26 16:31:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/tile/: add demo and update support status.
+	* enum.c (sort_by_i): slight performance boost.
 
-Sat Apr  9 14:42:29 2005  Kouhei Sutou  <kou@cozmixng.org>
+Sun Nov 25 21:02:18 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* sample/rss/tdiary_plugin/rss-recent.rb: supported configuration
-	  via Web browser.
+	* parse.y (str_extend): change types of second and third arguments
+	  from char to int.
 
-Sat Apr  9 11:59:57 2005  Kouhei Sutou  <kou@cozmixng.org>
+Thu Nov 22 20:15:28 2001  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
 
-	* lib/rss: backoported from HEAD.
+	* gc.c (gc_mark_rest): should call gc_mark_children(), not gc_mark().
 
-	* lib/rss: refactored.
-	  - gave a name to 'x'.
-	  - undef_method -> remove_method for avoiding a warning in ruby 1.6.
+	* gc.c (rb_gc_mark): may cause infinite looop.
 
+Thu Nov 22 00:28:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/parser.rb: @@setter -> @@setters.
+	* parse.y (str_extend): should check nesting parentheses in #{}.
 
-	* lib/rss/parser.rb
-	  (RSS::BaseListener.register_uri)
-	  (RSS::BaseListener.uri_registered?)
-	  (RSS::BaseListener.install_get_text_element):
-	  swapped the first argument and the second argument.
+Wed Nov 21 12:22:52 2001  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/rss/taxonomy.rb: swapped the first argument and the second
-	  argument for RSS::BaseListener.install_get_text_element.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/content.rb: ditto.
+	* lib/cgi.rb: CGI#header: do not set Apache.request.status for
+	Location: if Apache.request.status is already set.
 
-	* lib/rss/parser.rb
-	  (RSS::BaseListener.install_setter)
-	  (RSS::BaseListener.register_uri): changed fallback way.
+Wed Nov 21 02:24:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/parser.rb: added class name registry for complex model
-	  elements. (ex. have childlen elements, have some attributes and
-	  a child element and so on.)
+	* process.c (pst_wstopsig): returns nil unless WIFSTOPPED() is
+	  non-zero.
 
+	* process.c (pst_wtermsig): returns nil unless WIFSIGNALED() is
+	  non-zero.
 
-	* lib/rss/dublincore.rb: supported multiple Dublin Core items.
-	* lib/rss/maker/dublincore.rb: ditto.
+	* process.c (pst_wexitstatus): returns nil unless WIFEXITED() is
+	  non-zero.
 
-	* lib/rss/maker/image.rb: supproted new Dublin Core API.
+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.
 
-	* lib/rss/maker/base.rb: added default current_element implementation.
+	* signal.c (posix_signal): do not set SA_RESTART for SIGVTALRM.
 
+Tue Nov 20 21:09:22 2001  Guy Decoux  <ts@moulon.inra.fr>
 
-	* lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
-	  moved to RSS::Utils.
+	* parse.y (call_args2): block_arg may follow the first argument in
+	  call_args2.
 
-	* lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
-	  moved from RSS::TrackBackUtils.
+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.
 
-	* lib/rss/maker/image.rb: fixed invalid argument of
-	  add_need_initialize_variable bug.
-	* lib/rss/maker/trackback.rb: ditto.
+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.
 
-	* lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
+Mon Nov 19 17:58:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
-	  for date value.
+	* 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>
 
-	* test/test_dublincore.rb: added tests for plural accessor and
-	  multiple Dublin Core items.
+	* string.c (rb_str_succ): there was buffer overrun.
 
-	* test/test_setup_maker_1.0.rb: fixed swapped actual and expected
-	  values.
+Mon Nov 19 14:14:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/rss/rss-assertions.rb (assert_multiple_dublin_core): added
-	  an assertion for testing multiple Dublin Core items.
+	* parse.y (str_extend): term can be any character.
 
-	* test/rss/test_maker_dc.rb (test_rss10_multiple): added a test
-	  for making multiple Dublin Core items.
+Mon Nov 19 04:58:42 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* test/rss/test_maker_dc.rb (test_date): added a test for #date=
-	  and #dc_date=.
+	* 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>
 
-	* sample/rss/tdiary_plugin/rss-recent.rb:
-	  new option: @options['rss-recent.use-image-link']:
-	  use image as link instread of text if available.
+	* parse.y: needless conditionals.
 
-	* sample/rss/tdiary_plugin/rss-recent.rb (RSS_RECENT_VERSION):
-	  0.0.5 -> 0.0.6.
+	* parse.y (parse_regx): parse error at unterminated regex /#{.
+	  (ruby-bugs-ja:PR#142)
 
-Fri Apr  8 20:17:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Nov 17 12:37:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/extmk.rb (extmake): hdrdir needs to be defined also in
-	  Config::CONFIG.
+	* pack.c (pack_unpack): should give length to utf8_to_uv().
 
-	* lib/mkmf.rb (configuration, create_makefile): get rid of recursive
-	  macro reference.
+	* pack.c (utf8_to_uv): add length check.
 
-Fri Apr  8 18:26:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Nov 17 01:41:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_ssl.c: add callbacks to OpenSSL::SSL::SSLContexts.
-	  - SSLContext#client_cert_cb=(aProc). it is called when a client
-	    certificate is requested by a server and no certificate was not
-	    set for the SSLContext. it must return an Array which includes
-	    OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
-	  - SSLContext#tmp_dh_callback=(aProc). it is called in key
-	    exchange with DH algorithm. it must return an OpenSSL::PKey::DH
-	    object.
+	* massages: replace "wrong #" by "wrong number".
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): ignore the
-	  argument if it's nil.
+	* marshal.c (w_float): output Infinity and NaN explicitly.
 
-	* ext/openssl/ossl_pkey.c
-	  (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
-	  (DupPrivPKeyPtr): new function.
+	* marshal.c (r_object): support new explicit float format.
 
-	* ext/openssl/ossl_pkey_dh.c: add default DH parameters.
+	* eval.c (rb_thread_wait_for): select may cause ERESTART on
+	  Solaris.
 
-	* ext/openssl/ossl_pkey.h: ditto.
+	* eval.c (rb_thread_select): ditto.
 
-Fri Apr  8 01:55:20 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Nov 15 15:29:39 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
-	  [ruby-dev:25992]
+	* array.c (rb_ary_join): non-nil separator must be converted to
+	  String.  and separators' total length was wrong.
 
-Thu Apr  7 23:58:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Nov 15 03:37:17 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* ext/extmk.rb (extmake): keep directory names in Makefile as macros.
+	* hash.c (ruby_setenv): remove USE_WIN32_RTL_ENV block since it's
+	  obsoleted.
 
-	* lib/mkmf.rb (configuration, create_makefile): ditto.
+	* win32/win32.c, win32/win32.h: sort out #if 0 - #endif or others.
 
-	* lib/mkmf.rb (CXX_EXT): separate C++ extensions.
+Thu Nov 15 00:07:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Apr  7 17:43:25 2005  Shugo Maeda  <shugo@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 litral)
+	  [experimental].
 
-	* eval.c (rb_call0): "return" event hook should be always executed
-	  if event_hooks is set.  fixed: [ruby-core:04662]
-	  (backported from HEAD)
+Wed Nov 14 15:16:23 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-Mon Apr  4 23:17:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c (init_mark_stack): no need to clear mark_stack.
 
-	* ext/tk/lib/tk.rb (TkComm#array2tk_list): accept enc-mode argument to
-	  decide whether convert encoding of each element or not.
+	* gc.c (gc_mark_all): need to handle finalizer mark.
 
-	* ext/tk/lib/tk/variable.rb (TkVariable#value=): fail to convert the
-	  encoding of array elements when assign an array to an TkVariable
-	  object.
+	* gc.c (gc_mark_rest): use MEMCPY instead of memcpy.
 
-Mon Apr  4 10:26:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* gc.c (rb_gc_mark): earlier const check to avoid pusing special
+	  constants into mark stack.
 
-	* ext/tk/lib/tk/dialog.rb: fixed typo.
+Wed Nov 14 01:12:07 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-Sun Apr  3 17:16:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* win32/win32.c (waitpid): fix wait count.
 
-	* win32/win32.{h,c} (rb_w32_fdopen): avoid warning on bcc32.
-	  (backported from HEAD)
+	* win32/win32.c (poll_child_status): rename from wait_child().
 
-Sat Apr  2 23:38:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov 14 01:33:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in (CP, INSTALL): get rid of less portable options.
+	* numeric.c (fix_to_s): 'to_s' now takes optional argument to
+	  specify radix. [new]
 
-	* lib/mkmf.rb (configuration, create_makefile): correct configuration
-	  variable.
+	* bignum.c (rb_big_to_s): ditto. [new]
 
-	* {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in
-	  config.status for backward compatibility.  fixed: [ruby-core:04649]
+Tue Nov 13 19:50:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/mkmf.rb (create_makefile): ensure library directories get made
-	  before copying libraries there.
+	* configure.in: do not override CC if set.
 
-Sat Apr  2 16:59:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Nov 13 16:49:16 2001  Usaku Nakamura <usa@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
+	* win32/win32.c (mypopen): return error status instead of calling
+	  rb_sys_fail().
 
-	* ext/tk/lib/tk/variable.rb: fix namespace trouble when autoloading
+	* win32/win32.c (do_spawn): ditto.
 
-	* ext/tk/lib/tk/palette.rb: define Tcl variable 'tkPalette' as global
+Tue Nov 13 14:39:11 2001  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* ext/tk/lib/tk/dialog.rb: use array2tk_list method when calling
-	  Tk.ip_eval.
+	* signal.c (sighandle): should not re-register sighandler if
+	  POSIX_SIGNAL is defined.
 
-	* ext/tk/lib/tk/autoload.rb: add autoload entry 'TkDialogObj' and
-	  'TkWarningObj'
+Tue Nov 13 12:55:59 2001  Usaku Nakamura <usa@ruby-lang.org>
 
-Sat Apr  2 02:19:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* win32/win32.c (do_spawn): use CreateChild() instead of calling
+	  CreateProcess() directly. Original patches comes from Patrick Cheng.
 
-	* ext/tk/lib/tk.rb (TkWindow.initialize): accept 'without_creating'
-	  option without 'widgetname' option to allow creating a widget object
-	  which is used as an argument of Tcl/Tk's widget allocation commands.
+	* win32/win32.c (mypopen): ditto.
 
-	* ext/tk/lib/tk/image.rb (TkImage.initialize): accept 'imagename'
-	  option to create a image object by the given name.
+	* win32/win32.c (mypclose): use rb_syswait() instead of waiting in this
+	  function.
 
-Thu Mar 31 22:23:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (waitpid): use wait_child() instead of _cwait().
 
-	* lib/mkmf.rb (SRC_EXT): exclude just case different suffixes on case
-	  insensitive file system platforms.
+	* win32/win32.c (CreateChild): added. [new]
 
-	* README.EXT, README.EXT.ja (Appendix C): utility functions.
+	* win32/win32.c (wait_child): added. [new]
 
-Thu Mar 31 14:15:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* win32/win32.c (FindFirstChildSlot): added. [new]
 
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
-	  value. [ruby-dev:25971]
+	* win32/win32.c (FindChildSlot): added. [new]
 
-Thu Mar 31 08:25:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (FindPipedChildSlot): added. [new]
 
-	* common.mk (RUBYOPT): clear for the environment RubyGems installed.
+	* win32/win32.c (CloseChildHandle): added. [new]
 
-	* common.mk (clean-local): keep $(PREP) files till distclean.
+	* win32/win32.c (FindFreeChildSlot): added. [new]
 
-	* common.mk (check): do all tests.
+Tue Nov 13 12:38:12 2001  Usaku Nakamura <usa@ruby-lang.org>
 
-Thu Mar 31 06:00:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* hash.c (envix): use GET_ENVIRON and FREE_ENVIRON to get environment
+	  variables list.
 
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should not raise
-	  error even if the specified engine could not be loaded. (Dynamic
-	  engines don't have fixed name to load.)
+	* hash.c (env_keys): ditto.
 
-Thu Mar 31 00:18:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* hash.c (env_each_key): ditto.
 
-	* win32/ifchange.bat, win32/rm.bat: backported from HEAD.
+	* hash.c (env_values): ditto.
 
-Wed Mar 30 23:44:50 2005  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+	* hash.c (env_keys): ditto.
 
-	* Makefile.in, */Makefile.sub, */configure.bat,
-	  cygwin/GNUmakefile.in, common.mk, configure.in, ext/extmk.rb,
-	  lib/mkmf.rb, instruby.rb, runruby.rb: backport extout.
-	  [ruby-dev:25963]
+	* hash.c (env_each_value): ditto.
 
-Wed Mar 30 17:41:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* hash.c (env_each): ditto.
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp#_create_console() method to
-	  create a Tcl/Tk's console window.
+	* hash.c (env_inspect): ditto.
 
-	* ext/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method.
+	* hash.c (env_to_a): ditto.
 
-	* ext/tk/lib/remote-tk.rb: ditto.
+	* hash.c (env_size): ditto.
 
-	* ext/tk/lib/tk/console.rb: ditto.
+	* hash.c (env_empty_p): ditto.
 
-	* ext/tk/lib/tk.rb: update RELEASE_DATE
+	* hash.c (env_has_value): ditto.
 
-	* ext/tk/sample/demo-*/check2.rb: use 'return' in the Proc object.
+	* hash.c (env_index): ditto.
 
-	* ext/tk/sample/tkextlib/**: ditto.
+	* hash.c (env_to_hash): ditto.
 
-Tue Mar 29 22:11:56 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* win32/win32.c (win32_getenv): use static buffer.
 
-	* test/rinda/test_rinda.rb: use DRbObject.new_with instead of reinit.
-	  [ruby-dev:25961]
+	* win32/win32.c, win32/win32.h (win32_get_environ): get environment
+	  variables list. [new]
 
-Mon Mar 28 23:40:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* win32/win32.c, win32/win32.h (win32_free_environ): free environment
+	  variables list. [new]
 
-	* lib/drb/drb.rb: move method DRbObject#reinit to DRbObject.new_with.
-	  extract method DRbObject.prepare_backtrace. add DRb.regist_server,
-	  remove_server, fetch_server. change server in thread variable if
-	  in-proc server. [druby-ja:113]
+Mon Nov 12 16:48:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/drb/gw.rb: ditto.
+	* eval.c (error_print): errat array may be empty.
 
-Mon Mar 28 20:43:34 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Nov 12 01:30:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
+	* eval.c (rb_eval_cmd): should not upgrade safe level unless
+	  explicitly specified by argument newly added.
 
-Mon Mar 28 08:39:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* signal.c (sig_trap): should not allow tainted trap closure.
 
-	* ext/iconv/iconv.c (iconv_create): Iconv::Failure requires 3
-	  arguments.  (pointed out by NaHi)
+	* variable.c (rb_f_trace_var): should not allow trace_var on safe
+	  level higher than 3.
 
-Sat Mar 26 22:51:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* variable.c (rb_f_trace_var): should not allow tainted trace
+	  closure. 
 
-	* ext/tk/lib/tk.rb (_callback_entry_class?): add for checking whether
-	  a class is available for a callback entry.
+Sun Nov 11 00:12:23 2001  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
 
-	* ext/tk/lib/tk.rb (after_cancel): add Tk.after_cancel(afterID) method.
+	* gc.c: do not use static stack until system stack overflows.
 
-	* ext/tk/lib/tk.rb (array2tk_list): change from private module method
-	  of TkComm to public module method.
+Sat Nov 10 03:57:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb (cget): add check that slot argument is not
-	  empty string.
+	* eval.c (eval): should call Exception#exception instead of
+	  calling rb_exc_new3() directly.
 
-	* ext/tk/lib/tk.rb (configinfo): ditto.
+	* error.c (exc_exception): set "mesg" directly to the clone.  it
+	  might be better to set mesg via some method for flexibility.
 
-	* ext/tk/lib/tk/itemconfig.rb (itemcget): add check that slot argument
-	  is not empty string.
+Sat Nov 10 00:14:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/itemconfig.rb (itemconfiginfo): ditto.
+	* variable.c (cvar_override_check): should print original module
+	  name, if 'a' is T_ICLASS.
 
-	* ext/tk/lib/tk/entry.rb: add TkEntry#icursor and icursor= (alias of
-	  cursor and cursor= method).
+	* parse.y (yylex): float '1_.0' should not be allowed.
 
-	* ext/tk/lib/tk/font.rb: improve font treatment when the font name is
-	  empty string.
+	* variable.c (var_getter): should care about var as Qfalse
+	  (ruby-bugs#PR199).
 
-	* ext/tk/lib/tk/variable.rb: add :variable, :window and :procedure
-	  type.
+Fri Nov  9 13:50:06 2001  Usaku Nakamura <usa@ruby-lang.org>
 
-	* ext/tk/lib/tk/variable.rb: improve treatment of array-type
-	  tkvariable.
+	* win32/config.status.in: make CFLAGS same as Makefile's one.
 
-	* ext/tk/lib/tkextlib/blt.rb: add commands for zooming.
+Thu Nov  8 20:20:37 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tkextlib/blt/*: bug fix.
+	* eval.c (rb_trap_eval): avoid annoying warning with signal.
+	  [ruby-talk:23225]
 
-	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and add methods
-	  to call TreeCtrl commands for bindings.
+	* eval.c (rb_call0): adjust caller source file/line while
+	  evaluating optional arguments.
 
-	* ext/tk/sample/tkextlib/blt/*: new sample scripts.
+Thu Nov  8 18:41:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/sample/tkextlib/treectrl/*: ditto.
+	* array.c (cmpint): <=> or block for {min,max} may return bignum.
 
-Fri Mar 25 10:53:16 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* array.c (sort_1): use rb_compint.
 
-	* configure.in (WIN32_LEAN_AND_MEAN): removed because a lot of
-	  troubles.  [ruby-list:40721]
+	* array.c (sort_2): ditto.
 
-Thu Mar 24 23:10:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enum.c (min_ii): ditto.
 
-	* lib/mkmf.rb (macro_defined?): try to compile for an old compiler
-	  which doesn't bail out at #error directive.  [ruby-dev:25818]
+	* enum.c (min_ii): ditto.
 
-	* lib/mkmf.rb (check_sizeof): refine logging messages.
+	* enum.c (max_i): ditto.
 
-Thu Mar 24 03:57:48 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* enum.c (max_ii): ditto.
 
-	* lib/webrick/utils.rb (WEBrick::Utils.create_listeners):
-	  - should raise ArgumentError if no port is specified.
-	  - even if the specified port is 0, all TCPServers should be
-	  initialized with the port given to the first one.
+Thu Nov  8 18:21:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#initialize): if :Port
-	  parameter is 0, it should be updated with the port number which
-	  actually listened.
+	* file.c (path_check_1): forgot to initialize 'p'.
 
-Wed Mar 23 00:35:10 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Thu Nov  8 14:52:15 2001  Tanaka Akira  <akr@m17n.org>
 
-	* test/ruby/test_settracefunc.rb (test_event): added tests for
-	  "class" and "end" and "raise".
+	* mkconfig.rb: use String#dump to generate Ruby string literal.
 
-Tue Mar 22 22:40:18 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Thu Nov  8 15:46:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_call0): check event_hooks instead of trace_func.
+	* range.c (range_eql): should override 'eql?'
 
-Tue Mar 22 17:30:44 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* array.c (rb_ary_hash): should override 'hash' too.
 
-	* eval.c (rb_add_event_hook): new function to add a hook function for
-	  interpreter events. (backported form HEAD)
+Tue Nov  6 14:38:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Mar 20 22:51:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (security): always give warning for insecure PATH.
 
-	* lib/mkmf.rb (mkmf_failed): check if Makefile is created without
-	  create_makefile.
+	* dir.c (my_getcwd): do not rely on MAXPATHLEN.
 
-Sat Mar 19 23:48:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c (rb_file_s_readlink): ditto.
 
-	* misc/ruby-mode.el (ruby-expr-beg): returned true always.
-	  fixed: [ruby-list:40683]
+	* file.c (path_check_1): ditto.
 
-Sat Mar 19 00:41:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Nov  6 14:17:14 2001  Amos Gouaux <amos+ruby@utdallas.edu>
 
-	* ext/tk/lib/tk/font.rb: add some TkFont class methods to get font
-	  information without creating a TkFont object.
+	* lib/net/imap.rb (getquota_response): use astring for mailbox
+	names.
 
-	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and define some
-	  classes for components of Tk::TreeCtrl
+	* lib/net/imap.rb (getacl_response): ditto.
 
-Thu Mar 17 17:42:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Nov  5 17:09:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* struct.c (make_struct): allow non local-id field
-	  names. [ruby-core:04575]
+	* eval.c (rb_yield_0): should not call rb_f_block_given_p().
 
-	* struct.c (inspect_struct): ditto.
+Sat Nov  3 23:33:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Mar 16 23:36:02 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* string.c (rb_str_chomp_bang): should terminate string by NUL.
 
-	* eval.c (rb_call0): call_cfunc() should be protected.
+Sat Nov  3 22:28:51 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
 
-	* test/ruby/test_settracefunc.rb: added test for c-return.
+	* 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>
 
-Wed Mar 16 22:20:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (rb_yield_0): better error message.
 
-	* object.c (str_to_id): fixed typo.
+Thu Nov  1 14:08:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Mar 16 18:08:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (rb_big_aref): idx may be a Bignum.
 
-	* eval.c (rb_call0): reorganize "return" event post.
+	* numeric.c (fix_aref): negative index must return zero.
 
-Tue Mar 15 23:49:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Nov  1 13:23:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/iconv/iconv.c (Init_iconv): InvalidEncoding also should include
-	  Iconv::Failure.
+	* gc.c (gc_mark_children): should NOT treat last element of
+	  structs and arrays specially.
 
-Tue Mar 15 16:38:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Oct 31 16:59:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/tkutil.c (ary2list): give wrong arguments to hash2kv()
+	* eval.c (exec_under): should initialize ruby_frame->self;
 
-Mon Mar 14 19:39:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Oct 31 15:09:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/timer.rb (TkTimer): forgot to clear @return_value
-	  when restarting
+	* eval.c (POP_VARS): should not set DVAR_DONT_RECYCLE if _old
+	  ruby_vars is already force_recycled.
 
-	* ext/tk/lib/tk/sample/cd_timer.rb: new sample of TkRTTimer
+Wed Oct 31 10:28:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Mar 14 12:21:03 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c (rb_gc): handles mark stack overflow.
 
-	* ext/tk/lib/tk/timer.rb (TkRTTimer): forgot to reset the callback
-	  time. So, 'continue' do all callbacks between 'stop' and 'continue'.
+	* gc.c (PUSH_MARK): use static mark stack, no more recursion.
 
-Mon Mar 14 08:14:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Oct 31 02:44:06 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* object.c (str_to_id): warn for NUL containing strings.
+	* lib/cgi.rb: CGI::Cookie::parse(): Ignore duplicate keys caused by
+	  Netscape bug.
 
-Mon Mar 14 00:13:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Oct 30 18:21:51 2001  Usaku Nakamura <usa@ruby-lang.org>
 
-	* ext/tk/lib/tk/timer.rb (TkRTTimer): correct calculation of offset
-	  value. get a little better accuracy.
+	* win32/mkexports.rb: follow the change of rb_io_puts().
 
-	* ext/tk/sample/demos-en/widget: use a binding with no local variables
-	  when eval a sample script.
+Tue Oct 30 14:04:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/sample/demos-en/bind.rb: ditto.
+	* string.c (rb_str_chomp_bang): do smart chomp if $/ == '\n'. [new]
 
-	* ext/tk/sample/demos-en/tcolor: ditto.
+	* io.c (rb_io_puts): don't treat Array specially.
 
-	* ext/tk/sample/demos-jp/widget: ditto.
+	* bignum.c (rb_big_cmp): should convert bignum to float.
 
-	* ext/tk/sample/demos-jp/bind.rb: ditto.
+	* eval.c (rb_f_eval): can't modify untainted binding.
 
-	* ext/tk/sample/demos-jp/tcolor: ditto.
+Mon Oct 29 16:08:30 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Mar 13 10:04:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* regex.c (re_compile_pattern): should preserve p0 value.
 
-	* test/rinda/test_rinda.rb: remove test_gc. [ruby-dev:25871]
+Mon Oct 29 14:56:44 2001  Usaku Nakamura <usa@ruby-lang.org>
 
-Thu Mar 10 19:12:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* intern.h (rb_protect_inspect): follow the change of array.c.
 
-	* ext/tcltklib/tcltklib.c (lib_eventloop_ensure): mis-delete a timer
-	  handler when exit from a recursive called eventloop
+	* eval.c (rb_exec_end_proc): follow the change of rb_protect().
 
-	* ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
-	  realtime operation
+	* eval.c (method_proc, umethod_proc, rb_catch): cast the first
+	  parameter of rb_iterate() to avoid VC++ warning.
 
-	* ext/tk/sample/tkrttimer.rb: sample of TkRTTimer class
+	* range.c (range_step): ditto.
 
-	* ext/tk/lib/tk/textmark.rb: move  TkTextMark#+ and TkTextMark#- to
-	  TkText::IndexModMethods
+	* ext/sdbm/init.c (fsdbm_update, fsdbm_replace): ditto.
 
-	* ext/tk/lib/tk/text.rb: improve TkTextMark#+ and TkTextMark#-, and
-	  add them to TkText::IndexModMethods module
+Mon Oct 29 07:57:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/sample/tktextio.rb: add test part of "seek by text index
-	  modifiers"
+	* parse.y (str_extend): should allow interpolation of $-x.
 
-Thu Mar 10 08:10:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* variable.c (rb_cvar_set): empty iv_tbl may cause infinite loop.
 
-	* re.c (make_regexp): need to free internal regexp structure when
-	  compilation fails.  [ruby-talk:133228]
+	* variable.c (rb_cvar_get): ditto.
 
-Wed Mar  9 20:25:58 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* variable.c (cvar_override_check): ditto.
 
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_write): call
-	  rb_sys_fail if errno isn't 0. [ruby-dev:25831]
+Sat Oct 27 23:01:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
+	* bignum.c (rb_big_eq): convert Bignum to Float, instead of
+	  reverse.
 
-Wed Mar  9 15:46:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Oct 26 06:19:29 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#start): should
-	  restore @token if accept failure. suggested by Dominique Brezinski.
-	  [ruby-core:04518]
+	* time.c (time_localtime): getting tm should not be prohibited for
+	  frozen time objects.
 
-Wed Mar  9 13:37:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* time.c (time_gmtime): ditto.
 
-	* ext/tk/sample/tktextio.rb: fix bug of handling 'end' position.
-	  support initial text, overwrite setting and pos_gravity control.
+	* version.c (Init_version): freeze RUBY_VERSION,
+	  RUBY_RELEASE_DATE, and RUBY_PLATFORM.
 
-Tue Mar  8 18:16:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* file.c (Init_File): freeze File::SEPARATOR, ALT_SEPARATOR and
+	  PATH_SEPARATOR.
 
-	* ext/tk/sample/tktextio.rb: New sample script. TkTextIO class in this
-	  sample supports to use a text widget as if it is a I/O stream (such
-	  like as StringIO class).
+	* file.c (rb_stat_cmp): should check operand type before calling
+	  get_stat().
 
-Tue Mar  8 13:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Oct 25 10:28:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/socket/socket.c: workaround for some of 4.4BSD-Lite derived OSs.
+	* eval.c (rb_eval_cmd): should not invoke "call" with a block on
+	  any occasion.
 
-Tue Mar  8 12:36:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Oct 24 03:25:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/socket/socket.c: document from Sam Roberts
-	  <sroberts@uniserve.com> for getsockopt and setsockopt is merged.
-	  [ruby-doc:824]
+	* numeric.c (fix_aref): idx may be a Bignum.
 
-Tue Mar  8 01:27:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Tue Oct 23 01:21:19 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
-	  fixed: [ruby-dev:25828]
+	* 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.
 
-Mon Mar  7 21:35:02 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (call_trace_func): ditto.
 
-	* sample/webrick/httpsd.rb: fix typo in comment. suggested by
-	  Kazuhiko Shiozaki.
+	* eval.c (call_end_proc): ditto.
 
-Mon Mar  7 14:55:43 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (proc_call): ditto.
 
-	* eval.c (block_pass): should not push unique number if a block is
-	  not an orphan.  [ruby-dev:25808]
+	* eval.c (proc_yield): ditto.
 
-Wed Feb 16 02:55:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Oct 23 01:15:43 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
-	  ossl_ssl_write):
-	  - need to set errno on Win32 platform.
-	  - should call rb_sys_fail instead of rasing SSLError if
-	    SSL_ERROR_SYSCALL occured.
-	  - should wait for that the underlying IO become readable or
-	    writable if the error was SSL_ERROR_WANT_READ or
-	    SSL_ERROR_WANT_WRITE. [ruby-dev:25795]
+	* variable.c (rb_global_entry): reconstruct global variable
+	  aliasing (sharing global_entry->var with other global_entry).
 
-	* ext/openssl/lib/openssl/buffering.rb
-	  (Buffering#initialize): should set @eof and @rbuffer.
-	  (Buffering#fill_rbuff): should rescue Errno::EAGAIN.
-	  (Buffering#consume_rbuf): pointless eof flag resetting is deleted.
-	  (Buffering#read): should return an empty string if the specified
-	  size is zero.
-	  (Buffering#readpartial): new method.
-	  (Buffering#readline): fix typo.
-	  (Buffering#getc): return the first character of string correctly.
-	  (Buffering#each): fix typo.  suggested by Brian Ollenberger.
-	  (Buffering#readchar): fix typo.
-	  (Buffering#eof?): should read again it the input buffer is empty.
-	  (Buffering#do_write): should rescue Errno::EAGAIN.
-	  (Buffering#puts): use "\n" as the output field separator.
+	* variable.c (undef_getter): ditto.
 
-	* ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
-	  underlying IO.
+	* variable.c (undef_setter): ditto.
 
-	* ext/openssl/extconf.rb: get rid of GNUmakefile generation.
+	* variable.c (val_setter): ditto.
 
-	* text/openssl/test_pair.rb: test for IO like methods.
+	* variable.c (mark_global_entry): ditto.
 
-	* test/ruby/ut_eof.rb: test about empty file.
+	* variable.c (rb_define_hooked_variable): ditto.
 
-Mon Mar  7 10:22:06 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* variable.c (rb_f_trace_var): ditto.
 
-	* lib/un.rb: should use OptionParser. (backported form HEAD)
+	* variable.c (remove_trace): ditto.
 
-Mon Mar  7 09:18:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* variable.c (rb_f_untrace_var): ditto.
 
-	* string.c (rb_str_cmp_m): should not return false but nil.
-	  fixed: [ruby-dev:25811]
+	* variable.c (rb_gvar_get): ditto.
 
-Mon Mar  7 01:22:14 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* variable.c (trace_en): ditto.
 
-	* ext/tk/tkutil.c: remove the some codes which depend on the
-	  difference between Ruby1.8 and 1.9, because st.c on Ruby1.9
-	  was changed.
+	* variable.c (rb_gvar_set): ditto.
 
-Mon Mar  7 00:01:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* variable.c (rb_gvar_defined): ditto.
 
-	* ext/tcltklib/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
+	* variable.c (rb_alias_variable): ditto.
 
-Sun Mar  6 16:41:33 2005  Minero Aoki  <aamine@loveruby.net>
+Mon Oct 22 18:53:55 2001  Masahiro Tanaka  <masa@stars.gsfc.nasa.gov>
 
-	* lib/net/http.rb: HTTPHeader holds its header fields as an array
-	  (backport from CVS HEAD rev 1.112-1.123). [ruby-list:40629]
+	* numeric.c (num_remainder): a bug in Numeric#remainder.
 
-	* test/net/http/test_httpheader.rb: new file.
+Mon Oct 22 15:21:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Mar  6 11:47:10 2005  Sam Roberts  <sroberts@uniserve.com>
+	* eval.c (rb_exec_end_proc): END might be called within END
+	  block.
 
-	* lib/pp.rb: rdoced.  [ruby-core:4490]
+	* class.c (rb_mod_clone): should not copy class name, since clone
+	  should remain anonymous.
 
-Sun Mar  6 11:36:37 2005  Tanaka Akira  <akr@m17n.org>
+Fri Oct 19 23:40:37 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
-	  may return nil.  [ruby-talk:129826]
-	  reported by Daniel Berger.
+	* variable.c (remove_trace): should not access already freed area.
 
-Sat Mar  5 18:06:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* variable.c (rb_f_untrace_var): fix memory leak.
 
-	* dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have
-	  String#clear, so [ruby-dev:24749] didn't affect it)
+Fri Oct 19 17:55:14 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* win32/win32.c (NtInitialize): ditto. (by numeric.c 1.101.2.14)
+	* marshal.c (w_uclass): cloned class is not user
+	  class. (ruby-bugs-ja#PR103)
 
-Sat Mar  5 16:29:26 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* marshal.c (r_object): Struct subclass couldn't
+	  load. (ruby-bugs-ja#PR104)
 
-	* ext/tk/lib/multi-tk.rb: freeze callback-entry objects
+Wed Oct 17 14:12:50 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tkextlib/tile.rb: support tile-0.6
+	* 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.
 
-Fri Mar  4 19:39:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* variable.c (alias_getter, alias_setter): ditto.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
-	  also locally defined modules.
+	* variable.c (rb_alias_variable): ditto. and no need to mark alias
+	  variables.
 
-	* ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.
+	* variable.c (rb_gvar_defined): refer the original entry of an alias.
 
-	* ext/strscan/strscan.c: moved misplaced rdoc.
+Tue Oct 16 23:29:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Mar  4 15:58:12 2005  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.
 
-	* lib/cgi-lib.rb: add deprecation warning. [ruby-dev:25499]
-	  getopts.rb, parsearg.rb, importenv.rb as well.
+	* eval.c (proc_invoke): added new parameter to allow self
+	  switching.
 
-Fri Mar  4 11:17:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Oct 16 21:38:15 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_rbUpdateCommand): get rid of
-	  warnings with Tcl/Tk 8.3 or former (backport from CVS_HEAD).
+	* eval.c (rb_f_missing): check stack level with rb_stack_check().
 
-	* ext/tcltklib/tcltklib.c (ip_rb_threadUpdateCommand): ditto.
+	* eval.c (rb_call0): ditto.
 
-Fri Mar  4 10:15:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c, intern.h (rb_stack_check): added. [new]
 
-	* lib/set.rb (SortedSet::setup): a hack to shut up warning.
-	  [ruby-talk:132866]
+Tue Oct 16 13:18:47 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Fri Mar  4 07:07:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+	* object.c (rb_mod_initialize): optional block with
+	  Module.new. [new] (from 2001-10-10)
 
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
+Tue Oct 16 00:07:06 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Thu Mar  3 23:49:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+	* parse.y (yylex): disallow alpha-numeric and mbchar for
+	  terminator of %string.
 
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62
+Mon Oct 15 18:00:05 2001  Pit Capitain  <pit@capitain.de>
 
-Thu Mar  3 11:49:51 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* string.c (rb_str_index): wrong increment for non alphanumeric
+	  string.
 
-	* sample/rss/tdiary_plugin/rss-recent.rb: added site information.
+Mon Oct 15 05:23:02 2001  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Wed Mar  2 19:53:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* sprintf.c (rb_f_sprintf): support "%B".
 
-	* ext/extmk.rb (parse_args): add DESTDIR only when not directed
-	  already.  fixed: [ruby-dev:25781]
+Wed Oct 10 03:11:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Mar  2 17:14:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* file.c (rb_stat_clone): should copy internal data too.
 
-	* ext/tcltklib/tcltklib.c (lib_eventloop_core): fix typo
+	* numeric.c (num_clone): Numeric should not be copied by clone.
 
-Wed Mar  2 16:00:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* object.c (rb_obj_clone): should check immediate values.
 
-	* ext/tcltklib/tcltklib.c: enforce thread-check and exception-handling
-	  to avoid SEGV trouble.
-	  [KNOWN BUG] When supports pthread and running multiple Tk
-	  interpreters, an interrupt signal causes SEGV frequently. That
-	  may be a trouble of Ruby's signal handler.
+	* parse.y (command): `yield' should take command_args.
 
-	* ext/tk/tkutil/tkutil.c; fix a bug on converting a SJIS string array
-	  to a Tcl's list string.
+	* parse.y (parse_quotedwords): %w(...) is not a string.
 
-	* ext/tk/tcltklib.c: wrap Tcl's original "namespace" command to
-	  protect from namespace crash.
+Tue Oct  9 18:40:35 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: enforce exception-handling.
+	* process.c (Init_process): activate the case NT.
 
-	* ext/tk/lib/multi-tk.rb: catch IRB_EXIT to work on irb.
+Tue Oct  9 17:08:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tk.rb: ditto.
+	* eval.c (thread_status_name): separated from
+	  rb_thread_inspect(). return string expression for thread status.
 
-	* ext/tk/tcltklib.c: add TclTkLib.mainloop_thread?
+	* eval.c (rb_thread_status, rb_thread_inspect): use
+	  thread_status_name().
 
-	* ext/tk/lib/multi-tk.rb: (bug fix) callback returns a value.
+	* eval.c (rb_thread_priority_set): return the priority not but
+	  self.
 
-	* ext/tk/lib/tk/canvas.rb (delete): bug fix when multiple arguments.
+Sat Oct  6 23:07:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/clock.rb: fix 'no method error'.
+	* eval.c (rb_eval): NODE_MATCH3 was confusing left and right. sigh.
 
-	* ext/tk/lib/clock.rb (self.clicks): accept a Symbol argument.
+Fri Oct  5 15:19:46 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/variable.rb: be able to set default_value_type; :numeric,
-	  :bool, :string, :symbol, :list, :numlist or nil (default; same to
-	  :string). If set a type, TkVariable#value returns a value of the
-	  type.
+	* marshal.c (w_unique): should not dump anonymous class.
 
-	* ext/tk/lib/tkextlib/tclx/tclx.rb: add Tk::TclX.signal to warn the
-	  risk of using TclX extension's 'signal' command.
+Fri Oct  5 11:59:13 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/sample/irbtk.rb: irb with Ruby/Tk.
+	* eval.c (proc_s_new): revived.
 
-	* ext/tk/sample/demos-*/anilabel.rb: bug fix on 'show code'
+	* eval.c (Init_Proc): define Proc.new instead of Proc.allocate to
+	  inhibit from creating uninitialized Proc.
 
-	* ext/tk/sample/demos-*/aniwave.rb: new Ruby/Tk animation demo.
+Thu Oct  4 14:11:03 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/sample/demos-*/pendulum.rb: ditto.
+	* ext/socket/socket.c (ruby_connect): EALREADY is the equivalent
+	  for EINPROGRESS in ws2_32.lib.
 
-	* ext/tk/sample/demos-*/goldberg.rb: ditto.
+Wed Oct  3 20:11:06 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/sample/demos-*/widget: add entries of animation demos.
+	* re.c (rb_reg_s_alloc): avoid inifinte recursion.
 
-Tue Mar  1 00:47:43 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Oct  3 16:49:49 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* test/rinda/test_rinda.rb: backport from CVS_HEAD. use
-	  MockClock.sleep instead of Kernel.sleep [ruby-dev:25387]
+	* ext/gdbm/gdbm.c (rb_gdbm_fetch): str is a VALUE now.
 
-Tue Mar  1 00:34:24 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Oct  3 13:32:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rinda/tuplespace.rb (Rinda::TupleSpace): improved keeper thread.
+	* marshal.c (r_object): better allocation type check for
+	  TYPE_UCLASS. usage of allocation framework is disabled for now.
 
-	* test/rinda/test_rinda.rb: ditto.
+	* variable.c (rb_class_path): Module may have subclass.
 
-Mon Feb 28 11:42:23 2005  Ian Macdonald  <ian@caliban.org>
+	* string.c (rb_str_update): should maintain original negative
+	  offset. 
 
-	* exception error messages updated.  [ruby-core:04497]
+	* string.c (rb_str_subpat_set): ditto
 
-Mon Feb 28 09:03:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_aset): ditto.
 
-	* ext/socket/socket.c (Init_socket): add bunch of Socket
-	  constants.  Patch from Sam Roberts <sroberts@uniserve.com>.
-	  [ruby-core:04409]
+	* re.c (rb_reg_nth_match): should check negative nth.
 
-Wed Feb 23 15:04:32 2005  akira yamada  <akira@ruby-lang.org>
+	* re.c (rb_reg_nth_defined): ditto.
 
-	* lib/uri/generic.rb (split_userinfo): should split ":pass" into ""
-	  and "pass".  [ruby-dev:25667]
+Tue Oct  2 19:12:47 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Wed Feb 23 08:00:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/ftools.rb (catname): allow trailing '/' for the destination.
 
-	* array.c (rb_ary_s_create): no need for negative argc check.
-	  [ruby-core:04463]
+Tue Oct  2 18:31:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* array.c (rb_ary_unshift_m): ditto.
+	* eval.c (rb_eval): should override existing class.
 
-Wed Feb 23 01:57:46 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Oct  2 17:08:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/net/imap.rb (initialize): handle certs correctly. Thanks,
-	  NABEYA Kenichi. (backported from CVS HEAD)
+	* object.c (rb_obj_alloc): general instance allocation framework.
+	  use of NEWOBJ() is deprecated except within 'allocate' method.
 
-Tue Feb 22 07:25:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct  2 08:04:52 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* parse.y (parser_yylex): identfier after dot must not be a variable.
+	* marshal.c (r_object): TYPE_UCLASS check should be inversed.
 
-Mon Feb 21 10:04:49 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Oct  1 19:18:54 2001  Tanaka Akira  <akr@m17n.org>
 
-	* {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
+	* ext/socket/socket.c (unix_addr): getsockname(2) may result len = 0. 
 
-	* win32/win32.[ch] (fcntl): ditto.
+	* ext/socket/socket.c (unix_peeraddr): getpeername(2) may result
+	  len = 0.
 
-	* win32/win32.c (rb_w32_connect): support nonblocking mode.
+Mon Oct  1 09:59:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/socket/socket.c (wait_connectable, ruby_connect): support
-	  nonblocking connect on various platforms.
-	  all changes are backported from CVS HEAD. [ruby-core:3154],
-	  [ruby-core:4364].
+	* string.c (rb_str_subpat_set): support function for new argument
+	  pattern String#[re,offset] = val. [new]
 
-Sun Feb 20 00:48:48 2005  Tanaka Akira  <akr@m17n.org>
+Sat Sep 29 02:30:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/open-uri.rb (URI::FTP#buffer_open): access mechanism
-	  re-implemented according to RFC 1738.
-	  reported by Guillaume Marcais.  [ruby-talk:131650]
+	* eval.c (POP_BLOCK): rb_gc_force_recycle() was called too much.
+	  Should not be called if SCOPE_DONT_RECYCLE is set.
 
-Sat Feb 19 18:11:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Sep 26 22:21:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/drb/drb.rb (DRbObject#respond_to?): take two arguments.
-	  [ruby-dev:25722]
+	* string.c (rb_str_aref_m): new argument pattern
+	  String#[re,offset]. [new]
 
-	* test/drb/drbtest.rb: ditto.
+Wed Sep 26 19:02:39 2001  Guy Decoux  <ts@moulon.inra.fr>
 
-Sat Feb 19 13:52:02 2005  Tanaka Akira  <akr@m17n.org>
+	* parse.y: allow 'primary[] = arg'
 
-	* lib/open-uri.rb: call OpenSSL::SSL::SSLSocket#post_connection_check
-	  after connection is made.
+Tue Sep 25 10:46:42 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-Sat Feb 19 01:32:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* win32/win32.c (isInternalCmd): check return value of NtMakeCmdVector
+	  (Tietew <tietew@tietew.net>'s patch).
 
-	* ext/bigdecimal/lib/bigdecimal/newton.rb: resolved LoadError.
-	  [ruby-dev:25685]
+Mon Sep 24 00:55:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/bigdecimal/sample/linear.rb: ditto.
+	* string.c (rb_str_substr): should return an instance of
+	  receiver's class.
 
-	* ext/bigdecimal/sample/nlsolve.rb: ditto.
+	* string.c (rb_str_succ): ditto.
 
-	* ext/bigdecimal/lib/bigdecimal/nlsolve.rb: removed because this file
-	  is sample script and same file exists in ext/bigdecimal/sample.
+	* array.c (rb_ary_subseq): ditto.
 
-Fri Feb 18 17:14:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_initialize): Array.new([1,2,3]) => [1,2,3]. [new]
 
-	* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
-	  of StandardError class, not Exception class.  [ruby-core:04429]
+Sat Sep 22 22:16:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Feb 17 20:11:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* string.c (rb_str_reverse): should return an instance of
+	  receiver's class.
 
-	* lib/drb/drb.rb (DRbServer.default_safe_level): fix typo.
+	* string.c (rb_str_times): ditto.
 
-Thu Feb 17 20:11:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_times): ditto
 
-	* test/digest/test_digest.rb: separate test case for each algorithms.
-	  [ruby-dev:25412]
+	* string.c (str_gsub): ditto.
 
-Thu Feb 17 11:54:00 2005  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* string.c (rb_str_ljust): ditto.
 
-	* lib/test/unit/collector.rb (collect_file): now deletes paths added
-	  to $LOAD_PATH instead of restoring it verbatim.
+	* string.c (rb_str_rjust): ditto.
 
-	* lib/test/unit/autorunner.rb (AutoRunner.run): fixed so that
-	  'ruby -rtest/unit -rtest1 -rtest2 -e0' will use the objectspace
-	  collector again. Also tried to simplify the calling convention.
+	* string.c (rb_str_center): ditto.
 
-	* test/runner.rb: adjusted for new AutoRunner semantics.
+Sat Sep 22 12:13:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/test/unit.rb: ditto.
+	* eval.c (eval): retrieves file, line information from binding.
 
-Thu Feb 17 04:21:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Sep 20 21:25:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
-	  fixed: [ruby-core:04444]
+	* eval.c (MATCH_DATA): access via rb_svar().
 
-Thu Feb 17 00:09:45 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Thu Sep 20 15:20:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* test/drb/ignore_test_drb.rb: move TestDRbReusePort to new file
-	  [ruby-dev:25238]
+	* eval.c, intern.h (rb_svar): return reference to special variable
+	  from local variable index. [new]
 
-	* test/drb/test_drb.rb: add method DRbService.ext_service, move
-	  TestDRbReusePort to new file [ruby-dev:25238]
+	* eval.c (rb_eval): use rb_svar() for NODE_FLIP{2,3}.
 
-	* test/drb/test_drb.rb: ditto.
+	* parse.y (rb_(backref|lastline)_(get|set)): access via rb_svar().
 
-	* test/drb/test_drbssl.rb: ditto.
+	* eval.c (proc_invoke): push dynamic variables.
 
-	* test/drb/test_drbunix.rb: ditto.
+	* eval.c (rb_thread_yield): push special variables as dynamic
+	  variables($_, $~ and FLIP states).
 
-	* test/drb/ut_drb.rb: reduce sleep.
+Thu Sep 20 15:20:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Thu Feb 17 00:02:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* intern.h, parse.y (rb_is_local_id): return true if the ID is
+	  local symbol. [new]
 
-	* eval.c (is_defined): NODE_IASGN is an assignment.
+	* parse.y (internal_id): make new ID for internal use. [new]
 
-Wed Feb 16 23:34:30 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* parse.y (cond0): allocate internal ID for NODE_FLIP{2,3}.
 
-	* lib/drb/drb.rb: add lazy stop_service. ([druby-ja:109])
+	* eval.c (rb_f_local_variables): use rb_is_local_id() to select
+	  visible local variables.
 
-	* lib/drb/extserv.rb: ditto.
+Thu Sep 20 15:20:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Wed Feb 16 17:07:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_thread_start_0): SCOPE_SHARED is removed.
 
-	* ext/tk/tkutil.c: Follow the change of st.c (st_foreach)
-	  [ruby-list:40623].
-	  Sometimes mis-convert from a Ruby's Array of SJIS Strings, which
-	  includes some kind of SJIS characters, to a Tcl's UTF8 list string.
+	* eval.c, intern.h (rb_thread_scope_shared_p): removed. special
+	  variables are no longer shared by threads.
 
-Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* re.c (rb_reg_search): MATCHDATA is no longer shared by threads.
 
-	* lib/rss/parser.rb (RSS::ListenerMixin::tag_end):
-	  fixed invalid namespace handling bug.
+Tue Sep 18 11:44:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Feb 14 13:12:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* string.c (rb_str_init): String.new() => "" [new]
 
-	* ext/openssl/lib/openssl/ssl.rb
-	 (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
+Tue Sep 11 20:53:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Feb 14 00:40:49 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* dir.c (dir_path): new method.
 
-	* lib/drb/drb.rb (InvokeMethod.perform): pass DRb info to sub thread.
+	* dir.c (dir_initialize): wrap DIR into struct, along with path
+	  information.
 
-	* test/drb/test_drb.rb (test_01_safe1_safe4_eval): fix test case.
+Sat Sep  8 07:13:42 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-Sun Feb 13 23:13:46 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* lib/net/telnet.rb: waitfor(): improvement. thanks to
+	  nobu.nakada@nifty.ne.jp
 
-	* lib/rss/dublincore.rb (RSS::DublicCoreModel#date{,=}): added
-	  convenient methods.
+Sat Sep  8 04:34:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/0.9.rb (RSS::Rss::Channel#date{,=}): ditto.
+	* eval.c (rb_thread_restore_context): save current value of
+	  lastline and lastmatch in the thread struct for later restore.
 
-	* lib/rss/2.0.rb (RSS::Rss::Channel::Item#date{,=}): ditto.
+	* eval.c (rb_thread_save_context): restore lastline and lastmatch.
 
-	* test/rss/: added tests for the convenient methods.
+Fri Sep  7 11:27:56 2001  akira yamada  <akira@ruby-lang.org>
 
-Sun Feb 13 22:43:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* numeric.c (flo_to_s): should handle negative float value.
 
-	* lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
-	  config[:safe_level] ([druby-ja:120])
+Fri Sep  7 09:44:44 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
+	* lib/net/telnet.rb: waitfor(): bug fix.
 
-Sun Feb 13 16:56:52 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Sep  7 07:11:34 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
-	  to the value of status header field. ([ruby-dev:40617])
+	* lib/cgi.rb: CGI#doctype(): bug fix (html4Fr).
 
-Sun Feb 13 00:52:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/net/telnet.rb, lib/cgi.rb: remove VERSION, RELEASE_DATE,
+	  VERSION_CODE, RELEASE_CODE. please use REVISION.
 
-	* lib/erb.rb (ERB::Util.h, u): make it module_function.
+	* lib/cgi.rb: CGI#header(): bug fix.
 
-Sat Feb 12 17:29:19 2005  Tanaka Akira  <akr@m17n.org>
+	* lib/net/telnet.rb, lib/cgi.rb: concat --> +=
 
-	* lib/open-uri.rb (OpenURI.open_loop): send authentication only for
-	  the URI directly specified.
+Thu Sep  6 17:38:18 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Sat Feb 12 15:07:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c (dir_s_chdir): raise if environment variable HOME/LOGDIR
+	  not set.
 
-	* random.c (rand_init): suppress warning.
+	* dir.c (glob_helper): avoid infinite loop on a file name with
+	  wildcard characters. (ruby-bugs#PR177)
 
-Sat Feb 12 13:54:03 2005  Tanaka Akira  <akr@m17n.org>
+Thu Sep  6 14:25:15 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/open-uri.rb: support https if the platform provides CA
-	  certificates.
+	* ext/digest/digest.c (rb_digest_base_s_hexdigest): remove a debug
+	  print.
 
-Sat Feb 12 06:18:28 2005  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+Thu Sep  6 13:56:14 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check.
-	  [ruby-dev:25675]
+	* ext/digest/digest.c (rb_digest_base_s_digest,
+	  rb_digest_base_s_hexdigest): ensure that a string is given.
 
-Fri Feb 11 17:40:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Sep  6 13:28:51 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
-	  new method OpenSSL::X509::Store#set_default_paths.
+	* lib/jcode.rb (_regexp_quote): fix quote handling, again.
 
-Fri Feb 11 11:33:53 2005  Tanaka Akira  <akr@m17n.org>
+Thu Sep  6 07:28:56 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/open-uri.rb (URI::HTTP#proxy_open): new option supported:
-	  :http_basic_authentication.
-	  suggested by Kent Sibilev.  [ruby-core:4392]
+	* file.c (rb_find_file_ext): add const qualifiers to ext.
 
-Fri Feb 11 06:30:07 2005  George Ogata  <g_ogata@optushome.com.au>
+	* intern.h (rb_find_file_ext): ditto.
 
-	* misc/ruby-mode.el: ignore parenthesis inside heredoc.
-	  [ruby-core:04415]
+Thu Sep  6 07:16:14 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Fri Feb 11 04:54:13 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+	* ext/socket/socket.c (Init_socket): remove duplicating constants.
 
-	* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
+Thu Sep  6 03:15:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rdoc/generators/ri_generator.rb: ditto.
+	* class.c (rb_include_module): should check whole ancestors to
+	  avoid duplicate module inclusion.
 
-Thu Feb 10 11:14:17 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Sep  5 20:02:27 2001  Shin'ya Adzumi  <adzumi@denpa.org>
 
-	* win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h.
+	* string.c (trnext): should check backslash before updating "now"
+	  position.
 
-	* ext/socket/extconf.rb (sockaddr_storage): remove workaround for
-	  mswin32.
+Wed Sep  5 17:41:11 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Feb 10 10:29:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/jcode.rb (_regexp_quote): fix quote handling.
 
-	* ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
-	  window_color_set().
+Tue Sep  4 01:03:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Feb 10 00:47:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* re.c (Init_Regexp): to_s to be alias to inspect.
 
-	* struct.c (make_struct): fixed: [ruby-core:04402]
+Mon Sep  3 22:46:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Feb  9 08:07:08 2005  Paul Duncan  <pabs@pablotron.org>
+	* parse.y (yylex): should support 'keyword='.
 
-	* ext/curses/curses.c (window_color_set): [ruby-core:04393]
+Mon Sep  3 20:26:08 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Tue Feb  8 23:51:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* intern.h (rb_find_file_ext): changed from rb_find_file_noext().
 
-	* lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
-	  [druby-ja:117]
+Mon Sep  3 15:12:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Feb  8 13:06:12 2005  Sam Roberts  <sroberts@uniserve.com>
+	* ruby.c (proc_options): should not adjust argc/argv if -e option
+	  is supplied.
 
-	* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
-	  [ruby-talk:130092]
+Mon Sep  3 14:11:17 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Feb  8 09:30:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* error.c: unbreak the build on *BSD with gcc 3.0.1 by removing
+	  the conflicting declaration of sys_nerr for *BSD.
 
-	* lib/cgi.rb (CGI::Cookie): [ruby-talk:130040]
+Sat Sep  1 18:50:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Feb  8 00:19:02 2005  Tanaka Akira  <akr@m17n.org>
+	* ruby.c (proc_options): should not alter origargv[].
 
-	* lib/resolv.rb (Resolv::DNS::Name#subdomain_of?): new method.
-	  (Resolv::DNS::Name#inspect): ditto.
-	  Suggested by Sam Roberts.  [ruby-talk:129086]
+	* ruby.c (set_arg0): long strings for $0 dumped core.
 
-Mon Feb  7 10:06:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Sep  1 09:50:54 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* object.c: [ruby-doc:818]
+	* ruby.c (set_arg0): prevent SEGV when val is longer than the
+	  original arguments.
 
-Mon Feb  7 01:56:20 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ruby.c (ruby_process_options): initialize total length of
+	  original arguments at first.
 
-	* instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into
-	  rbconfig.rb. (backported from CVS HEAD)
+Sat Sep  1 14:05:28 2001  Brian F. Feldman  <green@FreeBSD.org>
 
-	* ext/socket/extconf.rb (sockaddr_storage): winsock2.h have the
-	  definition of struct sockaddr_storage, but socket.c doesn't
-	  include it because this version of ruby still has binary level
-	  compatibility with winsock1.
+	* ruby.c (set_arg0): use setprogtitle() if it's available.
 
-	* lib/mkmf.rb (create_makefile): should support header files in
-	  depend file.
+Sat Sep  1 03:49:11 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Feb  7 01:21:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (rb_io_popen): accept integer flags as mode.
 
-	* ext/socket/extconf.rb: check if getaddrinfo() works fine only when
-	  wide-getaddrinfo option is not given.  fixed: [ruby-dev:25422]
+Fri Aug 31 19:46:05 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/mkmf.rb ($extmk): check if under ext directory.
+	* file.c (rb_find_file_ext): extension table can be supplied from
+	  outside.  renamed.
 
-	* lib/mkmf.rb (Logging.postpone): allow recursive operation.
+	* eval.c (rb_f_require): replace rb_find_file_noext by
+	  rb_find_file_ext.
 
-	* lib/mkmf.rb (try_constant): make sure if really a constant, reduce
-	  the number of times of compile.
+Fri Aug 31 19:26:55 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/mkmf.rb (have_macro, have_var, byte_order): new functions.
+	* eval.c (rb_provided): should also check feature without
+	  extension.
 
-	* lib/mkmf.rb (find_library): allow directory list with separators.
+Fri Aug 31 13:06:33 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/mkmf.rb (arg_config): manage provided configuration options.
+	* numeric.c (flo_to_s): do not rely on decimal point to be '.'
 
-	* lib/mkmf.rb (dir_config): accept arrays of directory names as
-	  default values.
+Wed Aug 29 02:18:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* mkconfig.rb: no longer embed srcdir and compile_dir into
-	  rbconfig.rb.
+	* parse.y (yylex): ternary ? can be followed by newline.
 
-	* lib/mkmf.rb (create_makefile): fix unbalanced parens.
+Tue Aug 28 00:40:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Feb  6 19:23:01 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (rb_f_require): should check static linked libraries
+	  before raising exception.
 
-	* eval.c (stack_extend): add prototype because VC++8 doesn't
-	  accept __declspec(noinline) with K&R style function definitions.
-	  (backported from CVS HEAD)
+Fri Aug 24 15:17:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Feb  6 14:14:26 2005  Tadayoshi Funaba  <tadf@dotrb.org>
+	* array.c (rb_ary_equal): check identiry equality first.
 
-	* lib/date.rb (new_with_hash): changed messages of exception.
+	* string.c (rb_str_equal): ditto.
 
-	* lib/date/format.rb (str[fp]time): undocumented conversion
-	  specifications %[1-3] are now deprecated.
+	* struct.c (rb_struct_equal): ditto.
 
-Sun Feb  6 12:20:11 2005  Akinori MUSHA  <knu@iDaemons.org>
+Fri Aug 24 14:38:17 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* bignum.c (rb_big2ulong_pack): One too many arguments are passed
-	  to big2ulong().
+	* dln.c (dln_strerror): fix a bug that sometimes made null message on
+	  win32 (Tietew <tietew@tietew.net>'s patch).
 
-	* re.c (rb_reg_init_copy, rb_reg_initialize_m): One too many
-	  arguments are passed to rb_reg_initialize().
+	* win32/win32.c (mystrerror): ditto.
 
-Sun Feb  6 03:24:20 2005  Tanaka Akira  <akr@m17n.org>
+Fri Aug 24 03:15:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/resolv.rb (Resolv::DNS::Resource::TXT): multiple strings was not
-	  handled.
-	  (Resolv::DNS::Resource::TXT#strings): new method to return all
-	  strings.
-	  (Resolv::DNS::Message::MessageEncoder#put_string_list): new method.
-	  (Resolv::DNS::Message::MessageDecoder#get_string_list): ditto.
-	  based on [ruby-talk:129732] by Sam Roberts.
+	* numeric.c (Init_Numeric): undef Integer::new.
 
-Fri Feb  4 00:30:45 2005  Kouhei Sutou  <kou@cozmixng.org>
+Fri Aug 24 00:46:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss: supported Image module.
-	  http://web.resource.org/rss/1.0/modules/image/
+	* eval.c (rb_eval): NODE_WHILE should update result for each
+	  conditional evaluation.
 
-Thu Feb  3 23:42:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): NODE_UNTIL should return last evaluated value
+	  (or value given to break).
 
-	* ext/stringio/stringio.c (strio_close, strio_close_read, strio_close_write):
-	  should return nil instead of self as well as IO.  [ruby-dev:25623]
+Thu Aug 23 21:59:38 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/stringio/stringio.c (strio_extend, strio_putc): fill with zero
-	  extended portion.  [ruby-dev:25626]
+	* enum.c (sort_by_i): fix typo.
 
-Wed Feb  2 23:52:53 2005  sheepman  <sheepman@tcn.zaq.ne.jp>
+Thu Aug 23 10:10:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/stringio/stringio.c (strio_truncate): should MEMZERO an extended
-	  part.  [ruby-dev:25618]
+	* eval.c (is_defined): should not dump core for "defined?(())".
 
-Wed Feb  2 21:56:01 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* eval.c (umethod_bind): recv can be an instance of descender of
+	  oklass if oklass is a Module.
 
-	* lib/rss/rss.rb (RSS::Element#convert): added.
+Wed Aug 22 23:20:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/rss.rb: convert -> need_convert.
+	* hash.c (rb_hash_equal): check identiry equality first.
 
-	* lib/rss/1.0.rb: ditto.
+Wed Aug 22 19:58:59 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/rss/0.9.rb: ditto.
+	* eval.c (intersect_fds): counts intersecting fds.
 
-	* lib/rss/2.0.rb: ditto.
+	* eval.c (rb_thread_schedule): only fds requested by
+	  each thread count as select_value.
 
-	* lib/rss/trackback.rb: ditto.
+Tue Aug 21 22:28:09 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Tue Feb  1 22:48:48 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* file.c (group_member): should check real gid only.
 
-	* lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and
-	_dump.
+	* file.c (eaccess): do not cache euid, since effective euid may be
+	  changed via Process.euid=().
 
-Tue Feb  1 00:20:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c (eaccess): return -1 unless every specified access mode
+	  is permitted.
 
-	* configure.in (aix): fix linker flags on AIX.  [ruby-talk:125460]
+Tue Aug 21 16:09:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jan 31 13:33:21 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_eval): while/until returns the value which is given
+	  to break.
 
-	* ext/tcltklib/tcltklib.c: add invalid namespace check
+	* parse.y (value_expr): using while/until/class/def as an
+	  expression is now gives a warning, not an error.
 
-	* ext/tk/lib/multi-tk.rb: add invalid_namespace? method
+Tue Aug 21 11:56:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/remote-tk.rb: ditto
+	* range.c (range_eqq): should compare strings based on magical
+	  increment (using String#upto), not dictionary order.
 
-Mon Jan 31 10:29:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Aug 20 19:53:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
+	* ext/digest/sha2/extconf.rb: fix support for cross-compiling.
 
-Sat Jan 29 09:42:12 2005  Sam Roberts  <sroberts@uniserve.com>
+	* mkconfig.rb: fix support for autoconf 2.52.
 
-	* lib/resolv.rb (Resolv::DNS::Resource::IN::SRV): Added RFC2782 SRV
-	  resource record for specifying location of services.
+Mon Aug 20 17:24:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jan 28 17:16:55 2005  Tanaka Akira  <akr@m17n.org>
+	* enum.c (enum_sort_by): new method for Schewartzian transformed
+	  stable sort.
 
-	* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf):
-	  parse options line for ndots option.
-	  (Resolv::Hosts#lazy_initialize): return self.
-	  (Resolv::DNS#lazy_initialize): ditto.
-	  (Resolv::DNS::Config#lazy_initialize): ditto.
-	  Suggested by Sam Roberts.
+Mon Aug 20 16:09:05 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jan 27 13:18:03 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* variable.c (mod_av_set): detect constant overriding for built-in
+	  classes/modules.
 
-	* st.c (st_foreach): report success/failure by return value.
-	  [ruby-Bugs-1396]
+Mon Aug 20 15:14:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jan 27 00:15:29 2005  Minero Aoki  <aamine@loveruby.net>
+	* parse.y (tokadd_escape): escaped backslashes too much.
 
-	* test/fileutils/test_fileutils.rb (setup): support BSD-style
-	  directory group inheritance. (backport from HEAD, rev 1.32)
+Mon Aug 20 13:24:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/fileutils/fileasserts.rb (assert_same_entry): show entry
-	  difference. (backport from HEAD, rev 1.4)
+	* range.c (range_step): 'iter' here should be an array.
 
-Wed Jan 26 23:09:11 2005  Minero Aoki  <aamine@loveruby.net>
+Mon Aug 20 12:43:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/net/protocol.rb (WriteAdapter#puts): should append \n, not
-	  prepend. [ruby-talk:128302] (backport from HEAD, rev 1.75)
+	* marshal.c (w_object): should retrieve __member__ data from
+	  non-singleton class.
 
-Wed Jan 26 10:51:50 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Aug 18 23:11:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c (flock_winnt, flock_win95): unlock file even if
-	  LOCK_NB is specified. (backported from CVS HEAD)
+	* variable.c (rb_cvar_get): class variable override check added.
 
-Tue Jan 25 17:11:51 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* variable.c (rb_cvar_set): ditto
 
-	* ruby.c (proc_options): correct -T option in RUBYOPT. (backported
-	  from CVS HEAD)
+	* variable.c (rb_cvar_declare): ditto.
 
-Tue Jan 25 14:05:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Aug 17 12:13:48 2001  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/tcltklib/tcltklib.c: fix SEGV bug; trouble on canceling remained
-	  after scripts [ruby-dev:25479]: NULL current namespace when deleting
-	    Tk interpreter [ruby-talk:126225]
+	* lib/net/protocol.rb: Protocol.new requires at least one arg.
 
-	* ext/tcltklib/extconf.rb: bug fix; TCL_ENABLE_THREAD flag is inverted
-	  [ruby-talk:126360]
+	* lib/net/smtp.rb: ditto.
 
-	* ext/tcltklib/extconf.rb: add yet another native-thread check
+	* lib/net/pop.rb: ditto.
 
-	* ext/tk/tkutil.c: fix SEGV bug; NULL string pointer when finalize
-	  Ruby interpreter
+	* lib/net/http.rb: ditto.
 
-	* ext/tk/lib/multi-tk.rb: avoid warning for deleted safeTk ip frame
+Fri Aug 17 00:49:51 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/bindtag.rb: bug fix; new method of named bindtag
-	  doesn't return the created object [ruby-dev:25479]
+	* parse.y (parse_regx): handle backslash escaping of delimiter here.
 
-	* ext/tk/lib/tk/menu.rb: bug on treating arguments [ruby-dev:25479]
+Thu Aug 16 23:03:40 2001  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for
-	  a command argument [ruby-dev:25479]
+       * io.c: prevent recursive malloc calls on NEC UX/4800.
 
-	* ext/tk/lib/multi-tk.rb: ditto
+       * ext/socket/socket.c: ditto.
 
-	* ext/tk/lib/tk/*.rb: ditto
+Thu Aug 16 13:54:04 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/*.rb: ditto
+	* ext/socket/socket.c (s_recvfrom): fix typo.
 
-	* ext/tk/sample/demos-jp/anilabel.rb: new demo script
+Thu Aug 16 09:53:28 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* ext/tk/sample/demos-en/anilabel.rb: ditto
+	* ext/socket/socket.c (s_recvfrom): avoid VC++6 warning.
 
-	* ext/tk/sample/tkHTML/ss.rb: local variable scope bug fix
-	  [ruby-dev:25479]
+Thu Aug 16 03:50:33 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-Mon Jan 24 15:44:25 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+	* win32/win32.c (NtCmdGlob): avoid VC++ warning.
 
-	* lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
-	  [ruby-core:4296]
+	* lib/mkmf.rb: add -I$(srcdir) to CPPFLAGS.
 
-	* lib/rdoc/parsers/parse_simple.rb: adds support for private comments
-	  in the "simple" parser. [ruby-core:4301]
+Wed Aug 15 04:59:15 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Jan 24 15:44:25 2005  Charles Mills  <cmills@freeshell.org>
+	* ext/digest/*/extconf.rb: really fix so that they build from any
+	  directory.
 
-	* lib/rdoc/parsers/parse_c.rb: adds support for constants
-	  (rb_define_const), accessors (rb_define_attr), and makes a
-	  couple fixes. [ruby-core:4307]
+Wed Aug 15 04:04:02 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Jan 24 15:44:25 2005  Florian Gro  <florgro@gmail.com>
+	* ext/digest/sha2/extconf.rb: fix so that they build from any
+	  directory.
 
-	* lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
-	  [ruby-core:4302]
+Wed Aug 15 01:59:19 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Jan 24 15:44:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/digest/defs.h: Define NO_UINT64_T instead of emitting an
+	  error to fail.
 
-	* document updates - [ruby-core:04296], [ruby-core:04301],
-	  [ruby-core:04302], [ruby-core:04307]
+	* 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.
 
-Sun Jan 23 12:41:16 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Aug 14 21:14:07 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/soap/wsdlDriver.rb: from 1.5.3-ruby1.8.2, operation which has
-	  capitalized name (such as KeywordSearchRequest in AWS) is defined as
-	  a method having uncapitalized name. (converted with
-	  GenSupport.safemethodname to handle operation name 'foo-bar').  it
-	  introduced serious incompatibility; in the past, it was defined as a
-	  capitalized.
+	* ext/digest/sha2/extconf.rb: do not create Makefile when no 64bit
+	  integer type is detected.
 
-	  define capitalized method as well under that circumstance.
+Tue Aug 14 17:09:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Jan 23 05:24:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* range.c (range_step): new method.
 
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_to_der): should call
-	  GetOCSPReq at first.
+Tue Aug 14 11:49:00 2001  TOYOFUKU Chikanobu  <toyofuku@juice.or.jp>
 
-Sat Jan 22 23:09:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* string.c (rb_str_cmp): remove needless conditional.
 
-	* lib/drb/ssl.rb (accept): rescue SSLError. [druby-ja:110]
+Tue Aug 14 03:23:25 2001  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Sat Jan 22 22:35:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* string.c (rb_str_lstrip_bang) `return Qnil' was missing.
 
-	* lib/drb/unix.rb: fail if UNIXFileOwner is set. [druby-ja:111]
+Mon Aug 13 14:16:46 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Jan 21 23:58:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c, marshal.c: Detypo: s/SIZEOF_ING/SIZEOF_INT/.
 
-	* ext/stringio/stringio.c (strio_set_pos): clear EOF flag.
-	  [ruby-talk:127511]
+Sun Aug 12 15:01:58 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Fri Jan 21 20:07:02 2005  Tanaka Akira  <akr@m17n.org>
+	* string.c (rb_str_cat): fix buffer overflow.
 
-	* lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise ResolvError.
-	  reported by Sam Roberts.  [ruby-talk:127133]
+	* string.c (rb_str_append): nothing to append actually when `str2'
+	  is empty.
 
-Fri Jan 21 16:58:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Aug 11 14:43:47 2001  Tanaka Akira  <akr@m17n.org>
 
-	* dir.c (rb_push_glob): should work for NUL delimited patterns.
+	* array.c (rb_inspecting_p): initialize inspect_key if it is
+	not initialized yet.
 
-Fri Jan 21 13:58:37 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Fri Aug 10 22:14:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-list:40546]
-	  (backported from CVS HEAD)
+	* parse.y (cond0): operands of logical operators are not treated
+	  as conditional expresion anymore, but propagate conditional
+	  status if used in conditionals.
 
-Fri Jan 21 09:30:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Aug  7 09:10:32 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* rubyio.h (rb_eof_error): should mark as NORETURN. (backported
-	  from CVS HEAD)
+	* win32/win32.h: fix problems with BC++ (ruby-bugs#PR161).
 
-Fri Jan 21 00:31:36 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Aug  6 23:47:46 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/syck/rubyext.c (syck_parser_bufsize_set): avoid VC++ warning
-	  "local variable 'size' used without having been initialized".
+	* pack.c (pack_pack): associates p/P strings once at last
+	  (reverted to 1.26).
 
-Thu Jan 20 19:03:24 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* string.c (rb_str_associate): associates an Array at once, not
+	  but a String. realloc's when str_buf.
 
-	* ext/extmk.rb (extmake): shouldn't set $extflags on mswin32.
+Mon Aug  6 17:01:33 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/Makefile.sub (LIBRUBY_SO): should use $DLDOBJS instead of
-	  $EXTOBJS.
-	  fixed: [ruby-core:04290] (backported from CVS HEAD)
+	* eval.c (rb_gc_mark_threads): should mark ruby_cref.
 
-Thu Jan 20 11:42:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Aug  6 14:31:37 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* string.c (rb_str_new4): should propagate taintedness.
+	* numeric.c (num_divmod): fix typo.
 
-	* struct.c (rb_struct_set): use original method name, not callee
-	  name, to retrieve member slot.  [ruby-core:04268]
+Mon Aug  6 03:29:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* time.c (time_strftime): protect from format modification from GC
-	  finalizers.
+	* string.c (rb_str_lstrip_bang): new method.
 
-Wed Jan 19 18:06:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* string.c (rb_str_rstrip_bang): new method.
 
-	* lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
-	  (backported from CVS HEAD)
+Mon Aug  6 00:35:03 2001  Guy Decoux  <decoux@moulon.inra.fr>
 
-Wed Jan 19 01:16:30 2005  Tanaka Akira  <akr@m17n.org>
+	* struct.c (rb_struct_modify): should check frozen and taint
+	  status.
 
-	* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
-	  domain and search directive without an argument.
-	  reported by Sam Roberts.  [ruby-talk:126781]
+Sun Aug  5 19:28:39 2001  Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
 
-Tue Jan 18 15:03:05 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* string.c (rb_str_associate): should consider STR_ASSOC too.
 
-	* lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
-	  of :SSLEnable is false.
+Sun Aug  5 07:46:18 2001  Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
 
-	* lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
-	  don't allow changing its mode.
+	* eval.c (rb_undefined): do not recurse if method_missing is
+	  undefined.
 
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
-	  should delete trailing LF from the result of pack("m*").
+Thu Aug  2 21:37:32 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
-	  - should delete trailing LF from the result of pack("m*").
-	  - clear Request-Line not to send the response by HTTPServer#run.
+	* process.c (proc_waitpid): now all arguments are optional.
 
-	* lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
-	  refine regexp (and change the name of a local variable).
+	* process.c (Init_process): waitpid is now alias to wait.
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
-	  new method to escape URI path component.
+	* process.c (Init_process): waitpid2 is now alias to wait2.
 
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
-	  escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
+	* process.c (rb_waitpid): made public.
 
-	* test/webrick/*, sample/webrick/httpproxy.rb: add new file.
+	* ext/pty/pty.c (pty_getpty): avoid disturbing SIGCHLD using
+	  thread and rb_waitpid.
 
-Mon Jan 17 23:33:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Aug  2 11:23:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in (aix): fix typo.  [ruby-talk:126401]
+	* process.c (proc_getpgrp): now takes no argument on all
+	  platforms.
 
-Mon Jan 17 07:08:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (proc_setpgrp): ditto.
 
-	* ext/readline/readline.c: suppress warnings.
+Thu Aug  2 01:29:42 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/irb/extend-command.rb (IRB::ContextExtender.def_extend_command):
-	  ditto.
+	* 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>
 
-	* lib/irb/ext/history.rb (IRB::Context::set_last_value): ditto.
+	* ext/socket/socket.c (sock_s_pack_sockaddr_in): added
+	  Socket::pack_sockaddr_in(). [new]
 
-	* lib/irb/ext/history.rb (IRB::Context::eval_history): ditto.
+	* ext/socket/socket.c (sock_s_pack_sockaddr_un): added
+	  Socket::pack_sockaddr_un(). [new]
 
-	* lib/irb/locale.rb (IRB::Locale::real_load): ditto.
+	* ext/socket/socket.c (sock_s_pack_sockaddr_in): added
+	  Socket::unpack_sockaddr_in(). [new]
 
-	* lib/irb/slex.rb (SLex::Node::create_subnode): remove garbage.
+	* ext/socket/socket.c (sock_s_pack_sockaddr_un): added
+	  Socket::unpack_sockaddr_un(). [new]
 
-Mon Jan 17 00:09:42 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Aug  1 15:42:16 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* lib/uri/common.rb (PORT): typo fix. fixed: [ruby-core:04256]
+	* eval.c (ruby_run): avoid VC++ warning.
 
-Sat Jan 15 14:57:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul 31 17:30:53 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
-	* ruby.c (proc_options): ignore trailing CRs at the end of short
-	  options as well as long options.  fixed: [ruby-core:04232]
+	* marshal.c (Init_marshal): fix typos.
 
-Sat Jan 15 13:35:16 2005  Kouhei Sutou  <kou@cozmixng.org>
+Tue Jul 31 15:16:39 2001  Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
 
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.2 -> 0.1.3.
+	* process.c (last_status_set): nothing returned, should be void.
 
-	* lib/rss/rss.rb: accept inheritance. [ruby-talk:126104]
+	* ext/socket/socket.c (load_addr_info): ditto.
 
-Thu Jan 13 04:48:53 2005  Tanaka Akira  <akr@m17n.org>
+Tue Jul 31 12:11:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (io_fread): don't warn nonblocking behavior by default.
+	* marshal.c (Init_marshal): new constant Marshal::MAJOR_VERSION
+	  and Marshal::MINOR_VERSION.
 
-Wed Jan 12 00:36:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul 31 07:18:04 2001  Nobuyoshi Nakada <nobu.nokada@softhome.net>
 
-	* object.c (rb_class_superclass): superclass of singleton class also
-	  should be a singleton class.  fixed: [ruby-list:40519]
+	* 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 Jan 11 09:44:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Jul 31 11:52:10 2001  akira yamada  <akira@ruby-lang.org>
 
-	* numeric.c (Init_Numeric): turn off floating point exceptions
-	  on bcc32. "1e300".to_f had crashed by overflow.
+	* marshal.c (marshal_load): ruby_verbose test should be wrapped by
+	  RTEST().
 
-Tue Jan 11 03:10:10 2005  Minero Aoki  <aamine@loveruby.net>
+Mon Jul 30 17:54:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/fileutils.rb (copy_entry): could not copy symbolic link.
-	  [ruby-talk:125733]
+	* hash.c (rb_hash_index): should return nil (not the default
+	  value) if value is not in the hash.
 
-	* lib/fileutils.rb (copy_stream): use read/write instead of
-	  sysread/syswrite.
+Mon Jul 30 12:55:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jan 10 23:08:15 2005  Nobuyoshi Nakada  <nobu@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]
 
-	* variable.c (rb_autoload): hide internal data from ruby level.
-	  fixed: [ruby-dev:25435], [ruby-list:40498]
+Mon Jul 30 11:12:14 2001  Amos Gouaux <amos+ruby@utdallas.edu>
 
-Mon Jan 10 01:22:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/imap.rb: added new commands for managing folder quotas
+	  and folder ACLs.
 
-	* gc.c (rb_data_object_alloc): klass may be NULL.
-	  [ruby-list:40498]
+Mon Jul 30 03:19:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Jan  9 03:12:58 2005  Tanaka Akira  <akr@m17n.org>
+	* bignum.c (rb_cstr2inum): "0 ff".hex should return 0, not 255.
 
-	* io.c (io_fread): warn nonblocking behavior.
-	  (io_readpartial): new method IO#readpartial.
+Fri Jul 27 22:29:41 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Sat Jan  8 04:38:47 2005  why the lucky stiff  <why@ruby-lang.org>
+	* file.c (rb_file_s_expand_path): fixed using CharNext().
 
-	* lib/yaml.rb: Kernel#y requires an argument.
+Fri Jul 27 18:07:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jan  7 21:12:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
+	* eval.c (rb_provided): extension should be guessed using
+	  rb_find_file_noext().
 
-	* random.c (rand_init): use ALLOC_N instead of ALLOCA_N
-	  [ruby-dev:25426]
+	* eval.c (rb_f_require): should call rb_feature_p() after
+	  extension completion.
 
-Fri Jan  7 18:03:35 2005  Tanaka Akira  <akr@m17n.org>
+Fri Jul 27 16:25:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* gc.c (mark_locations_array): avoid core dump with -O3.
-	  [ruby-dev:25424]
+	* eval.c (rb_eval): add CHECK_INTS before next, redo, retry to
+	  avoid potential uninterruptable infinite loop.
 
-Thu Jan  6 20:31:07 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+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.
 
-	* ext/zlib/zlib.c (zstream_end): should return value. (backported
-	  from CVS HEAD)
+Sat Jul 14 06:20:17 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Jan  6 19:55:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/net/http.rb: HTTP#proxy? did not worked.
 
-	* win32/win32.c (rb_w32_close): didn't close socket handle.
-	  [ruby-dev:25414]
+Sat Jul 14 02:56:19 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* win32/win32.c (rb_w32_open_osfhandle): bcc32's _open_osfhandle
-	  never set EMFILE.
+	* ext/extmk.rb.in: support multi-level ext/ directories.
+	  (e.g. you can have ext/foo, ext/foo/bar and ext/foo/baz)
 
-Thu Jan  6 17:14:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jul 14 02:55:02 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* random.c (random_seed): O_NONBLOCK isn't defined on some
-	  platforms. [ruby-dev:25417]
+	* ext/.cvsignore: let cvs ignore extinit.c.
 
-Thu Jan  6 13:45:35 2005  Tanaka Akira  <akr@m17n.org>
+Fri Jul 13 23:47:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/time.rb: recognize +00:00 and GMT as a localtime.
+	* regex.c (re_search): should consider reverse search.
 
-Thu Jan  6 07:58:28 2005  Dave Thomas  <dave@pragprog.com>
+Fri Jul 13 22:26:09 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/rdoc/usage.rb (RDoc::RDoc.usage_no_exit): Allow for colons
-	  in path names on DOS machines. (thanks to Johan Nilsson)
+	* 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.
 
-Wed Jan  5 20:16:32 2005  Tanaka Akira  <akr@m17n.org>
+	* ext/extmk.rb.in: ditto.
 
-	* random.c (limited_big_rand): didn't work if SIZEOF_BDIGITS == 2.
-	  [ruby-dev:25408]
+Fri Jul 13 02:36:10 2001  Minero Aoki  <aamine@loveruby.net>
 
-	* random.c (random_seed): refined.
+	* dir.c (dir_s_chdir): warn only when invoked from multiple
+	  threads or block is not given.
 
-Wed Jan  5 12:49:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul 12 15:11:48 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* eval.c (rb_thread_initialize): Thread objects cannot be initialized
-	  again.  fixed: [ruby-core:04067]
+	* ext/socket/socket.c (ruby_connect): workaround for the setup of
+	  Cygwin socket(EALREADY).
 
-Wed Jan  5 10:48:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jul  9 16:49:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* dir.c (dir_s_mkdir): win32 special processing doesn't need any
-	  longer. (backported from CVS HEAD)
+	* ext/extmk.rb.in: modify RM macro.
 
-	* win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
-	  interface. (backported from CVS HEAD)
+	* lib/mkmf.rb: ditto.
 
-	* win32/win32.[ch] (rb_w32_rmdir): new function. (backported from CVS
-	  HEAD)
+Sun Jul  8 20:52:02 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Jan  5 02:30:11 2005  Tanaka Akira  <akr@m17n.org>
+	* ruby.h: fix a wrong function name: rb_iglob() -> rb_globi().
 
-	* random.c (init_by_array): imported from mt19937ar-cok.tgz.
-	  (genrand_int32): ditto.
-	  (genrand_real): replaced with genrand_res53 in mt19937ar-cok.
-	  (rand_init): support bignum for longer seed.
-	  (random_seed): generate longer seed.
-	  (make_mask): new function.
-	  (limited_rand): ditto.
-	  (limited_big_rand): ditto.
-	  (rb_f_rand): call limited_rand and limited_big_rand.
-	  [ruby-dev:25403]
+Sun Jul  8 16:04:35 2001  Minero Aoki  <aamine@loveruby.net>
 
-Tue Jan  4 23:25:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/http.rb: rename HTTP#request_by_name to send_request.
 
-	* bignum.c (rb_big_rand): should return positive random number.
-	  [ruby-dev:25401]
+	* lib/net/protocol.rb (ProtoSocket#read): modify typo.
 
-Tue Jan  4 11:15:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
+Sat Jul  7 17:45:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
-	  random bignums.  [ruby-dev:25396]
+	* object.c (rb_convert_type): should use rb_rescue(), not rb_rescue2().
 
-Mon Jan  3 14:01:54 2005  Tanaka Akira  <akr@m17n.org>
+	* range.c (range_init): ditto.
 
-	* random.c (random_seed): don't use /dev/urandom if it is not
-	  character device.
+Fri Jul  6 18:01:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jan  3 11:37:42 2005  Tanaka Akira  <akr@m17n.org>
+	* object.c (rb_obj_dup): copies (actually does not free)
+	  generic_ivar on dupif original owns them.
 
-	* random.c (random_seed): use /dev/urandom if available.
-	  [ruby-dev:25392]
+Fri Jul  6 02:15:06 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Jan  3 07:46:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/tempfile.rb: a tempfile must be created with mode 0600.
 
-	* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
-	  raise NotImplementedError if password is encrypted by digest
-	  algorithms. This patch is contributed by sheepman. [ruby-list:40467]
+Thu Jul  5 20:28:53 2001  Tietew <tietew@tietew.net>
 
-	* lib/webrick/httpauth/digestauth.rb
-	  (WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
-	  This patch is contributed by sheepman. [ruby-list:40482]
+	* string.c (rb_str_each_line): should propagate taint mark. 
 
-	* lib/webrick/{httpauth.rb,httpauth/basicauth.rb,httpproxy.rb}: use
-	  pack/unpack-template char "m" instead of lib/base64.rb to do base64
-	  encoding/decoding. fixed: [ruby-dev:25336]
+	* ext/nkf/nkf.c (rb_nkf_kconv): ditto.
 
-	* test/webrick/test_httpauth.rb: new file.
+Fri Jul  6 14:54:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jan  1 04:20:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (rb_f_require): revamp for simpler implementation.
 
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
-	  StringValue before GetSPKI. fixed: [ruby-dev:25359].
+	* file.c (rb_find_file_noext): use String object, instead of
+	  passing char* around.
 
-Sat Jan  1 01:13:28 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (rb_find_file): ditto.
 
-	* variable.c (rb_autoload): [ruby-dev:25373]
+Thu Jul  5 22:01:02 2001  Mitsuhiro Kondo  <kondo@nik-prt.co.jp>
 
-Fri Dec 31 14:10:43 2004  Dave Thomas  <dave@pragprog.com>
+	* dln.c (dln_load): should use NSLINKMODULE_OPTION_BINDNOW.
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item): Fix problem
-	  if heading contains formatting.
+Thu Jul  5 13:44:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Dec 30 00:41:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.c (load_file): local variables 'c' remain uninitialized on
+	  xflag.
 
-	* eval.c (svalue_to_avalue): [ruby-dev:25366]
+Thu Jul  5 10:00:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (rb_str_justify): [ruby-dev:25367]
+	* regex.c (re_match): prefetched escaped character too early.
 
-Wed Dec 29 11:07:07 2004  Dave Thomas  <dave@pragprog.com>
+Wed Jul  4 08:58:30 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rdoc/generators/template/html/kilmer.rb: Update to use new
-	  sections.
+	* eval.c (rb_call0): add argument check for attr_readers.
 
-Tue Dec 28 22:31:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul  4 04:22:44 2001  Minero Aoki  <aamine@loveruby.net>
 
-	* string.c (rb_str_justify): create buffer string after argument type
-	  conversion.  fixed: [ruby-dev:25341]
+	* lib/net/http.rb (HTTP#request_by_name): arg order changes.
 
-Tue Dec 28 15:41:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul  4 04:07:36 2001  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
-	  variables.  fixed: [ruby-list:40445]
+	* lib/net/http.rb (HTTP#request_by_name): bug fix.
 
-Tue Dec 28 15:25:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/http.rb: does not write Connection: by default.
 
-	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
-	  0xfe.
+	* lib/net/protocol.rb: "start" for started protocol is an error.
 
-	* ext/nkf/lib/kconv.rb (Kconv#kconv): should handle UTF8 and UTF16
+	* 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
+
+	* defins.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.
 
-Tue Dec 28 13:35:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu May 24 16:10:33 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate): ensure
-	  freeing internal zstreams.  fixed: [ruby-dev:25309]
+	* range.c (range_member): check based on "<=>" comparison. [new]
 
-	* ext/zlib/zlib.c (rb_deflate_init_copy): replace rb_deflate_clone.
+	* range.c (range_check): add "succ" check if first end is not a
+	  numeric.
 
-Tue Dec 28 12:26:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* range.c (range_eqq): comparison should based on "<=>".
 
-	* win32/Makefile.sub, win32/setup.mak (RDOCTARGET, install,
-	  install-nodoc, install-doc): rdoc support for mswin32.
+	* range.c (range_each): ditto.
 
-	* win32/configure.bat (--enable-install-doc, --disable-install-doc):
-	  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>
 
-Mon Dec 27 20:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/dbm/extconf.rb: header search added. [new]
 
-	* ext/tcltklib/tcltklib.c: fix SEGV bug when deleting Tk interp
+Wed May 23 02:58:21 2001  Tanaka Akira  <akr@m17n.org>
 
-	* ext/tk/lib/multi-tk.rb: ditto
+	* time.c (make_time_t): fix ad-hoc local time adjustment, using
+	  binary tree search.
 
-Mon Dec 27 16:55:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue May 22 17:10:35 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): should use
-	  rb_hash_new to get exactly a Hash. fix [ruby-dev:25325].
+	* variable.c (rb_alias_variable): should not allow variable
+	  aliasing if $SAFE >= 4.
 
-Mon Dec 27 16:29:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue May 22 02:37:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (rb_str_justify): [ruby-dev:25341]
+	* parse.y (expr): "break" and "next" to take optional expression,
+	  which is used as a value for termination. [new, experimental]
 
-Mon Dec 27 15:47:48 2004  Minero Aoki  <aamine@loveruby.net>
+	* eval.c (rb_eval): "break" can give value to terminating method.
 
-	* test/fileutils/fileasserts.rb: sync with HEAD.
+	* eval.c (rb_eval): "break" and "next" to take optional expression.
 
-	* test/fileutils/test_fileutils.rb: ditto.
+	* eval.c (rb_yield_0): "next" can give value to terminating "yield".
 
-	* test/fileutils/test_nowrite.rb: ditto.
+	* eval.c (rb_iterate): "break" can give value to terminating method.
 
-Mon Dec 27 15:21:07 2004  Minero Aoki  <aamine@loveruby.net>
+	* eval.c (proc_call): ditto.
 
-	* lib/fileutils.rb (mv): should raise error when moving a
-	  directory to the (empty) directory. [ruby-talk:124368]
-	  (backport from HEAD 1.48)
+Mon May 21 13:15:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
-	  platforms. (backport from HEAD 1.48)
+	* bignum.c (rb_big2str): t should be protected from GC.
 
-Sat Dec 25 11:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat May 19 09:29:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* stable version 1.8.2 released.
+	* process.c (rb_proc_times): need not to check return value from
+	  times(2).
 
-Sat Dec 25 04:23:49 2004  Minero Aoki  <aamine@loveruby.net>
+Fri May 18 05:36:08 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/fileutils.rb (mkdir, mkdir_p): should ensure directory
-	  permission. (backportted from HEAD, 1.47)
+	* ext/extmk.rb.in (xsystem): backout the previous fix which was
+	  bogus.
 
-	* lib/fileutils.rb (traverse, remove_dir): untaint trasted
-	  objects. (backportted from HEAD, 1.46)
+Fri May 18 05:19:55 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Sat Dec 25 01:28:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb (xsystem): make a temporary fix to get $(...) macros
+	  properly expanded on a command execution.
 
-	* io.c: cancel io_reopen() change on Dec. 24th.
+	* ext/extmk.rb.in (xsystem): ditto.
 
-	* dln.c: use <dlfcn.h> for NetBSD.  [ruby-dev:25313]
+Fri May 18 03:45:55 2001  Brian F. Feldman  <green@FreeBSD.org>
 
-	* io.c (rb_f_select): IO list could be altered.  [ruby-dev:25312]
+	* lib/mkmf.rb: unbreak "make install".  lib/* must be installed
+	  under $rubylibdir, not under $libdir.
 
-Fri Dec 24 23:51:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri May 18 01:28:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)
-	  [ruby-dev:25306]
+	* parse.y (expr): break, next, redo, retry are moved from primary.
 
-	* win32/win32.[ch]: ditto.
+Fri May 18 01:11:02 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
 
-Fri Dec 24 23:27:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/sha1/sha1-ruby.c (sha1_new): get rid of an unneeded
+	  rb_obj_call_init() call.
 
-	* ext/tk/lib/tk/image.rb: TkPhotoImage#cget bug fix
+Fri May 18 01:03:55 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
 
-Fri Dec 24 18:39:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/sha1/sha1.txt, ext/sha1/sha1.txt.jp: fix typos.
 
-	* win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
-	  [ruby-dev:25306]
+Thu May 17 19:17:11 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Dec 24 02:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/shell.rb, lib/shell/process-controller.rb,
+	  lib/shell/command-processor.rb: translate Japanese comments into
+	  English.
 
-	* io.c (io_reopen, rb_io_reopen): prohibit to change access mode for
-	  special IO ports.  [ruby-dev:25225]
+Thu May 17 19:07:14 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Dec 24 02:22:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* doc/shell.rd.jp: RD'ify and make some fixes.
 
-	* ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
+	* doc/shell.rd: RD'ify, delete Japanese leftovers, make overall
+	  English fixes, and sync with doc/shell.rd.jp.
 
-	* ext/syck/rubyext.c (syck_loader_transfer): check type conversion.
+Thu May 17 17:35:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/syck/rubyext.c (syck_parser_assign_io, rb_new_syck_node): duck
-	  typing.
+	* eval.c (rb_call0): address of local_vars might change during eval.
 
-	* ext/syck/rubyext.c (syck_parser_s_alloc, syck_parser_initialize):
-	  allocation framework.
+Thu May 17 07:27:09 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/syck/rubyext.c (syck_emitter_s_alloc, syck_emitter_initialize):
+	* 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.
 
-Fri Dec 24 01:21:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+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>
 
-	* ext/tk/lib/tkextlib/blt.rb: add BLT extension support
+	* doc/irb/irb-tools.rd.jp, doc/irb/irb.rd.jp: Convert from JIS to
+	  EUC.
 
-	* ext/tk/lib/tkextlib/blt/*.rb: ditto
+Tue May  8 03:46:39 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/tk/lib/tkextlib/blt/tile/*.rb: ditto
+	* sample/rbc.rb: Obsoleted by IRB.
 
-Thu Dec 23 23:36:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon May  7 15:58:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* process.c (proc_setgroups): check if the argument lenght is
-	  modified.  fixed: [ruby-dev:25285]
+	* parse.y (arg): "||=" should not warn for uninitialized instance
+	  variables.
 
-Thu Dec 23 13:13:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_eval): ditto.
 
-	* ext/tcltklib/tcltklib.c: define TclTkLib::COMPILE_INFO and
-	  RELEASE_DATE
+	* eval.c (eval): preserve and restore ruby_cref as well.
 
-	* ext/tcltklib/extconf.rb: ditto
+Mon May  7 15:45:48 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/tkutil.c: define TkUtil::RELEASE_DATE
+	* lib/ftools.rb (syscopy): chmod destination file only if
+	  it does not exist.
 
-	* ext/tk/lib/tk.rb: define Tk::RELEASE_DATE
+Mon May  7 14:35:57 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Dec 23 09:38:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (rb_obj_is_instance_of): takes only class/module as an
+	  argument.
 
-	* io.c (io_reopen): restore exact mode.  fixed: [ruby-core:04003]
+Sun May  6 16:27:29 2001  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Thu Dec 23 00:16:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (is_defined): rb_reg_nth_defined() may return Qnil.
 
-	* configure.in (bsdi): use $(CC) for LDSHARED.  fixed [ruby-dev:25270]
+Thu May  3 03:15:06 2001  SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
 
-Wed Dec 22 11:14:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: get --enable-shared to work on MacOS X.
 
-	* io.c (rb_io_mode_modenum): replace O_ACCMODE with O_RDWR.
-	  fixed: [ruby-dev:25273]
+	* Makefile.in: make $(LIBRUBY_SO) depend on miniruby properly.
+	  Now `make -jN' should work without a problem.
 
-Wed Dec 22 08:34:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu May  3 02:07:45 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
 
-	* ext/dl/sym.c (rb_dlsym_initialize): extract internal pointers after
-	  all argument conversion.  fixed: [ruby-dev:25271]
+	* win32/config.h.in: add SIZEOF___INT64 definition.
 
-Wed Dec 22 00:08:01 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed May  2 20:39:35 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/soap/*, test/soap/*, sample/soap/authheader/*: eval cleanup.
+	* dir.c (rb_glob, rb_globi): remove unnecessary FNM_PATHNAME.
 
-Tue Dec 21 22:07:33 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed May  2 11:46:13 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
-	  ossl_asn1_decode_all): temporary value should be marked volatile.
+	* eval.c (block_pass): should not downgrade safe level.
 
-Tue Dec 21 14:40:02 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed May  2 03:07:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
-	  ossl_asn1_decode_all): use rb_str_new4 to avoid SEGV.
-	  fix [ruby-dev:25261]
+	* ext/dbm/extconf.rb: allow specifying dbm-type explicitly.
 
-	* test/openssl/test_asn1.rb: add tests for OpenSSL::ASN1.
+	* ext/dbm/extconf.rb: avoid gdbm if possible, because it leaks
+	  memory, whereas gdbm.so doesn't.  potential incompatibility.
 
-Tue Dec 21 12:22:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May  2 02:02:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (io_reopen): keep duplex pipe in correct mode for exception
-	  safeness.  fixed: [ruby-dev:25152]
+	* string.c (rb_str_insert): new method.
 
-Tue Dec 21 12:10:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue May  1 17:55:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3-
+	* parse.y (yylex): lex_state after RESCUE_MOD should be EXPR_BEG.
 
-Tue Dec 21 00:53:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue May  1 16:23:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261]
+	* array.c (rb_ary_insert): new method.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
+	* array.c (rb_ary_update): new utility function.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): ditto.
+Tue May  1 03:24:05 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Dec 20 23:22:26 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.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.
 
-	* added files:
-	  * lib/soap/mapping/wsdl*.rb
-	  * lib/wsdl/soap/element.rb
-	  * lib/wsdl/xmlSchema/simpleContent.rb
+Tue May  1 03:07:17 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* modified files:
-	  * lib/soap/*
-	  * lib/wsdl/*
-	  * lib/xsd/*
-	  * test/soap/*
-	  * test/wsdl/*
-	  * test/xsd/*
-	  * sample/soap/*
-	  * sample/sdl/*
+	* sample/irb.rb, lib/irb.rb, lib/irb/*, doc/irb/*: Merge from irb
+	  0.7.3.
 
-	* summary
-	  * imported from the soap4r repository.  Version: 1.5.3-ruby1.8.2
+	* instruby.rb: Install help-message's too.
 
-	  * added several XSD basetype support: nonPositiveInteger,
-	    negativeInteger, nonNegativeInteger, unsignedLong, unsignedInt,
-	    unsignedShort, unsignedByte, positiveInteger
+	* lib/irb/main.rb: This file is not needed anymore.
 
-	  * HTTP client connection/send/receive timeout support.
+Fri Apr 27 09:27:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	  * HTTP client/server gzipped content encoding support.
+	* io.c (set_outfile): should check if closed before assignment.
 
-	  * improved WSDL schema definition support; still is far from
-	    complete, but is making step by step improovement.
+Thu Apr 26 22:36:11 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Mon Dec 20 22:56:39 2004  Tanaka Akira  <akr@m17n.org>
+	* configure.in:  don't use tzname on Cygwin 1.3.1+.
 
-	* gc.c (stack_end_address): gcc noinline attribute is available since
-	  gcc-3.1.
+	* configure.in: add -mieee/-ieee to CFLAGS on OSF1/Alpha
+	  to disable "DIVISION BY ZERO" exception.
 
-Mon Dec 20 14:07:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Apr 26 22:30:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: supports new features of Tcl/Tk8.5a2
+	* eval.c (rb_eval): should preserve value of ruby_errinfo.
 
-	* ext/tk/lib/tk/clock.rb: ditto
+Thu Apr 26 10:36:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/text.rb: ditto
+       * eval.c (rb_thread_schedule): infinite sleep should not cause
+	  dead lock.
 
-	* ext/tk/lib/tk/panedwindow.rb: ditto
+Wed Apr 25 16:40:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Dec 20 12:47:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* array.c (rb_ary_flatten_bang): proper recursive detection.
 
-	* ext/openssl/lib/net/https.rb,protocols.rb,telnets.rb: delete
-	  doc and code about SSLContext#{key_file,cert_file}.
-	  fixed: [ruby-dev:25243]
+Wed Apr 25 15:36:15 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-Mon Dec 20 12:42:17 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+       * eval.c (yield_under): need not to prohibit at safe level 4.
 
-	* io.c (io_fwrite): workaround for MSVCRT's bug.
-	  fixed: [ruby-core:03982]
+Wed Apr 25 15:22:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Dec 20 11:21:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* pack.c (pack_pack): p/P packs nil into NULL.
 
-	* io.c (rb_io_eof): check if closed before clearerr().
-	  fixed: [ruby-dev:25251]
+	* pack.c (pack_unpack): p/P unpacks NULL into nil.
 
-Mon Dec 20 03:30:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 24 15:35:32 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/cgi/session.rb (CGI::Session#initialize): empty session id was
-	  used if request had no session key.  fixed: [ruby-core:03981]
+	* pack.c (pack_pack): size check for P template.
 
-Mon Dec 20 01:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.c (set_arg0): wrong predicate when new $0 value is bigger
+	  than original space.
 
-	* struct.c (make_struct): [ruby-dev:25249]
+Tue Apr 24 15:18:49 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Dec 20 00:28:20 2004  Kouhei Sutou  <kou@cozmixng.org>
+	* ext/extmk.rb.in, lib/mkmf.rb: (dir_config) do not add the
+	  specified include directory if already included in $CPPFLAGS.
 
-	* lib/rexml/encodings/SHIFT-JIS.rb: backported from CVS HEAD.
+	* ext/extmk.rb.in, lib/mkmf.rb: (dir_config) return a more useful
+	  value, [include_dir, lib_dir].
 
-	* lib/rexml/encodings/SHIFT_JIS.rb: ditto.
+Mon Apr 23 14:43:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Dec 19 17:19:48 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* gc.c (id2ref): should use NUM2ULONG()
 
-	* ext/openssl/ossl_x509store.c
-	  (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
-	  (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
+	* object.c (rb_mod_const_get): check whether name is a class
+	  variable name.
 
-	* test/openssl/ossl_x509store.rb: test certificate validity times.
+	* object.c (rb_mod_const_set): ditto.
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
-	  second argument to specify the output format (see also
-	  X509_NAME_print_ex).
+	* object.c (rb_mod_const_defined): ditto.
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
-	  OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
-	  OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
+Sat Apr 21 22:33:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
-	  new module to provide the parse for RFC2253 DN format.
+	* marshal.c (w_float): precision changed to "%.16g"
 
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
-	  new method to parse RFC2253 DN format.
+Sat Apr 21 22:07:58 2001  Guy Decoux  <decoux@moulon.inra.fr>
 
-	* test/openssl/ossl_x509name.rb: add tests about RFC2253 DN.
+	* eval.c (rb_call0): wrong retry behavior.
 
-	* text/openssl/ssl_server.rb: try to listen ports from 20443 to 20542
-	  while EADDRINUSE is raised.
+Fri Apr 20 19:12:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* all changes in this entry are backport from 1.9.
+	* numeric.c (fix_aref): a bug on long>int architecture.
 
-Sun Dec 19 17:24:59 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 20 14:57:15 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* configure.in (enable_rpath): use rpath flag to embed the library
-	  path into extensions on ELF environment.  [ruby-dev:25035]
+	* eval.c (rb_eval_string_wrap): should restore ruby_wrapper.
 
-Sun Dec 19 11:01:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Apr 22 17:44:37 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/test/unit.rb: use standalone runner for -e.
+	* configure.in: add -mieee to CFLAGS on Linux/Alpha
+	  to disable "DIVISION BY ZERO" exception.
 
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): accept
-	  multiple -p and -x options.
+	* configure.in: remove -ansi on OSF/1.
 
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#recursive_collect):
-	  ditto.
+Wed Apr 18 04:37:51 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-Sat Dec 18 16:36:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/cgi.rb: CGI::Cookie: no use PATH_INFO.
 
-	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate):
-	  disallow interrupt by type conversion.  fixed: [ruby-dev:25226]
+Wed Apr 18 00:24:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Dec 18 15:16:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* regex.c (re_compile_pattern): char class at either edge of range
+	  should be invalid.
 
-	* lib/webrick/httpauth.rb,
-	  lib/webrick/httpauth/{basicauth.rb,digestauth.rb}: use
-	  pack/unpack-template char "m" instead of lib/base64.rb to do base64
-	  encoding/decoding.
+Tue Apr 17 17:33:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Dec 18 10:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (handle_rescue): use === to compare exception match.
 
-	* dir.c (dir_open_dir): new function.  [ruby-dev:25242]
+	* error.c (syserr_eqq): comparison between SytemCallErrors should
+	  based on their error numbers.
 
-Fri Dec 17 18:07:01 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Apr 17 16:54:39 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* test/readline/test_readline.rb: fix for BSD. Thanks, GOTOU Yuuzou.
-	  fixed: [ruby-dev:25218]
+	* eval.c (safe_getter): should use INT2NUM().
 
-Fri Dec 17 16:28:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Apr 17 15:12:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: fix bug on setting up system encoding
+	* bignum.c (rb_big2long): 2**31 cannot fit in 31 bit long.
 
-	* ext/tk/lib/tk/event.rb: fix error on require process
+Sat Apr 14 22:46:43 2001  Guy Decoux  <decoux@moulon.inra.fr>
 
-	* ext/tk/lib/tk/font.rb: fix abnormal termination error on Windows
+	* regex.c (calculate_must_string): wrong length calculation.
 
-	* ext/tk/lib/tk/virtevent.rb: TkVirtualEvent::PreDefVirtEvent.new()
-	  accepts event-sequence arguments
+Sat Apr 14 13:37:32 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
 
-	* ext/tk/lib/tk/text.rb: fail to dump embedded images
+	* win32/config.status.in: no longer use missing/alloca.c.
 
-	* ext/tk/lib/tk/text.rb: tag_nextrange and tag_prevrange returns wrong
-	  types of values
+	* win32/Makefile.sub: ditto.
 
-	* ext/tk/lib/tk/texttag.rb: nextrange and prevrange returns wrong
-	  types of values
+Fri Apr 13 12:40:48 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* ext/tk/lib/tk/text.rb: add TkText::IndexModMethods module and
-	  TkText::IndexString class to treat text index modifiers
+	* eval.c (rb_thread_start_0): fixed memory leak.
 
-	* ext/tk/lib/tk/texttag.rb: use TkText::IndexModMethods module
+Fri Apr 13 16:41:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/textmark.rb: ditto
+	* parse.y (none): should clear cmdarg_stack too.
 
-	* ext/tk/lib/tk/textimage.rb: ditto
+Fri Apr 13 06:19:29 2001  GOTOU YUUZOU  <gotoyuzo@notwork.org>
 
-	* ext/tk/lib/tk/textwindow.rb: ditto
+	* io.c (rb_fopen): use setvbuf() to avoid recursive malloc() on
+	  some platforms.
 
-	* ext/tk/lib/tk/textimage.rb: wrong gravity of text mark for embedded
-	  image
+Wed Apr 11 23:36:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/textwindow.rb: wrong gravity of text mark for
-	  embedded window
+	* file.c (rb_stat_dev): device functions should honor stat field
+	  types (except long long such as dev_t).
 
-Fri Dec 17 13:50:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+Wed Apr 11 18:07:53 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
-	  for VMS port are added.
+	* eval.c (rb_mod_nesting): should not push nil for nesting array.
 
-	* eval.c (ruby_init): change to call VMS private intialization routine.
+	* eval.c (rb_mod_s_constants): should not search array by
+	  rb_mod_const_at() for nil (happens for singleton class).
 
-Fri Dec 17 13:33:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 11 13:29:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/cgi/session.rb (CGI::Session#initialize): control adding
-	  session_id hidden fields.  fixed: [ruby-talk:123850]
+	* class.c (rb_singleton_class_attached): should modify iv_tbl by
+	  itself, no longer use rb_iv_set() to avoid freeze check error.
 
-Thu Dec 16 23:25:25 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* variable.c (rb_const_get): error message "uninitialized constant
+	  Foo at Bar::Baz" instead of "uninitialized constantBar::Baz::Foo".
 
-	* lib/drb/drb.rb, lib/drb/ssl.rb: backported from CVS HEAD.
-	  [druby-ja:101]
+Tue Apr 10 17:52:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/drb/test_drb.rb: adjust and reduce sleep (backported from
-	  CVS HEAD.)
+	* eval.c (rb_mod_included): new hook called from rb_mod_include().
 
-Thu Dec 16 18:44:58 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Apr 10 02:24:40 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
-	  for reading request till data arrive. [ruby-talk:121068]
+	* io.c (opt_i_set): should strdup() inplace_edit string.
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
-	  should log about all accepted socket. [ruby-core:03962]
+Mon Apr  9 23:29:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
-	  "%%" and "%u" are supported. [webricken:135]
+	* eval.c (exec_under): need to push cref too.
 
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#check_filename):
-	  :NondisclosureName is acceptable if it is Enumerable.
+Mon Apr  9 15:20:21 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/config.rb (WEBrick::Config::FileHandler):
-	  default value of :NondisclosureName is [".ht*", "*~"].
+	* eval.c (rb_f_missing): raise NameError for "undefined local
+	  variable or method".
 
-Thu Dec 16 18:36:52 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* error.c (Init_Exception): new exception NoMethodError.
+	  NameError moved under ScriptError again.
 
-	* ext/openssl/ossl.c (ossl_raise): refine message format.
+	* eval.c (rb_f_missing): use NoMethodError instead of NameError.
 
-Thu Dec 16 16:29:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Apr  9 12:05:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/sample/demos-en/widget: modify version check for
-	  supporting features
+	* file.c (Init_File): should redifine "new" class method.
 
-Thu Dec 16 16:03:50 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Apr  9 11:56:52 2001  Shugo Maeda <shugo@ruby-lang.org>
 
-	* ext/tk/lib/tk/bindtag.rb: bug fix [ruby-talk: 123667]
+	* lib/net/imap.rb: fix typo.
 
-	* ext/tk/lib/tk/timer.rb: accept :idle for the interval argument
+Fri Apr  6 01:46:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: add TkComm._callback_entry?()
+	* eval.c (PUSH_CREF): sharing cref node was problematic.  maintain
+	  runtime cref list instead.
 
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp.cb_entry_class
+	* eval.c (rb_eval): copy defn node before registering.
 
-	* ext/tk/lib/tk/canvas.rb: use TkComm._callback_entry?()
+	* eval.c (rb_load): clear ruby_cref before loading.
 
-	* ext/tk/lib/tk/canvastag.rb: ditto
+Thu Apr  5 22:40:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/dialog.rb: ditto
+	* variable.c (rb_const_get): no recursion to show full class path
+	  for modules.
 
-	* ext/tk/lib/tk/optiondb.rb: ditto
+	* eval.c (rb_set_safe_level): should set safe level in curr_thread
+	  as well.
 
-	* ext/tk/lib/tk/text.rb: ditto
+	* eval.c (safe_setter): ditto.
 
-	* ext/tk/lib/tk/texttag.rb: ditto
+Thu Apr  5 13:46:06 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* ext/tk/lib/tk/textwindow.rb: ditto
+	* object.c (rb_obj_is_instance_of): nil belongs to false, not true.
 
-	* ext/tk/lib/tk/timer.rb: ditto
+Thu Apr  5 02:19:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/validation.rb: ditto
+	* time.c (make_time_t): proper (I hope) daylight saving time
+	  handling for both US and Europe.  I HATE DST!
 
-	* ext/tk/lib/tkextlib/*: ditto
+	* eval.c (rb_thread_wait_for): non blocked signal interrupt should
+	  stop the interval.
 
-Thu Dec 16 03:14:28 2004  Minero Aoki  <aamine@loveruby.net>
+Wed Apr  4 03:47:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/net/http.rb (basic_encode): return value of pack('m') may
-	  include multiple CR/LFs.  Backported from main trunk (rev 1.112).
-	  [ruby-dev:25212]
+	* eval.c (proc_eq): class check aded.
 
-Thu Dec 16 00:33:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (proc_eq): typo fixed ("return" was ommitted).
 
-	* hash.c (Init_Hash): remove custom "hash" and "eql?".
+	* error.c (Init_Exception): move NameError under StandardError.
 
-Wed Dec 15 18:57:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* class.c (rb_mod_clone): should copy method bodies too.
 
-	* lib/set.rb (Set::eql): wrong definition.  [ruby-dev:25207]
+	* bignum.c (bigdivrem): should trim trailing zero bdigits of
+	  remainder, even if dd == 0.
 
-Wed Dec 15 18:48:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* file.c (check3rdbyte): safe string check moved here.
 
-	* ext/curses/curses.c (window_subwin): call NUM2INT() before
-	GetWINDOW(). (backported from CVS HEAD)
+Tue Apr  3 09:56:20 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Wed Dec 15 17:03:50 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/extmk.rb.in (create_makefile): create def file only if
+	  it does not yet exist.
 
-	* win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
-	  isatty because it never sets errno. (backported from CVS HEAD)
+	* lib/mkmf.rb: ditto.
 
-Wed Dec 15 15:39:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Apr  3 00:05:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): avoid SEGV
-	  (rollback the previous commit).
+	* time.c (make_time_t): remove HAVE_TM_ZONE code since it
+	  sometimes reports wrong time.
 
-Wed Dec 15 16:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* time.c (make_time_t): remove unnecessary range check for
+	  platforms where negative time_t is available.
 
-	* object.c (rb_obj_id_obsolete): warn always.
+Mon Apr  2 16:52:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_enable_super): ditto.
+	* process.c (proc_waitall): should push Process::Status instead of
+	  Finuxm status.  
 
-Wed Dec 15 15:31:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* process.c (waitall_each): should add all entries in pid_tbl.
+	  these changes are inspired by Koji Arai.  Thanks.
 
-	* lib/set.rb (Set#==): [ruby-dev:25206]
+	* process.c (proc_wait): should not iterate if pid_tbl is 0.
 
-Wed Dec 15 14:22:10 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* process.c (proc_waitall): ditto.
 
-	* win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
-	  fixed: [ruby-core:03959]
+Mon Apr  2 14:25:49 2001  Shugo Maeda <shugo@ruby-lang.org>
 
-Wed Dec 15 10:30:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/monitor.rb (wait): ensure reentrance.
 
-	* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]
+	* lib/monitor.rb (wait): fix timeout support.
 
-Tue Dec 14 17:10:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Apr  2 12:40:45 2001  Shugo Maeda <shugo@ruby-lang.org>
 
-	* win32/win32.c (rb_w32_close): need to reset osfhnd().
+	* lib/net/imap.rb (media_subtype): return subtype.
 
-Tue Dec 14 14:03:57 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Apr  2 12:01:15 2001  Shugo Maeda <shugo@ruby-lang.org>
 
-	* ext/openssl/ossl.c (ossl_raise): avoid buffer overrun.
-	  [ruby-dev:25187]
+	* lib/net/imap.rb (flag_list): capitalize flags.
 
-Tue Dec 14 12:36:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Apr  2 01:32:38 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/cgi/session.rb (CGI::Session::initialize): generate new
-	  session if given session_id does not exist.  [ruby-list:40368]
+	* Makefile.in: Introduce MAINLIBS.
 
-Mon Dec 13 18:13:52 2004  Tanaka Akira  <akr@m17n.org>
+	* 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.
 
-	* gc.c (stack_end_address): new function to obtain stack end address.
-	  stack_end_address calls __builtin_frame_address(0) to obtain the
-	  frame pointer of a stack frame of stack_end_address.  The address
-	  is the stack pointer of the caller's stack frame.
-	  (SET_STACK_END): use stack_end_address.
-	  This makes the conservative garbage collector to scan a stack frame
-	  of the garbage_collect function itself.  This is required because
-	  callee-save registers may be stored in the frame.
-	  [ruby-dev:25158]
+Mon Apr  2 01:16:24 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Mon Dec 13 00:58:02 2004  Tanaka Akira  <akr@m17n.org>
+	* win32/win32.c: use ruby's opendir on mingw32.
 
-	* lib/pathname.rb (cleanpath_aggressive): make it private.
-	  (cleanpath_conservative): ditto.
-	  Suggested by Daniel Berger.  [ruby-core:3914]
+	* win32/dir.h, dir.c, Makefile: ditto.
 
-Sun Dec 12 20:06:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Apr  1 23:26:14 2001  TOYOFUKU Chikanobu  <toyofuku@juice.or.jp>
 
-	* lib/drb/drb.rb: backported from CVS HEAD.
+	* numeric.c (flodivmod): a bug in no fmod case.
 
-Sun Dec 12 10:35:10 2004  Dave Thomas  <dave@pragprog.com>
+Sun Apr  1 18:36:14 2001  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Don't
-	  show an accessor's r/w flag if none was specified
+	* process.c (pst_wifsignaled): should apply WIFSIGNALED for status
+	  (int), not st (VALUE).
 
-Sun Dec 12 10:14:03 2004  Dave Thomas  <dave@pragprog.com>
+Sat Mar 31 04:47:55 2001  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/rdoc/rdoc.rb (RDoc::RDoc::parse_files): Never exclude files
-	  explicitly given on the command line.
+	* lib/net/imap.rb: add document and example code.
 
-Sun Dec 11 23:54:07 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Mar 31 03:24:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
-	  (see ext/tk/ChangeLog.tkextlib).
+	* io.c (Init_IO): value of $/ and $\ are no longer restricted to
+	  strings.  type checks are done on demand.
 
-	* ext/tk/sample/scrollframe.rb: add a new sample.
+	* class.c (rb_include_module): module inclusion should be check
+	  taints.
 
-Sat Dec 11 20:12:21 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* ruby.h (STR2CSTR): replace to StringType() and StringTypePtr().
 
-	* lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
-	  [ruby-list:40390]
+	* ruby.h (rb_str2cstr): ditto.
 
-	* test/drb/drbtest.rb: ditto.
+Fri Mar 30 23:37:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/drb/ut_drb.rb: ditto.
+	* eval.c (rb_load): should not copy toplevel local variables.  It
+	  cause variable/method ambiguity.  Thanks to L. Peter Deutsch.
 
-Sat Dec 11 15:38:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Mar 30 22:56:56 2001  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/jcode.rb (String::succ): [ruby-dev:25156]
+	* lib/net/imap.rb: rename ContinueRequest to ContinuationRequest.
 
-Sat Dec 11 12:41:55 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Mar 30 12:51:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (run_trap_eval): prototype; avoid VC++ warnings.
+	* class.c (rb_include_module): freeze check at first.
 
-	* ext/socket/getaddrinfo.c: fix typo. fixed: [ruby-core:03947]
+Thu Mar 29 17:05:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c: need to include dln.h.
+	* eval.c (rb_attr): sprintf() and rb_intern() moved into
+	  conditional body.
 
-Sat Dec 11 00:10:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Mar 28 23:43:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* io.c (io_reopen): [ruby-dev:25150]
+	* ext/extmk.rb.in, lib/mkmf.rb: add C++ rules in addition to C
+	  rules for the mswin32 platforms.
 
-Fri Dec 10 08:39:27 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 28 19:29:21 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/socket/socket.c (sock_listen): get OpenFile just before calling
-	  listen(2).  fixed: [ruby-dev:25149]
+	* ext/extmk.rb.in, lib/mkmf.rb: move C++ rules to the right place.
 
-Thu Dec  9 17:00:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+Wed Mar 28 17:39:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/socket/socket.c, ext/socket/getaddrinfo.c: port to VMS
+	* object.c (rb_str2cstr): warn if string contains \0 and length
+	  value is ignored.
 
-Thu Dec  9 16:31:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Mar 28 15:00:31 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* ext/sdbm/init.c (GetDBM): typo.
+	* class.c (rb_singleton_class_clone): should copy class constant
+	  table as well.
 
-Thu Dec  9 16:05:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+Wed Mar 28 14:23:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* defines.h: change path of vms.h
-	* vms/vms.h: delete reference for snprintf()
-	* vms/config.h: new file
-	* vms/config.h_in: deleted
+	* class.c (rb_include_module): sometimes cache was mistakenly left
+	  uncleared - based on the patch by K.Kosako.
 
-Thu Dec  9 14:38:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.h: all Check_SafeStr()'s are replaced by SafeStr() to
+	  ensure 'to_str' be always effective.
 
-	* string.c (rb_str_inspect): escape # which starts an expression
-	  substitution.  fixed: [ruby-core:03922]
+Wed Mar 28 09:52:33 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* string.c (rb_str_dump): not escape # which isn't a substitution.
+	* win32/Makefile.sub: disable global optimization.
 
-Thu Dec  9 10:54:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Mar 27 15:00:54 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* ext/dbm/dbm.c (fdbm_select): [ruby-dev:25132]
+	* eval.c (rb_mod_define_method): should have clear method cache.
 
-	* ext/sdbm/init.c: ditto.
+	* eval.c (rb_mod_define_method): should have raised exception for
+	  type error.
 
-	* ext/gdbm/gdbm.c: ditto.
+Tue Mar 27 14:48:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Dec  9 03:08:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ruby.h: changed "extern INLINE" to "static inline".
 
-	* ext/tcltklib/tcltklib.c (ip_init): set root-win title to "ruby" when
-	  the running script is '-e one-liner' or '-' (stdin).
+Mon Mar 26 23:19:33 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tcltklib/extconf.rb: add find_library("#{lib}#{ver}",..) for
-	  stub libs
+	* time.c (rb_strftime): check whether strftime returns empty string.
 
-	* ext/tk/lib/tk/textmark.rb: TkTextMarkCurrent and TkTextMarkAnchor
-	  have a wrong parent class.
+Mon Mar 26 21:16:56 2001  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/tk/lib/tk/dialog.rb: rename TkDialog2 --> TkDialogObj and
-	  TkWarning2 --> TkWarningObj (old names are changed to alias names)
+	* lib/net/imap.rb: supports response handlers and multiple commands.
 
-	* ext/tk/lib/tk/dialog.rb: bug fix of treatment of 'prev_command'
-	  option and hashes for configuration
+Mon Mar 26 17:21:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/dialog.rb: add TkDialogObj#name to return the
-	  button name
+	* eval.c: remove TMP_PROTECT_END to prevent C_ALLOCA crash.
 
-	* ext/tk/lib/tk/radiobutton.rb: rename enbugged method value() ==>
-	  get_value() and value=(val) ==> set_value(val).
+Mon Mar 26 14:04:41 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/lib/tk/menu.rb: add TkMenu.new_menuspec
+	* ext/Win32API/Win32API.c: remove Init_win32api().
 
-	* ext/tk/lib/tk/menu.rb: add alias (TkMenuButton = TkMenubutton,
-	  TkOptionMenuButton = TkOptionMenubutton)
+Sun Mar 25 16:52:48 2001  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* ext/tk/lib/tk/event.rb: new method aliases (same as option keys of
-	  event_generate) for Event object
+	* file.c (rb_file_flock): do not trap EINTR.
 
-	* ext/tk/lib/tk/font.rb: configinfo returns proper types of values
+	* missing/flock.c (flock): returns the value from lockf(2)
+	  directly.
 
-	* ext/tk/lib/tk.rb: bind methods accept subst_args + block
+Sat Mar 24 23:44:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/canvas.rb: ditto
+	* eval.c (ev_const_defined): should ignore toplevel cbase (Object).
 
-	* ext/tk/lib/tk/canvastag.rb: ditto
+	* eval.c (ev_const_get): ditto.
 
-	* ext/tk/lib/tk/frame.rb: ditto
+Fri Mar 23 17:37:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/text.rb: ditto
+	* ext/md5/md5.h: replace by independent md5 implementation
+	  contributed by L. Peter Deutsch (thanks).
 
-	* ext/tk/lib/tk/texttag.rb: ditto
+	* ext/md5/md5init.c: adopted to Deutsch's md5 implementation.
 
-	* ext/tk/lib/tk/toplevel.rb: ditto
+Fri Mar 23 17:26:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/*: ditto and bug fix
+	* pack.c (pack_unpack): string from P/p should be tainted.
 
-Wed Dec  8 23:54:29 2004  Dave Thomas  <dave@pragprog.com>
+Fri Mar 23 12:18:44 2001  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
 
-	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Typo
-	  meant that h2 tag was invisible.
+	* ext/curses/curses.c: curses on Mac OS X public beta does not
+	  have _maxx etc.
 
-Wed Dec  8 21:56:31 2004  Kouhei Sutou  <kou@cozmixng.org>
+Fri Mar 23 10:50:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss, test/rss, sample/rss: backported from CVS HEAD.
+	* marshal.c (w_object): should truncate trailing zero short for
+	  bignums.
 
-Wed Dec  8 14:31:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Mar 23 09:49:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (io_fwrite): change dereference for cosmetic reason.
+	* object.c (sym_intern): new method.
 
-	* sprintf.c (rb_f_sprintf): [ruby-dev:25104]
+Thu Mar 22 22:15:45 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Dec  7 19:08:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+	* ext/Win32API/extconf.rb: add -fno-omit-frame-pointer.
 
-	* io.c (io_fwrite): fix offset incrementation (for VMS and Human68k)
+Thu Mar 22 18:17:36 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Dec  7 00:27:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_mod_nesting): should not include Object at the
+	  toplevel.
 
-	* process.c (proc_setgroups): [ruby-dev:25081]
+Thu Mar 22 17:43:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Dec  6 18:08:10 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.h: better inline function support.
 
-	* re.c (rb_reg_eqq): document fix.  [ruby-talk:122541]
+	* configure.in (NO_C_INLINE): check if inline is available for the
+	  C compiler.
 
-Mon Dec  6 17:19:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar 19 11:03:10 2001  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* rubysig.h (TRAP_BEG, TRAP_END): safe errno around CHECK_INTS.
-	  (backported from CVS HEAD)  [ruby-dev:24993]
+	* marshal.c (r_object): len calculation patch was wrong for
+	  machines SIZEOF_BDIGITS == SIZEOF_SHORT.
 
-Mon Dec  6 10:18:17 2004  Dave Thomas  <dave@pragprog.com>
+	* gc.c: alloca prototype reorganized for C_ALLOCA machine.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in):
-	  Oops - 1.8 doesn't have String#clear
+Wed Mar 21 23:07:45 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Mon Dec  6 09:59:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c (win32_stat): WinNT/2k "//host/share" support.
 
-	* ext/socket/socket.c (sock_connect): use rb_str_new4().
-	  [ruby-dev:25052]
+Wed Mar 21 08:05:35 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Mon Dec  6 01:42:08 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* win32/dir.h: replace missing/dir.h .
 
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
-	  ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
-	  ossl_rsa_private_decrypt): should take an optional argument
-	  to specify padding mode. [ruby-talk:122539]
+	* win32/win32.h: ditto.
 
-	* ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): add new constants
-	  PKCS1_PADDING, SSLV23_PADDING, NO_PADDING and PKCS1_OAEP_PADDING
-	  under OpenSSL::PKey::RSA.
+	* win32/win32.c: ditto.
 
-	* test/openssl/test_pkey_rsa.rb: new file.
+Wed Mar 21 01:26:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Dec  5 19:39:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (id2ref): sometimes confused symbol and reference.
 
-	* lib/optparse.rb (OptionParser::Completion#complete): new parameter
-	  to direct case insensitiveness.
+Tue Mar 20 23:09:33 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/optparse.rb (OptionParser#order!): ignore case only for long
-	  option.  [ruby-dev:25048]
+	* win32/win32.c (win32_stat): UNC support.
 
-Sat Dec  4 22:54:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* dir.c (extract_path): fix "./*" problem.
 
-	* io.c (io_write): remove rb_str_locktmp().  [ruby-dev:25050]
+Tue Mar 20 15:10:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (io_fwrite): takes VALUE string as an argument.
-	  [ruby-dev:25050]
+	* dir.c (glob_helper): breaks loop after calling recusive
+	  glob_helper; all wild cards should be consumed; no need for
+	  further match.
 
-	* ext/socket/socket.c (sock_connect): remove rb_str_locktmp().
-	  [ruby-dev:25050]
+	* dir.c (dir_s_glob): gives warning if no match found.
 
-	* ext/socket/socket.c (udp_connect): [ruby-dev:25045]
+Tue Mar 20 14:13:45  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* ext/socket/socket.c (udp_bind): ditto.
+	* object.c (sym_inspect): did allocate extra byte space.
 
-	* ext/socket/socket.c (udp_send): ditto.
+Mon Mar 19 19:14:47 2001  Guy Decoux  <decoux@moulon.inra.fr>
 
-	* ext/socket/socket.c (bsock_send): ditto.
+	* marshal.c (shortlen): shortlen should return number of bytes
+	  written.
 
-	* ext/socket/socket.c (s_recvfrom): ditto.
+Mon Mar 19 16:52:23 2001  K.Kosako  <kosako@sofnec.co.jp>
 
-	* hash.c (rb_hash_hash): should provide "hash" method where "eql?"
-	  is redefined.  [ruby-talk:122482]
+	* eval.c (ev_const_defined): need not to check if cbase->nd_class
+	  is rb_cObject.
 
-Sat Dec  4 14:54:52 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (ev_const_get): ditto.
 
-	* eval.c (proc_invoke): use volatile `tmp' rather than `args'.
-	  [ruby-core:03882]
+Mon Mar 19 17:11:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Dec  4 14:28:56 2004  Dave Thomas  <dave@pragprog.com>
+	* time.c (time_zone): return "UTC" for UTC time objects.
 
-	* lib/rdoc/code_objects.rb (RDoc::Context::Section::set_comment):
-	  Section comments may now be bracketed by lines which are
-	  ignored. You can now write
-	      # -----------
-	      # :section: Dave's Section
-	      # comment material
-	      # -----------
-	   The lines before :section: are removed, and identical lines at the end are
-	   also removed if present.
+Mon Mar 19 16:27:32 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Dec  4 03:33:45 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* eval.c (THREAD_ALLOC): flags should be initialized.
 
-	* ext/readline/readline.c: check $SAFE. (backported from CVS HEAD)
+	* signal.c (rb_f_kill): should use FIX2INT, not FIX2UINT.
 
-	* test/readline/test_readline.rb: added tests for readline.
-	  (backported from CVS HEAD)
+Mon Mar 19 10:55:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Dec  4 02:24:00 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+	* dir.c (glob_helper): replace lstat() by stat() to follow symlink
+	  in the case like 'symlink/*'.
 
-	* ext/nkf/nkf.c: add constant NKF::VERSION
+	* dir.c (glob_helper): gave warning too much.
 
-	* ext/nkf/nkf.c(guess): this becomes an alias of guess2
+Sun Mar 18 08:58:18 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* ext/nkf/test.rb(mime_out2): add --no-cp932
+	* lib/cgi.rb: // === '' --> //.match('')
 
-	* ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
+	* lib/cgi.rb: cgi#header(): improvement for mod_ruby.
 
-Sat Dec  4 00:35:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/cgi.rb: cgi#rfc1123date(): improvement.
+	  thanks to TADA Tadashi <sho@spc.gr.jp>.
 
-	* ext/socket/socket.c (bsock_setsockopt): [ruby-dev:25039]
+	* lib/cgi.rb: cgi#rfc1123date(): document bug fix.
+	  thanks to Kazuhiro NISHIYAMA <zn@mbf.nifty.com>.
 
-Fri Dec  3 18:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/cgi.rb: cgi#header(): bug fix.
+	  thanks to IWATSUKI Hiroyuki <don@na.rim.or.jp>.
 
-	* lib/ostruct.rb: 1.9 marshaling support back-ported.
-	  [ruby-core:03871]
+Sat Mar 17 11:11:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Dec  3 13:45:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* dir.c (glob_helper): * should follow symlink, whereas ** should
+	  not follow.
 
-	* eval.c (proc_invoke): copy arguments to frame.argv.
-	  [ruby-core:03861]
+Thu Mar 15 01:28:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Dec  3 12:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c (dir_s_chdir): block form of Dir.chdir. (RCR#U016).
 
-	* st.h: fix prototypes.
+Fri Mar 16 17:14:17 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Dec  3 00:21:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.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.
 
-	* object.c (convert_type): use rb_respond_to() again.
-	  [ruby-dev:25021]
+Wed Mar 14 16:41:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_respond_to): funcall respond_to? if it's redefined.
-	  [ruby-dev:25021]
+	* eval.c (rb_thread_schedule): raise FATAL just once to
+	  THREAD_TO_KILL.
 
-Fri Dec  3 01:55:24 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Mar 14 10:41:34 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: widget configuration by TkWindow#method_missing
-	  returns proper object. "widget.option = val" returns val, and
-	  "widget.option(val)" returns self.
+	* eval.c (rb_yield_0): 0 (= Qfalse) is a valid value, so that
+	  default self should be checked by klass == 0.
 
-	* ext/tk/lib/tk/font.rb: TkFont#replace accepts only one font argument.
+	* bignum.c (rb_cstr2inum): should disallow '++1', '+-1', etc.
 
-	* ext/tk/lib/tk/radiobutton.rb: add TkRadiobutton#value and
-	  TkRadiobutton#value=(val).
+Tue Mar 13 17:51:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/spinbox.rb: callback substitution support on
-	  command option.
+	* eval.c (ev_const_defined): add new parameter self for special
+	  const fallback.
 
-	* ext/tk/sample/demos-en/widget: bug fix (wrong image height)
+	* eval.c (ev_const_get): ditto.
 
-	* ext/tk/sample/demos-jp/widget: ditto.
+Tue Mar 13 16:39:45 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Fri Dec  3 00:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* dir.c (rb_glob_helper): fix drive letter handling on DOSISH.
 
-	* io.c (rb_file_initialize): [ruby-dev:25032]
+Tue Mar 13 14:54:39 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Thu Dec  2 16:41:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/http.rb: add HTTPRequest#basic_auth.
 
-	* eval.c (rb_protect): prevent continuations created inside from being
-	  called from the outside.  [ruby-dev:25003]
+	* lib/net/smtp.rb: raise if only account or password is given.
 
-	* eval.c (rb_callcc, rb_cont_call): prohibit calling from different
-	  signal contexts.  [ruby-dev:25022]
+	* lib/net/protocol.rb: WriteAdapter#<< returns self.
 
-Thu Dec  2 09:57:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Mar 13 14:41:16 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/ostruct.rb (OpenStruct::Marshaler): OpenStruct can be
-	  marshaled again.  [ruby-core:03862]
+	* io.c (argf_seek_m): wrong calling sequence of rb_io_seek().
 
-Thu Dec  2 09:30:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 13 09:14:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (thread_mark): mark thread group.  [ruby-dev:25020]
+	* parse.y (cond0): no special treatment of string literal in
+	  condition.
 
-	* eval.c (thgroup_add): check whether the argument is really a Thread.
+Mon Mar 12 18:59:38 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Dec  2 07:57:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb (create_makefile): save/restore $libs and $LIBPATH.
 
-	* io.c (rb_io_ctl): [ruby-dev:25019]
+Sun Mar 11 18:13:34 2001  Masahiro Tanaka  <masa@stars.gsfc.nasa.gov>
 
-Wed Dec  1 02:21:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* math.c: add acos, asin, atan, conh, sinh, tanh and hypot to Math.
 
-	* signal.c (sighandler): call handler immediately only for default
-	  handlers.  [ruby-dev:25003]
+	* configure.in: check hypot availablility.
 
-Tue Nov 30 23:38:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* missing/hypot.c: public domain rewrite of hypot.
 
-	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
+Sun Mar 11 13:21:04 2001  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* io.c (read_all): remove unnecessary rb_str_resize().
-	  [ruby-dev:24996]  (backported from CVS HEAD)
+	* parse.y (warn_unless_e_option): warning condition was wrong.
 
-	* io.c (io_readpartial): ditto.
+	* parse.y (warning_unless_e_option): ditto.
 
-	* io.c (io_read): ditto.
+Sun Mar 11 00:55:31 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Nov 30 16:18:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb (install_rb): fix handling of destination path.
 
-	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
+Sat Mar 10 22:56:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (read_all): remove unnecessary rb_str_resize().
-	  [ruby-dev:24996]
+	* enum.c (enum_all): new method 'all?', which returns true if
+	  block returns true for all elements.
 
-	* io.c (io_read): ditto.
+	* enum.c (enum_any): new method 'any?', which returns true if
+	  block returns true for any of elements.
 
-Tue Nov 30 00:49:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Mar 10 02:34:18 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* io.c (rb_io_sysread): use temporary lock.  [ruby-dev:24992]
+	* math.c (math_log, math_log10): use nan() instead of 0.0/0.0 on Cygwin.
 
-Mon Nov 29 16:06:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Mar  9 09:56:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/stringio/stringio.c (strio_write): insufficiently filled string
-	  being extended when overwriting.  [ruby-core:03836]
+	* marshal.c (marshal_load): do not give warning unless explicitly
+	  set to verbose.
 
-Mon Nov 29 15:59:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Mar  9 02:07:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/ostruct.rb (OpenStruct::method_missing): check method
-	  duplication for -d.
+	* eval.c (rb_exit): give string value "exit" to SystemExit.
 
-	* lib/ostruct.rb (OpenStruct::initialize): ditto.
+	* ruby.c (proc_options): -v should not print version if
+	  proc_options called via moreswitches().
 
-Mon Nov 29 15:22:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar  8 17:45:19 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* test/io/nonblock/test_flush.rb: abandon tests when io/nonblock is
-	  not supported.
+	* lib/net/protocol.rb: one write(2) per one line.
 
-Mon Nov 29 03:08:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Mar  7 14:26:11 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* object.c (convert_type): direct call conversion methods for the
-	  performance.  [ruby-core:03845]
+	* math.c (math_log, math_log10): should return NaN if x < 0.0
+	  on Cygwin.
 
-	* eval.c (rb_funcall_rescue): new function.
+Thu Mar  7 10:31:26 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* object.c (rb_Array): avoid using rb_respond_to().
+	* parse.y (stmt): while/until modifier must work for empty body.
 
-	* object.c (rb_Integer): ditto.
+Tue Mar  6 22:53:58 2001  Kazuhiro Yoshida   <moriq.kazuhiro@nifty.ne.jp>
 
-	* parse.y (reduce_nodes): empty body should return nil.
+	* ruby.c (ruby_set_argv): clear ARGV contents before adding args.
 
-	* string.c (rb_str_aset): the original string should not be
-	  affected by modifying duplicated string.  [ruby-dev:24981]
+Tue Mar  6 10:50:29 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Nov 29 13:57:38 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (primary): rescue and ensure clauses should be allowed
+	  to appear in singleton method body.
 
-	* win32/win32.c (CreateChild): search executable file if no program
-	  name given. (backported from CVS HEAD)
+Mon Mar  5 17:25:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Nov 29 13:37:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (proc_eq): compare Procs using blocktag equality.
 
-	* io.c (fptr_finalize): must not use FILE after fclose().
-	  [ruby-dev:24985]
+	* eval.c (proc_to_s): stringify according to block tag address.
 
-Mon Nov 29 13:16:31 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Mar  5 17:19:56 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* win32/win32.c (CreateChild): push back the last space before next
-	  loop because CharNext() eats it.
+	* win32/win32.c (gettimeofday): use GetLocalTime() instead of ftime()
+	  for high-resolution timing.
 
-Mon Nov 29 01:18:18 2004  Tanaka Akira  <akr@m17n.org>
+Sun Mar  4 17:01:09 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* io.c (rb_io_check_writable): call io_seek regardless of
-	  NEED_IO_SEEK_BETWEEN_RW.  [ruby-dev:24986]
+	* string.c (trnext): support backslash escape in String#tr.
 
-Sat Nov 27 21:43:39 2004  Tanaka Akira  <akr@m17n.org>
+Sat Mar  3 16:15:16 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c: avoid data lost with nonblocking fd and
-	  stdio buffering in sync mode.  [ruby-dev:24966]
-	  based on matz's patch [ruby-dev:24967]
-	  (io_fwrite): new primitive writing function which writes
-	  directly if sync mode.
-	  (rb_io_fwrite): wrapper for io_fwrite now.
-	  (io_write): call io_fwrite instead of rb_io_fwrite.
+	* 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.
 
-Sat Nov 27 14:44:15 2004  Kent Sibilev  <ksibilev@bellsouth.net>
+Wed Feb 28 11:02:41 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/cgi/session.rb (CGI::Session::initialize): create_new_id is
-	  now a instance method.  [ruby-core:03832]
+	* string.c (rb_str_delete_bang): delete! should take at least 1
+	  argument. 
 
-Sat Nov 27 09:41:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.c (load_file): add rb_gc() after loading to avoid
+	  extraordinary memory growth.
 
-	* io.c (io_fread): old rb_io_fread with file closing checking.
-	  (rb_io_fread): wrapper for io_fread now.
-	  [ruby-dev:24964]
+Wed Feb 28 05:01:40 2001  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Fri Nov 26 18:02:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* dir.c (rb_glob_helper): "./foo" should match "foo", not "./foo".
 
-	* ext/tk/lib/tk.rb: Tk.destroy uses TkWindow#epath
+Tue Feb 27 16:38:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/image.rb: bug fix
+	* eval.c (ev_const_get): retrieve Object's constant if no current
+	  class is available (e.g. defining singleton class for Fixnums).
 
-	* ext/tk/lib/tk/wm.rb: add 'iconphoto' method(Windows only)
+	* eval.c (ev_const_defined): check Object's constant if no current
+	  class is available (e.g. defining singleton class for Fixnums).
 
-	* ext/tk/lib/tkextlib/*: some methods uses TkWindow#epath
+	* time.c (time_timeval): negative time interval should not be
+	  allowed.
 
-Fri Nov 26 13:49:06 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (proc_call): ignore block to `call' always, despite of
+	  being orphan or not.
 
-	* eval.c (method_missing): raise TypeError for classes do not
-	  have allocators.  [ruby-core:03752]
+Wed Feb 27 10:16:32 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/erb.rb: add RDoc by James Edward Gray II.  [ruby-core:03786]
+	* eval.c (rb_yield_0): should check based on rb_block_given_p()
+	  and rb_f_block_given_p().
 
-Fri Nov 26 13:29:02 2004  Dave Thomas  <dave@pragprog.com>
+Tue Feb 27 04:13:45 2001 Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in): Break
-	  out of preprocessing when we find a :section: directive (previously cleared out the
-	  comment, but this apparently now generates an error in gsub!)
+	* configure.in (frame-address): --enable-frame-address to allow
+	  __builtin_frame_address() to be used.
 
-Fri Nov 26 00:17:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (stack_length): use __builtin_frame_address() based on
+	  the macro USE_BUILTIN_FRAME_ADDRESS.
 
-	* io.c (io_read): move StringValue() check before GetOpenFile().
-	  [ruby-dev:24959]
+	* gc.c (rb_gc): ditto.
 
-Thu Nov 25 20:14:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (Init_stack): ditto.
 
-	* lib/thwait.rb (ThreadsWait#join_nowait): abnormally terminated
-	  threads should be also processed.  [ruby-talk:121320]
+Mon Feb 26 16:20:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Nov 25 10:14:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.c (proc_options): call ruby_show_version() just once.
 
-	* dir.c (push_braces): do not reuse buffer strings.  [ruby-core:03806]
+	* dir.c (dir_s_open): returns the value from a block (if given).
 
-Thu Nov 25 07:59:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Feb 26 14:29:04 2001  Akinori MUSHA  <knu@iDaemons.org>
 
-	* io.c (read_all): stringify non-nil buffer argument, and always
-	  taint the result.  [ruby-dev:24955]
+	* ext/extmk.rb.in, lib/mkmf.rb: add C++ rules in addition to C
+	  rules.
 
-Wed Nov 24 01:01:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Feb 26 00:04:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (io_read): integer conversion should be prior to
-	  GetOpenFile().  [ruby-dev:24952]
+	* eval.c (proc_call): should not modify ruby_block->frame.iter
+	  based on ruby_frame->iter altered by PUSH_ITER().
 
-	* configure.in, io.c: cancel [ ruby-Patches-1074 ].
+Mon Feb 26 05:27:52 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-Tue Nov 23 08:09:50 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/net/telnet.rb: #telnetmode(), #binmode(): bug fix.
+	  thanks to nobu.nakada@nifty.ne.jp.
 
-	* ext/tk/lib/tk/menu.rb: improve usability of TkOptionMenubutton
+Mon Feb 26 04:55:50 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-Tue Nov 23 02:00:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/cgi.rb: CGI#form(): bug fix.
+	  thanks to MoonWolf <moonwolf@moonwolf.com>.
 
-	* file.c (rb_file_chown): integer conversion should be prior to
-	  GetOpenFile().  [ruby-dev:24949]
+	* lib/cgi.rb: CGI#rfc1123_date(): improvement.
+	  thanks to Tomoyasu Akita <genzo-@dm4lab.to>.
 
-Tue Nov 23 00:10:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/cgi.rb: CGI#header(): improvement for mod_ruby.
+	  thanks to Shugo Maeda <shugo@ruby-lang.org>.
 
-	* file.c (rb_file_chown): integer conversion should be prior to
-	  GetOpenFile().  [ruby-dev:24947]
+Sun Feb 25 02:45:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* file.c (rb_file_truncate): ditto.
+	* file.c (rb_file_s_rename): avoid Cygwin's bug.
 
-	* file.c (rb_file_s_truncate): ditto.
+Sat Feb 24 23:32:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* dir.c (dir_seek): use NUM2OFFT().
+	* eval.c (rb_thread_fd_close): should save current context before
+	  raising exception.
 
-	* misc/ruby-mode.el (ruby-non-block-do-re): should not match words
-	  start with block keyword and underscore.  [ruby-core:03719]
+Sat Feb 24 22:14:00 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Mon Nov 22 22:33:02 2004  Dave Thomas  <dave@pragprog.com>
+	* win32/win32.c (myrename): fix error handling.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Don't use names
-	  of variables or constants when oarsing 'require'
+Sat Feb 24 13:58:48 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Mon Nov 22 00:13:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/http.rb: always close connection on request without
+	  body.
 
-	* dir.c (dir_seek): should retrieve dir_data after NUM2INT().
-	  [ruby-dev:24941]
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: change copyright.
 
-Sat Nov 20 23:57:33 2004  Dave Thomas  <dave@pragprog.com>
+Sat Feb 24 03:15:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rdoc/README (et al): Add a new directive, :section:, and
-	  change the output format to accomodate. :section: allows to to
-	  group together methods, attributes, constants, etc under
-	  headings in the output. If used, a table of contents is
-	  generated.
+	* io.c (set_stdin): preserve original stdin.
 
-Sat Nov 20 23:56:54 2004  Dave Thomas  <dave@pragprog.com>
+	* io.c (set_outfile): preserve original stdout/stderr.
 
-	* lib/rdoc/options.rb (Options::parse): Force --inline-source if
-	  --one-file option given
+Fri Feb 23 08:28:58 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Sat Nov 20 23:55:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/protocol.rb: clear read buffer after reopen.
 
-	* string.c (rb_str_splice): should place index wrapping after
-	  possible modification.  [ruby-dev:24940]
+	* lib/net/protocol.rb: refactoring.
 
-Sat Nov 20 13:26:03 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/net/http.rb: split module HTTPHeader from HTTPResponse.
 
-	* ext/nkf/nkf-utf8/utf8tbl.c: original revision 1.7
+Tue Feb 20 23:45:35 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Sat Nov 20 05:34:24 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+	* process.c: add W* macro if not available.
 
-	* ext/nkf/nkf-utf8/nkf.c: original nkf.c rev:1.40
+Tue Feb 20 16:37:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/nkf/test.rb: add test for mime encode/decode
+	* configure.in: add check for negative time_t for gmtime(3).
 
-Sat Nov 20 01:37:34 2004  Johan Holmberg  <holmberg@iar.se>
+	* time.c (time_new_internal): no positive check if gmtime(3) can
+	  handle negative time_t.
 
-	* eval.c (error_print): nicer traceback at interrupt.
-	  [ruby-core:03774]
+	* time.c (time_timeval): ditto.
 
-Sat Nov 20 00:07:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (rb_big2long): should not raise RangeError for Bignum
+	  LONG_MIN value.
 
-	* string.c (str_gsub): internal buffer should not be listed by
-	  ObjectSpace.each_object() by String#gsub.  [ruby-dev:24931]
+Mon Feb 19 17:46:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Nov 19 01:20:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_substr): "a"[1,2] should return ""; need
+	  rubicon upgrade.
 
-	* lib/cgi/session.rb (CGI::Session::FileStore::initialize): raise
-	  exception if data corresponding to session specified from the
-	  client does not exist.
+Mon Feb 19 12:10:36 2001  Triet H. Lai  <thlai@mail.usyd.edu.au>
 
-Fri Nov 19 00:59:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* error.c (rb_sys_warning): new function to give warning with
+	  strerror() message.
 
-	* string.c (str_gsub): internal buffer should not be listed by
-	  ObjectSpace.each_object().  [ruby-dev:24919]
+	* dir.c (rb_glob_helper): better error handling, along with
+	  performance tune.
 
-Thu Nov 18 18:41:08 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Mon Feb 19 01:55:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/ruby/test_stringchar.rb (test_bang): added.
+	* eval.c (secure_visibility): visibility check for untainted modules.
 
-	* string.c (rb_str_upcase_bang, rb_str_capitalize_bang)
-	(rb_str_swapcase_bang): missing rb_str_modify().  [ruby-dev:24915]
+Mon Feb 19 00:29:29 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Thu Nov 18 00:21:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* signal.c (sigpipe): sighandler which does nothing.
 
-	* process.c (proc_getpgrp): prohibit for $SAFE=2.
-	  [ruby-dev:24899]
+	* signal.c (trap): set sigpipe function for SIGPIPE.
 
-	* process.c (get_pid): ditto.  [ruby-dev:24904]
+	* signal.c (Init_signal): default SIGPIPE handler should be
+	  sigpipe function.
 
-	* process.c (get_ppid): ditto.
+Sun Feb 18 15:42:38 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* array.c (rb_ary_delete): defer rb_ary_modify() until actual
-	  modification.  [ruby-dev:24901]
+	* ext/curses/extconf.rb: add dir_config.
 
-Thu Nov 18 10:10:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* missing/flock.c: use fcntl(2) instead of lockf(2).
 
-	* io.c, rubyio.h (rb_io_modenum_flags): exported.
+Sun Feb 18 05:46:03 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* ext/stringio/stringio.c (strio_initialize): allow Fixnum as mode as
-	  well as IO.new does.  [ruby-dev:24896]
+	* lib/net/http.rb: Response#range_length was not debugged.
 
-Wed Nov 17 23:42:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Feb 18 04:02:03 2001  Yasushi Shoji  <yashi@yashi.com>
 
-	* test/ruby/test_settracefunc.rb: added.  [ruby-dev:24884]
+	* array.c (rb_ary_subseq): wrong boundary check.
 
-Wed Nov 17 13:56:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Feb 18 00:09:50 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* parse.y (newline_node): should not use FL_SET. [ruby-dev:24874]
+	* win32/win32.c: make file I/O faster on mswin32/mingw32.
 
-	* parse.y (string_content): should not use FL_UNSET.
+	* win32/win32.h: ditto.
 
-	* node.h (NODE_NEWLINE): remove unused bit to utilize flag field
-	  in nodes.
+	* rubysig.h: ditto.
 
-Wed Nov 17 13:09:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Feb 17 23:32:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* {bcc32,win32,wince}/Makefile.sub (test): should build ruby.exe
-	  before running test. [ruby-core:03756]
+	* parse.y (cond0): integer literal in condition should not be
+	  compared to lineno ($.).
 
-Wed Nov 17 04:33:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Feb 16 01:44:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* pack.c: all features are backport from 1.9. [ruby-dev:24826]
+	* io.c (set_outfile): f should be the FILE* from the assigning value.
 
-	* bignum.c (rb_big2ulong_pack): new function to pack Bignums.
+	* ext/socket/socket.c (tcp_s_open): should not give default value
+	  to local_host.
 
-Wed Nov 17 03:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* time.c (time_s_times): move to Process::times.
 
-	* string.c (rb_str_splice): move rb_str_modify() after
-	  StringValue(), which may alter the receiver.  [ruby-dev:24878]
+	* file.c (rb_file_s_lchmod): new method File::lchmod.
 
-Tue Nov 16 23:45:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (rb_file_s_lchown): new method File::lchown.
 
-	* numeric.c (flo_divmod): protect float values from GC by
-	  assignment to local variables.  [ruby-dev:24873]
+Thu Feb 15 11:33:49 2001  Shugo Maeda <shugo@ruby-lang.org>
 
-Tue Nov 16 16:30:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/cgi/session.rb (close): fixed reversed condition.
 
-	* {bcc32,win32,wince}/setup.mak (-epilogue-): remove config.h and
-	  config.status to force updating them.
+Thu Feb 15 08:34:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Nov 16 16:20:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (proc_waitall): new method based on a patch from Brian
+	  Fundakowski Feldman <green@green.dyndns.org>.
 
-	* ext/stringio/stringio.c (strio_read): position was ignored when a
-	  buffer was passed.  http://www.yo.rim.or.jp/~nov/d/?date=20041116#p03
+	* process.c (last_status_set): objectify $? value (Process::Status).
 
-Tue Nov 16 11:19:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Feb 14 17:28:24 2001  Shugo Maeda <shugo@ruby-lang.org>
 
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::options): use
-	  Regexp conversion.
+	* lib/net/imap.rb: supports unknown resp_text_code.
 
-Tue Nov 16 01:41:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Feb 14 00:44:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (str_mod_check): frozen check should be separated.
-	  [ruby-core:3742]
+	* dir.c (dir_s_glob): support backslash escape of metacharacters
+	  and delimiters.
 
-	* array.c (rb_ary_update): pedantic check to detect
-	  rb_ary_to_ary() to modify the receiver.  [ruby-dev:24861]
+	* dir.c (remove_backslases): remove backslashes from path before
+	  calling stat(2).
 
-Mon Nov 15 13:50:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* dir.c (dir_s_glob): call rb_yield directly (via push_pattern) if
+	  block is given to the method.
 
-	* string.c (rb_str_justify): typo fixed.  [ruby-dev:24851]
+	* dir.c (push_pattern): do not call rb_ary_push; yield directly.
 
-Mon Nov 15 11:50:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (blk_copy_prev): reduced ALLOC_N too much.
 
-	* misc/ruby-mode.el (ruby-special-char-p, ruby-parse-partial): handle
-	  operator symbols.  [ruby-talk:120177]
+	* eval.c (frame_dup): ditto.
 
-Sun Nov 14 13:27:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Feb 13 23:05:38 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/pp.rb (PP#object_address_group): remove odd number of 'f'
-	  prefixed to negative address.
+	* dir.c (lstat): should use rb_sys_stat if lstat(2) is not
+	  available.
 
-Sun Nov 14 08:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Feb 13 08:43:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/logger/test_logger.rb: Logger just expects
-	  Logger#datetime_format to be used for Time#strftime independently of
-	  locale. [ruby-dev:24828]
+	* io.c (rb_io_ctl): do not call ioctl/fcntl for f2, if f and f2
+	  have same fileno.
 
-Fri Nov 12 15:03:26 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Feb 13 01:13:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (ruby_options): now we cannot call rb_glob() before
-	  ruby_init(), so call rb_w32_cmdvector() at ruby_options().
+	* eval.c (rb_load): raise LocaJumpError if unexpected local jumps
+	  appear during load.
 
-	* win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
-	  export it.
+	* ext/socket/socket.c (bsock_close_read): don't call rb_thread_fd_close();
+	  it's supposed to be called by io_io_close().
 
-Fri Nov 12 14:08:01 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/socket/socket.c (bsock_close_read): do not modify f and f2.
 
-	* ext/tk/lib/tk/event.rb: remove $LOADED_FEATURES trick
+	* ext/socket/socket.c (bsock_close_write): ditto.
 
-	* ext/tk/lib/tk.rb: ditto
+	* ext/socket/socket.c (sock_new): avoid dup(2) on sockets.
 
-Fri Nov 12 00:31:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (primary): preserve and clear in_single and in_def using
+	  stack to prevent nested method errors in singleton class bodies.
 
-	* ext/gdbm/gdbm.c (fgdbm_store): StringValue() may alter string
-	  pointer.  [ruby-dev:24783]
+Sun Feb 11 16:00:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Nov 11 17:36:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (stack_length): use __builtin_frame_address() only if
+	  GCC and i386 CPU.
 
-	* dir.c (rb_globi): also should call back via rb_glob_caller().
-	  [ruby-dev:24775]
+	* gc.c (rb_gc, Init_stack): ditto.
 
-Thu Nov 11 16:47:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* configure.in: add ac_cv_func_getpgrp_void=yes on DJGPP.
 
-	* test/ruby/test_file.rb (test_truncate_wbuf): we want to test
-	  only File#truncate, not behaviour of seek(2).
+Sat Feb 10 23:43:49 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Thu Nov 11 09:41:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* hash.c (rb_any_hash): dumped core on machines sizeof(int) != sizeof(long).
 
-	* dir.c (push_braces): was confusing VALUE and char*.
+Sat Feb 10 23:07:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* dir.c (rb_push_glob): Dir.glob should have called its block.
+	* io.c (rb_io_s_for_fd): IO::for_fd(fd) - new method.
 
-Thu Nov 11 01:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (PREV_IS_A_LETTER): should not treat c>0x7f as a word
+	  character if -Kn.
 
-	* error.c (syserr_initialize): use stringified object.
-	  [ruby-dev:24768]
+Sat Feb 10 00:00:30 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Wed Nov 10 22:49:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c (win32_stat): replace stat to enable when pathname
+	  ends with '/' or '\' for mswin32 on Win9X / Win2k.
 
-	* lib/delegate.rb (SimpleDelegator::dup): wrong number of
-	  arguments.
+	* win32/win32.h: ditto.
 
-	* lib/delegate.rb (DelegateClass::dup): ditto.
+	* ruby.h: ditto.
 
-Wed Nov 10 12:31:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c (rb_glob_helper): ditto.
 
-	* README.EXT (Example): extconf.rb is indispensable now.
+	* file.c (rb_stat, rb_file_s_stat, eaccess, check3rdbyte): ditto.
 
-Wed Nov 10 03:33:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Feb  9 22:54:57 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c: fix SEGV when compiled with Tcl/Tk8.3.x
-	  or older
+	* ruby.c (ruby_init_loadpath): convert '\\' to '/'
+	  before finding executable file path.
 
-	* ext/tk/lib/tkextlib/tile/style.rb: bug fix
+Fri Feb  9 17:41:53 2001  Triet H. Lai  <thlai@mail.usyd.edu.au>
 
-Tue Nov  9 14:27:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c (rb_glob_helper): do not follow symbolic links.
 
-	* lib/optparse.rb (OptionParser::Officious): moved from DefaultList.
+Thu Feb  8 21:27:24 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Nov  9 01:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb (install_rb): fix handling of relative path.
 
-	* dir.c (rb_glob2): do not allocate buffer from heap to avoid
-	  memory leaks.  use string object for buffering instead.
-	  [ruby-dev:24738]
+	* lib/mkmf.rb (create_makefile): add srcdir.
 
-	* dir.c (join_path): ditto.
+Thu Feb  8 02:22:09 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* io.c (io_read): external input buffer may be modified even after
-	  rb_str_locktmp().  [ruby-dev:24735]
+	* lib/net/http.rb: join HTTPReadResponse into HTTPResponse again.
 
-	* dir.c (fnmatch): p or s may be NULL.  [ruby-dev:24749]
+	* lib/net/http.rb: move http_version() from HTTPRequest to
+	  HTTPResponse.
 
-Tue Nov  9 00:53:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/net/protocol.rb: refactoring.
 
-	* regex.c (slow_match): avoid GCC 3.4.x warnings.
+Wed Feb  7 16:27:27 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Tue Nov  9 00:50:06 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/http.rb: split HTTPResponse into HTTPReadResponse
+	  module.
 
-	* lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
+	* lib/net/protocol.rb: add Net::net_private.
 
-Mon Nov  8 23:38:35 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/net/protocol.rb: Socket#reopen takes arg, open_timeout.
 
-	* lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
-	  [ruby-dev:24743]
+Wed Feb  7 16:05:22 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Mon Nov  8 22:20:19 2004  Dave Thomas  <dave@pragprog.com>
+	* parse.y (parse_quotedwords): %w should allow parenthesis escape.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
-	  Fix bug where parent class wasn't being detected if the
-	  child class was defined using the A::B notation.
+Wed Feb  7 00:57:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Nov  8 00:14:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* parse.y (parse_qstring): %q should allow terminator escape.
 
-	* configure.in: add setup for mignw32 cross compiling.
-	  [ruby-talk:119413]
+	* re.c (rb_reg_options): new method to give an option values.
 
-Sun Nov  7 23:49:26 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* parse.y (cond0): disable special treating of integer literal in
+	  conditional unless option -e is supplied.  changes current
+	  behavior.  experimental.
 
-	* ext/tk/lib/tk.rb: bind-event methods accept multi substitution
-	  arguments.
+	* parse.y (cond0): give warning for string/integer literals and
+	  dot operators in conditionals unless option -e is supplied.
 
-	* ext/tk/lib/tk/canvas.rb: ditto.
+	* re.c (rb_reg_equal): all option flags should be same to be equal.
 
-	* ext/tk/lib/tk/canvastag.rb: ditto.
+Tue Feb  6 21:30:44 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* ext/tk/lib/tk/text.rb: ditto.
+	* lib/net/http.rb: call on_connect() on re-opening socket.
 
-	* ext/tk/lib/tk/texttag.rb: ditto.
+	* lib/net/pop.rb: also POP3 can use APOP auth.
 
-	* ext/tk/lib/tkextlib: ditto.
+Tue Feb  6 20:19:10 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Sat Nov  6 14:58:44 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/net/http.rb: add HTTP#request.
 
-	* lib/webrick/server.rb (WEBrick::HTTPServer#start): remove
-	  :DoNotReverseLookup option. (Socket#do_not_reverse_lookup is a
-	  ruby 1.9 feature)
+	* lib/net/http.rb: take HTTP 1.0 server into account (incomplete).
 
-Sat Nov  6 11:31:04 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+	* lib/net/protocol.rb: timeout for open/read.
 
-	* lib/date.rb (_parse): checks whether zone was given.
+	* lib/net/protocol.rb: add Protocol#on_connect,on_disconnect.
 
-Sat Nov  6 00:46:27 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Feb  5 23:15:46 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (rb_str_locktmp): check STR_TMPLOCK flag before
-	  locking.  [ruby-dev:24727]
+	* error.c (Init_Exception): make Interrupt a subclass of
+	  SignalException.
 
-Fri Nov  5 18:12:42 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Feb 5 00:39:06 2001  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
 
-	* ext/tk/lib/tk/scrollable.rb: divide Scrollable module into
-	  X_Scrollable and Y_Scrollable
+	* dir.c: use ISXXX() instead of isxxx().
 
-	* ext/tk/lib/tk/entry.rb: include X_Scrollable instead of Scrollable
+	* dln.c (aix_loaderror): ditto.
 
-	* ext/tk/lib/tk/autoload.rb: define autoload for X_Scrollable and
-	  Y_Scrollable
+	* file.c (rb_file_s_expand_path): ditto.
 
-Fri Nov  5 16:05:32 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* string.c (rb_str_upcase_bang): ditto.
 
-	* ext/tk/lib/tk.rb: TkComm._at() supprts both of "@x,y" and "@x"
+	* win32/win32.c (do_spawn): ditto.
 
-Fri Nov  5 13:22:58 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* win32/win32.c (NtMakeCmdVector): ditto.
 
-	* ext/tk/lib/tk/text.rb: sorry. bug fix again.
+	* win32/win32.c (opendir): ditto.
 
-Fri Nov  5 13:17:54 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Feb  3 14:44:53 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tk/text.rb: bug fix
+	* configure.in (AC_C_INLINE): check inline attribute.
 
-Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (is_pointer_to_heap): use inline rather than __inline__.
 
-	* gc.c (gc_mark): stricter GC stack check.
+	* pack.c (hex2num): ditto.
 
-Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.h (rb_class_of, rb_type, rb_special_const_p): ditto.
 
-	* gc.c (gc_mark): stricter GC stack check.
+	* util.c (rb_class_of, rb_type, rb_special_const_p): defined in
+	  ruby.h.
 
-Fri Nov  5 08:34:43 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Feb  2 16:14:51 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (str_gsub): should have removed rb_str_unlocktmp(str).
-	  [ruby-dev:24708]
+	* array.c (rb_ary_sort_bang): returns self, even if its length is
+	  less than 2.
 
-Thu Nov  4 21:25:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (POP_VARS): propagate DVAR_DONT_RECYCLE, if
+	  SCOPE_DONT_RECYCLE of ruby_scope is set.
 
-	* string.c (str_gsub): string modify check no longer based on
-	  tmplock.  [ruby-dev:24706]
+Wed Jan 31 22:27:29 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Nov  4 19:27:46 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* configure.in: gcc-2.95.2-7(Cygwin) support.
+	  add -mwin32 if available.
 
-	* io.c (rb_f_open): fix typo.
+	* cygwin/GNUmakefile: ditto.
 
-Thu Nov  4 15:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Jan 30 17:56:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/variable.rb: forget to initialize instance_variables
-	  of TkVarAccess objects
+	* array.c (rb_ary_fetch): new method.
 
-Thu Nov  4 09:11:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jan 29 17:36:19 2001  TOYOFUKU Chikanobu  <toyofuku@juice.or.jp>
 
-	* gc.c (gc_mark): enable GC stack checking.
+	* eval.c (rb_eval): nd_iter evaluation should be wrapped by
+	  BEGIN_CALLARGS and END_CALLARGS.
 
-Thu Nov  4 03:11:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jan 29 14:25:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (str_gsub): lock strings temporarily.  [ruby-dev:24687]
+	* eval.c (block_pass): return from block jumps directory to
+	  block invoker.
 
-	* ext/socket/socket.c (s_recvfrom): tmplock input buffer.
-	  [ruby-dev:24705]
+Mon Jan 29 01:40:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Nov  3 22:32:12 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+	* string.c (str_independent): should not clear str->orig here.
+	  it's too early.
 
-	* process.c: On NetBSD don't use setruid() and setrgid().
+Fri Jan 26 01:42:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Nov  3 22:24:17 2004  Daigo Moriwaki  <techml@sgtpepper.net>
+	* parse.y: clarify do ambiguity, bit more complex but natural
+	  from my point of view.
 
-	* lib/webrick/httpauth/digestauth.rb: use Base64.encode64 to
-	  avoid warnings.
+Wed Jan 24 14:58:08 2001  Akinori MUSHA  <knu@ruby-lang.org>
 
-Wed Nov  3 17:19:59 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/cgi.rb: fix the problem that when running under mod_ruby
+	  header() outputs only one Set-Cookie line.
 
-	* array.c (rb_ary_uniq_bang): do not push frozen string from hash
-	  table.  [ruby-dev:24695]
+Wed Jan 24 01:45:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* array.c (rb_ary_and): ditto.
+	* eval.c (POP_BLOCK_TAG): call rb_gc_force_recycle() if block has
+	  not been objectified.
 
-	* array.c (rb_ary_or): ditto.
+	* eval.c (rb_callcc): should nail down block->tag history to avoid
+	  rb_gc_force_recycle(). 
 
-Wed Nov  3 17:13:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Jan 23 18:51:57 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (pipe_open): fix compile error
+	* gc.c (rb_gc_call_finalizer_at_exit): should finalize objects in
+	  deferred_final_list too.
 
-Wed Nov  3 16:58:07 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Jan 23 16:10:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: support to use different Tcl commands between
-	  configure and configinfo
+	* gc.c (os_live_obj): do not list terminated object.
 
-	* ext/tk/lib/font.rb: ditto.
+	* gc.c (os_obj_of): ditto.
 
-	* ext/tk/lib/itemconfig.rb: support to use different Tcl commands
-	  between item_configure and item_configinfo
+	* gc.c (rb_gc_mark): support new T_BLKTAG tag.
 
-	* ext/tk/lib/itemfont.rb: ditto.
+	* gc.c (obj_free): ditto.
 
-	* ext/tk/extconf.rb: install SUPPORT_STATUS
+	* eval.c (new_blktag): creation of new block tag, which holds
+	  destination of global jump and orphan status.
 
-	* ext/tk/lib/tkextlib: some bug fixes (see ext/tk/ChangeLog.tkextlib)
+	* eval.c (block_pass): break from orphan Proc object will raise a
+	  LocalJumpError exception.
 
-Wed Nov  3 16:30:41 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Jan 22 16:33:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/nkf: follow nkf 2.0.4
+	* mkconfig.rb: autoconf 2.49 support.
 
-Wed Nov  3 15:53:34 2004  Kouhei Sutou  <kou@cozmixng.org>
+Mon Jan 22 00:32:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/rss/test_maker_*.rb: added tests for RSS Maker.
+	* eval.c (block_pass): behavior consistency with proc_call(). do
+	  not propagate `break'.
 
-	* lib/rss/maker.rb: added RSS Maker.
+Sat Jan 20 03:54:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/maker/*.rb: ditto.
+	* 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'.
 
-Tue Nov  2 16:35:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (block_call): syntax restructure.
 
-	* ext/enumerator/enumerator.c (each_cons_i): pass copy of an
-	  internal consequent array.  [ruby-talk:118691]
+Thu Jan 18 04:28:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Nov  2 16:05:21 2004  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.
 
-	* process.c (rb_f_fork): need to flush stdout and stderr before
-	  fork(2).  [ruby-talk:117715]
+Wed Jan 17 13:28:26 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Nov  2 01:20:09 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in: remove DEFS definition.
 
-	* eval.c (proc_invoke): nail down dyna_var node when Proc object
-	  or continuation is created.  [ruby-dev:24671]
+	* mkconfig.rb: ditto.
 
-Mon Nov  1 13:59:28 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* win32/config.status.in: ditto.
 
-	* ext/extmk.rb (MANIFEST): do not use anymore, use extconf.rb instead.
+Tue Jan 16 17:00:50 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* ext/enumerator/extconf.rb, ext/fcntl/extconf.rb,
-	  ext/stringio/extconf.rb: added.
+	* lib/net/protocol.rb: ignore EOFError for read.
 
-	* MANIFEST, ext/**/MANIFEST: removed.
+	* lib/net/http.rb: user specified header was not used.
 
-	* README.EXT, README.EXT.ja: remove MANIFEST stuff.
+Mon Jan 15 16:00:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Nov  1 01:14:52 2004  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.
 
-	* io.c (rb_f_open): create copy of popen specifier.  [ruby-dev:24656]
+Sun Jan 14 21:49:28 2001  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Mon Nov  1 00:36:48 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* sprintf.c (rb_f_sprintf): simple typo.  binary base should be 2,
+	  not '2'.
 
-	* main.c (_stklen): move to gc.c.
+	* re.c (rb_reg_s_last_match): should explicitly return nth match.
 
-Sun Oct 31 00:22:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jan 14 18:21:30 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
 
-	* string.c (rb_str_locktmp): lock string temporarily.
+	* win32/config.status.in: add some field.
 
-	* string.c (str_independent): add tmplock check.
+	* win32/win32.c (isInternalCmd): ignore case for shell's internal
+	  command.
 
-	* io.c (io_write): lock output string temporarily.
-	  [ruby-dev:24649]
+	* win32/win32.c (do_spawn): recognize quoted command line.
 
-	* io.c (io_write): use rb_str_locktmp().
+Sun Jan 14 04:10:27 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* io.c (read_all): ditto.
+	* lib/net/protocol.rb (adding): too few "yield" in case of arg is
+	  not String/File.
 
-Sat Oct 30 06:53:24 2004  Peter Vanbroekhoven  <peter.vanbroekhoven@cs.kuleuven.ac.be>
+	* lib/net/http.rb: add http request object.
 
-	* eval.c (rb_eval): NODE_XSTR should pass copy of literal string.
+Sat Jan 13 19:39:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Sat Oct 30 00:19:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* re.c (rb_reg_desc): separate RE_OPTION_MULTILINE
 
-	* enum.c (enum_sort_by): protect continuation jump in.
-	  [ruby-dev:24642]
+	* re.c (rb_reg_options): add RE_OPTION_{POSIXLINE,RE_OPTION_MULTILINE,
+	  RE_OPTION_EXTENDED}
 
-Fri Oct 29 21:27:51 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jan 11 10:45:04 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* io.c (rb_io_check_initialized): new function to check uninitialized
-	  object.  [ruby-talk:118234]
+	* win32/win32.h, win32/config.h.in: move NORETURN from win32.h
+	  to config.h.in.
 
-	* file.c (rb_file_path), io.c (rb_io_closed): check if initialized.
+	* win32/config.h.in (inline): renamed from INLINE.
 
-Fri Oct 29 10:00:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* djgpp/config.hin (INLINE): removed.
 
-	* eval.c (rb_thread_start_0): forget to free some memory chunks.
-	  [ruby-core:03611]
+Thu Jan 11 06:45:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (ruby_cleanup): ruby_finalize_1 may cause exception,
-	  should be wrapped by PUSH_TAG/POP_TAG().  [ruby-dev:24627]
+	* object.c (rb_mod_dup): should propagate FL_SINGLETON.
 
-Thu Oct 28 08:42:02 2004  Tanaka Akira  <akr@m17n.org>
+	* object.c (inspect_obj): handles the case of no instance variable.
 
-	* io.c (argf_forward): use ANSI style.
-	  (argf_read): call argf_forward with argv argument.
-	  [ruby-dev:24624]
+Wed Jan 10 16:15:08 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Oct 28 23:32:54 2004  akira yamada  <akira@ruby-lang.org>
+	* ruby.h: NORETURN macro is changed for VC++ 6.0.
 
-	* ext/zlib/zlib.c (zstream_detach_input): resets klass of z->input if
-	  z->input isn't nil.
+	* eval.c, intern.h: ditto.
 
-Thu Oct 28 23:19:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* djgpp/config.hin, win32/win32.h: ditto.
 
-	* ext/extmk.rb: prefer relative path.  [ruby-talk:93037]
+	* configure.in: ditto.
 
-Wed Oct 27 18:49:11 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jan 10 13:54:53 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* gc.c: prototype; rb_io_fptr_finalize() doesn't return any value
-	  at this version.
+	* process.c (proc_setuid): use setresuid() if available.
 
-Wed Oct 27 17:27:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* process.c (proc_setgid): use setresgid() if available.
 
-	* gc.c (gc_sweep): recover ruby_in_compile variable.
+	* configure.in: ditto.
 
-Wed Oct 27 09:17:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 10 01:50:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (str_gsub): use a string object for exception safeness.
-	  [ruby-dev:24601]
+	* configure.in (AC_C_INLINE): check inline attribute.
 
-Tue Oct 26 23:52:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_reverse_bang): forgot to call rb_str_modify().
 
-	* io.c (rb_io_getline): rs modification check should not interfere in the loop.
+Tue Jan  9 17:41:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Oct 26 23:30:39 2004  Dave Thomas  <dave@pragprog.com>
+	* object.c (rb_obj_taint): check frozen status before modifying
+	  taint status.
 
-	* lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module):
-	  Restore correct :nopdoc: behavior with nested classes and modules.
+	* object.c (rb_obj_untaint): ditto.
 
-Tue Oct 26 18:21:29 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jan  9 16:22:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (RESIZE_CAPA): check string attribute before modifying
-	  capacity member of string structure.  [ruby-dev:24594]
+	* enum.c (enum_inject): new method.
 
-Tue Oct 26 11:33:26 2004  David G. Andersen  <dga@lcs.mit.edu>
+Tue Jan  9 02:16:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
-	  performance.  [ruby-talk:117701]
+	* gc.c (rb_gc_call_finalizer_at_exit): clear klass member of
+	  terminating object.
 
-Tue Oct 26 10:56:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_call): raise exception for terminated object.
 
-	* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
-	  arguments, unless (digit)$ style used.
+Mon Jan  8 21:24:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Oct 26 11:33:26 2004  David G. Andersen  <dga@lcs.mit.edu>
+	* bignum.c (bigdivrem): t2 might be too big for signed long; do
+	  not use rb_int2big(), but rb_uint2big().
 
-	* ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
-	  performance.  [ruby-talk:117701]
+Mon Jan  8 21:35:10 2001  Guy Decoux  <decoux@moulon.inra.fr>
 
-Tue Oct 26 10:56:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (path_check_1): should restore modified path.
 
-	* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
-	  arguments, unless (digit)$ style used.
+Mon Jan  8 03:09:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Oct 25 18:35:39 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* error.c (rb_load_fail): new func to report LoadError.
 
-	* win32/win32.c (isUNCRoot): should check NUL after '.'.
-	  [ruby-dev:24590]
+	* ruby.c (load_file): use rb_load_fail.
 
-	* win32/win32.c (isUNCRoot): fixed buffer overrun.
+Sat Jan  6 00:17:18 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Mon Oct 25 08:03:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* pack.c (pack_pack): avoid infinite loop(pack 'm2').
 
-	* eval.c (get_backtrace): ignore illegal backtrace.  [ruby-dev:24587]
+Fri Jan  5 01:02:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Oct 24 00:41:09 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (ruby_finalize): should enclosed by PUSH_TAG/POP_TAG.
 
-	* eval.c (rb_load, search_required, rb_require_safe, rb_require): use
-	  frozen shared string to avoid outside modification.  [ruby-dev:24580]
+	* gc.c (rb_gc_mark): link 2 of NODE_IFUNC should not be explicitly
+	  marked.  it may contain non object pointer.
 
-Sat Oct 23 22:18:32 2004  Guy Decoux  <ts@moulon.inra.fr>
+Tue Jan  2 00:20:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (frame_free): Guy Decoux solved the leak problem.
-	  Thanks.  [ruby-core:03549]
+	* re.c (reg_s_last_match): Regexp::last_match(nth) returns nth
+	  substring of the match  (alternative for $& and $<digit>).
 
-Sat Oct 23 00:20:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Dec 31 01:39:16 2000  Guy Decoux  <decoux@moulon.inra.fr>
 
-	* ext/zlib/zlib.c (zstream_append_input): clear klass for z->input
-	  to avoid potential vulnerability.
+	* eval.c (rb_mod_define_method): wrong comparison for blocks.
 
-	* ext/zlib/zlib.c (zstream_run): always use zstream_append_input()
-	  to avoid SEGV.  [ruby-dev:24568]
+Sat Dec 30 19:28:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Oct 22 12:02:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (id2ref): should handle Symbol too.
 
-	* eval.c (rb_alias): was warning for wrong condition.
-	  [ruby-dev:24565]
+	* gc.c (id2ref): should print original ptr value
 
-Fri Oct 22 10:36:37 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Dec 30 03:14:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#meta_vars):
-	  should check if path_info is not nil.
+	* eval.c (rb_iterate): NODE_CFUNC does not protect its data
+	  (nd_tval), so create new node NODE_IFUNC for iteration C
+	  function. 
 
-Fri Oct 22 00:22:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_yield_0): use NODE_IFUNC.
 
-	* ext/zlib/zlib.c (zstream_shift_buffer): should restore class
-	  field of a buffer.  [ruby-dev:24562]
+	* gc.c (rb_gc_mark): support NODE_IFUNC.
 
-Fri Oct 22 00:20:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 29 11:41:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (rb_str_include): should not treat char as negative value.
-	  [ruby-dev:24558]
+	* gc.c (mem_error): prohibit recursive mem_error().
+	  (ruby-bugs-ja:PR#36)
 
-Thu Oct 21 21:32:30 2004  IWATSUKI Hiroyuki  <don@na.rim.or.jp>
+Fri Dec 29 11:05:41 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/pstore.rb (PStore#transaction): Use the empty content when a
-	  file is not found.  [ruby-dev:24561]
+	* eval.c (rb_thread_fd_writable): should not switch context if
+	  rb_thread_critical is set.
 
-Thu Oct 21 19:06:15 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (rb_thread_wait_fd): ditto.
 
-	* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
-	  ensure to close @body. (http://bugs.debian.org/277520)
+	* eval.c (rb_thread_wait_for): ditto.
 
-Thu Oct 21 00:36:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_thread_select): ditto.
 
-	* eval.c (rb_alias): should warn on method discarding.
-	  [ruby-dev:24546]
+	* eval.c (rb_thread_join): join during critical section causes
+	  deadlock. 
 
-	* ext/zlib/zlib.c (zstream_expand_buffer_into): hide internal
-	  string buffer by clearing klass.  [ruby-dev:24548]
+Fri Dec 29 00:38:46 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Oct 20 19:45:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* m17n.c: new file - core functions of M17N.
 
-	* string.c (str_gsub): 	reentrant check.  [ruby-dev:24432]
+Tue Dec 26 18:46:41 2000  NAKAMURA Hiroshi  <nakahiro@sarion.co.jp>
 
-	* backport all SEGV bug fixes from CVS HEAD.  [ruby-dev:24536]
+	* lib/debug.rb: Avoid thread deadlock in debugging stopped thread.
 
-Wed Oct 20 04:17:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/debug.rb: Uncleared 'finish' state.
 
-	* ext/dbm/dbm.c (fdbm_delete_if): should check if deleting element
-	  is a string.  [ruby-dev:24490]
+Tue Dec 26 16:53:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/sdbm/init.c (fsdbm_delete_if): ditto.
+	* eval.c (rb_yield_0): remove dvar node by rb_gc_force_recycle()
+	  more eagerly.
 
-Wed Oct 20 01:37:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_f_binding): recycling should be stopped for outer
+	  scope too.
 
-	* array.c (rb_ary_times): Array#* should return an instance of
-	  the class of right operand.  [ruby-dev:24526]
+	* eval.c (proc_new): ditto.
 
-	* ext/zlib/zlib.c (zstream_detach_buffer): should not expose
-	  class-less object to Ruby world. [ruby-dev:24530]
+Tue Dec 26 15:45:35 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (proc_dup): provide Proc#dup as well.  [ruby-talk:116915]
+	* string.c (rb_str_inspect): should treat multibyte chracters
+	  properly.
 
-	* eval.c (ruby_exec): stack marking position may be higher than
-	  expected.  thanks to Guy Decoux.  [ruby-core:03527]
+Mon Dec 25 17:49:08 2000  K.Kosako  <kosako@sofnec.co.jp>
 
-Tue Oct 19 22:43:12 2004  Dave Thomas  <dave@pragprog.com>
+	* string.c (rb_str_replace_m): unexpected string share happens if
+	  replace is done for associated (STR_NO_ORIG) string.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_attr): If
-	  we come across 'attr' in a context where it isn't
-	  followed by a symbol, just issue a warning.
+Tue Dec 26 15:01:53 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Oct 19 20:41:37 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* io.c (rb_f_p): should not call rb_io_flush() if rb_defout is not
+	  a IO (T_FILE).
 
-	* ext/win32ole.c(ole_invoke): retrieve the result value when
-	  retrying the IDispatch::invoke.
+Mon Dec 25 15:52:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Oct 19 17:24:11 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* stable version 1.6.2 released.
 
-	* io.c (read_all): block string buffer modification during
-	  rb_io_fread() by freezing it temporarily. [ruby-dev:24479]
+Mon Dec 25 05:11:04 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* dir.c (rb_push_glob): block call at once the end of method.
-	  [ruby-dev:24487]
+	* lib/cgi.rb: version 2.1.2 (some bug fixes).
 
-	* ext/enumerator/enumerator.c (enum_each_slice): remove
-	  rb_gc_force_recycle() to prevent potential SEGV.
-	  [ruby-dev:24499]
+	* lib/cgi.rb: Regexp::last_match[1] --> $1
 
-	* ext/zlib/zlib.c (zstream_expand_buffer): hide internal string
-	  buffer by clearing klass.  [ruby-dev:24510]
+	* lib/net/telnet.rb: ditto.
 
-Tue Oct 19 16:12:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Dec 25 04:43:02 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* ext/tk/tkutil.c: backport from CVS HEAD
+	* lib/net/http.rb: does not send HEAD on closing socket.
 
-Tue Oct 19 08:54:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec 25 00:44:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* intern.h, object.c (rb_class_inherited_p): export.
+	* hash.c (rb_any_cmp): should use rb_str_cmp() if TYPE == T_STRING
+	  and CLASS_OF == rb_cString.
 
-Tue Oct 19 08:46:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_new4): should copy class of original too.
 
-	* string.c (rb_str_upto): method result must be checked.  [ruby-dev:24504]
+Mon Dec 25 00:04:54 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* eval.c (error_print): ditto.  [ruby-dev:24519]
+	* eval.c (rb_thread_schedule): initial value of `max' changed to -1.
 
-Mon Oct 18 23:37:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec 25 00:16:14 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* marshal.c (r_object0): check inheritance by the internal function.
-	  [ruby-dev:24515]
+	* string.c (rb_str_replace_m): copy-on-write replace.
 
-Mon Oct 18 15:58:01 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (yylex): should handle => after identifier as well as ==
+	  and =~.
 
-	* range.c (range_step, range_each): need cast.
+Sat Dec 23 23:55:57 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Oct 29 16:34:19 2004  Daiki Ueno  <ueno@unixuser.org>
+	* bignum.c (rb_cstr2inum): Integer("") should not return 0.
 
-	* misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
-	line after opening heredoc identifier.  [ruby-dev:24635]
+Sat Dec 23 11:55:57 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Oct 18 07:26:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_and): Array#& should preverve original order.
 
-	* file.c (rb_file_truncate): discard read buffer before truncation.
-	  [ruby-dev:24197]
+Sat Dec 23 03:44:16 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Mon Oct 18 02:11:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/net/protocol.rb: set @closed false in Socket#reopen.
 
-	* lib/webrick/config.rb (WEBrick::Config::General): add default values:
-	  - WEBrick::Config[:DoNotReverseLookup]
-	  - WEBrick::Config[:RequestCallback] (it used as an alias of
-	    :RequestHandler in WEBrick::HTTPServer#run)
-	  - WEBrick::Config::FileHandler[:AcceptableLanguages]
+	* lib/net/pop.rb: add POP3.foreach, delete_all.
 
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#set_filename): search files
-	  having suffix of language-name which Accept-Language header field
-	  includes if :AcceptableLanguages options is present.
+	* lib/net/pop.rb: add POP3#delete_all.
 
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#get_servlet): new method to
-	  search servlet correspond to the suffix of filename.
+	* lib/net/http.rb: add HTTP.version_1_1, version_1_2
 
-	* lib/webrick/httprequest.rb: add attributes access methods: accept,
-	  accept_charset, accept_encoding, accept_language, content_length
-	  and content_type.
+	* lib/net/http.rb: refactoring.
 
-	* lib/webrick/httpresponse.rb: add attribute access methods:
-	  content_length, content_length=, content_type and content_type=.
+Fri Dec 22 23:11:12 2000  Ueno Katsuhiro  <unnie@blue.sky.or.jp>
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.mime_types):
-	  use the second suffix to detect media type. (the first suffix
-	  may be a language name.)
+	* eval.c (rb_feature_p): ext might be null.
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_qvalues):
-	  add method to parse Accept header field. it returns an Array of
-	  values sorted by the qvalues.
+Fri Dec 22 17:04:12 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Mon Oct 18 02:04:11 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* win32/win32.c (myselect): avoid busy loop by adjusting fd_count.
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): new
-	  method to register virtual hosting servers.
+Fri Dec 22 15:07:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#accept): call
-	  do_not_reverse_lookup for each socket if :DoNotReverseLookup
-	  is set.  [ruby-core:02357]
+	* bignum.c (rb_cstr2inum): prefix like '0x' had removed too much.
 
-Mon Oct 18 00:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Dec 21 13:01:46 2000  Tanaka Akira  <akr@m17n.org>
 
-	* ext/socket/socket.c (sock_s_getservbyaname): protocol string
-	  might be altered.  [ruby-dev:24503]
+	* lib/net/ftp.rb (makeport): don't use TCPsocket.getaddress.
 
-	* string.c (rb_str_upto): check if return value from succ is a
-	  string.  [ruby-dev:24504]
+Wed Dec 20 12:00:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Oct 17 23:03:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bignum.c (rb_big_lshift): should cast up to BDIGIT_DBL.
 
-	* ext/tk/lib/tk/timer.rb: TkTimer#start and restart accept a block
+	* parse.y (yylex): disallow trailing '_' for numeric litrals.
 
-Sun Oct 17 13:05:04 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* bignum.c (rb_cstr2inum): allow `_' within converting string.
 
-	* ext/win32ole/win32ole.c (fole_func_methods): correct argument mismatch.
-	* ext/win32ole/win32ole.c (fole_get_methods): ditto.
-	* ext/win32ole/win32ole.c (fole_put_methods): ditto.
-	* ext/win32ole/tests/testWIN32OLE.rb: add test for WIN32OLE#ole_func_methods
-	  WIN32OLE#ole_get_methods, WIN32OLE#ole_put_methods
+	* eval.c (specific_eval): should take no argument if block is
+	  supplied.
 
-Sat Oct 16 14:45:28 2004  Kouhei Sutou  <kou@cozmixng.org>
+Tue Dec 19 13:44:50 2000  K.Kosako  <kosako@sofnec.co.jp>
 
-	* lib/rss/0.9.rb (RSS::Rss#to_s): removed garbage.
+	* io.c (rb_f_p): should flush rb_defout, not stdout.
 
-Sat Oct 16 13:42:49 2004  Kouhei Sutou  <kou@cozmixng.org>
+Tue Dec 19 00:57:10 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/: untabified.
-	* test/rss/: untabified.
-	* lib/rss/0.9.rb (RSS::Rss#to_s): inent -> indent.
+	* time.c (time_minus): usec might overflow. (ruby-bugs-ja:PR#35)
 
-Sat Oct 16 13:34:56 2004  Kouhei Sutou  <kou@cozmixng.org>
+	* eval.c (rb_obj_extend): Object#extend should take at least one
+	  argument.
 
-	* lib/rss: supported prety print.
-	* test/rss/test_1.0.rb: added test for calculating default indent size.
+	* parse.y (mrhs_basic): should check value_expr($3), not $1.
 
-Fri Oct 15 18:04:35 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Dec 18 23:18:39 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is
-	  acceptable. Add TkTimer.start ( == new + start ).
+	* util.c (mblen, __crt0_glob_function): add for multibyte
+	  on DJGPP 2.03.
 
-Fri Oct 15 12:43:09 2004  Tanaka Akira  <akr@m17n.org>
+Mon Dec 18 18:10:30 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (Init_stack): make prototype declaration consistent with
-	  the definition in gc.c.
+	* time.c (time_plus): usec might underflow (ruby-bugs-ja:#PR33).
 
-Thu Oct 14 14:34:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Mon Dec 18 08:11:20 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (MODE_BINMODE, MODE_BINARY): fixed reversed condition.
+	* hash.c (rb_hash_set_default): should call rb_hash_modify().
 
-Thu Oct 14 13:33:59 2004  Kouhei Sutou  <kou@cozmixng.org>
+Sat Dec 16 02:58:26 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/rss/rss.rb: added link to Tutorial.
+	* eval.c (rb_eval): should clear ruby_errinfo on retry.
 
-Mon Oct 11 13:48:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_rescue2): ditto.
 
-	* ext/tk/lib/tk/*: untabify
+Thu Dec 14 13:06:18 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Sun Oct 10 12:32:08 2004  Dave Thomas  <dave@pragprog.com>
+	* class.c (rb_include_module): prohibit fronzen class/module.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Allow 'require'
-	  to be used as a variable name
+	* eval.c (rb_frozen_class_p): make external.
 
-Sat Oct  9 21:23:37 2004  Kouhei Sutou  <kou@cozmixng.org>
+	* intern.h (rb_frozen_class_p): prototyped.
 
-	* lib/rss/converter.rb: changed to try to use Iconv for default
-	  conversion.
+	* intern.h (rb_undef): prototyped not but rb_undef_method()
+	  which is also in ruby.h.
 
-	* lib/rss/rss.rb: 0.0.9 -> 0.1.0.
+Thu Dec 14 09:20:26 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-Sat Oct  9 19:50:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/cgi.rb: support -T1 on ruby 1.6.2
 
-	* io.c (rb_io_getline): should not treat char as negative value.
-	  [ruby-dev:24460]
+	* lib/cgi.rb: $1 --> Regexp::last_match[1]
 
-Fri Oct  8 09:49:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/telnet.rb: ditto.
 
-	* pack.c (pack_pack): pointer modification check before each
-	  iteration.  [ruby-dev:24445]
+Wed Dec 13 23:27:06 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Oct  8 01:13:05 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_eval): handles case statement without expr, which
+	  looks for any TRUE (non nil, non false) when expression.
 
-	* ext/tk/lib/tk/optiondb.rb: make it more secure
+	* parse.y (primary): case expression should not be compstmt, but
+	  mere expr.
 
-Thu Oct  7 23:47:57 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* parse.y (primary): case without following expression is now
+	  separated rule.
 
-	* ext/tk/lib/tk/scrollbar.rb: When 'set' operation, a scrollbar
-	  cannot propagate view port information from the source widget
-	  (that calls 'set') to other assigned widgets.
+Wed Dec 13 12:41:27 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Oct  7 17:36:25 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ruby.c (proc_options): accept "--^M" for DOS line endings.
 
-	* ext/tk/lib/tk.rb: When CHILDKILLED and so on, Tk.errorCode returns
-	  a Fixnum for 2nd element (it's pid) of the return value.
+Tue Dec 12 15:45:42 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Oct  7 12:55:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (newline_node): cancel newline unification.
 
-	* io.c (io_read): should freeze buffer before thread context
-	  switch. [ruby-dev:24442]
+Mon Dec 11 23:01:57 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* pack.c (pack_unpack): string conversion should at the top of the
-	  method.  [ruby-dev:24439]
+	* parse.y (yylex): supports cases `?' precedes EOF and newline.
 
-	* io.c (io_read): buffer should be frozen only after the length
-	  check.  [ruby-dev:24440]
+Mon Dec 11 12:11:25 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Oct  7 02:56:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (call_end_proc): some frame members were left
+	  uninitialized.
 
-	* ext/stringio/stringio.c: use FMODE_APPEND.
+Mon Dec 11 01:14:58 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Oct  7 01:05:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* io.c (rb_io_fptr_finalize): do not fclose stdin, stdout and
+	  stderr at exit.
 
-	* ext/tk/lib/tk.rb: add Tk.errorInfo and Tk.errorCode
+Sat Dec  9 17:34:48 2000  Tachino Nobuhiro <tachino@open.nm.fujitsu.co.jp>
 
-Thu Oct  7 00:08:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* time.c (time_cmp): should check with kind_of?, not instance_of?
 
-	* io.c (rb_io_s_sysopen): preserve path in the buffer allocated by
-	  ALLOCA_N() to prevent modification.  [ruby-dev:24438]
+	* time.c (time_eql): ditto.
 
-Wed Oct  6 09:21:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* time.c (time_minus): ditto.
 
-	* io.c (rb_io_mode_flags): preserve append mode flag.
-	  [ruby-dev:24436]
+Fri Dec  8 17:23:25 2000  Tachino Nobuhiro <tachino@open.nm.fujitsu.co.jp>
 
-	* io.c (rb_io_modenum_mode): do not use external output buffer.
+	* sprintf.c (rb_f_sprintf): proper string precision treat.
 
-	* string.c (rb_str_justify): differ pointer retrieval to prevent
-	  padding string modification.  [ruby-dev:24434]
+Fri Dec  8 10:44:05 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* range.c (range_each_func): allow func to terminate loop by
-	  returning RANGE_EACH_BREAK.
+	* variable.c (rb_mod_remove_cvar): Module#remove_class_variable
+	  added.
 
-	* range.c (member_i): use RANGE_EACH_BREAK. [ruby-talk:114959]
+Thu Dec  7 17:35:51 2000  Shugo Maeda  <shugo@ruby-lang.org>
 
-Mon Oct  4 14:04:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (stack_length): don't use __builtin_frame_address() on alpha.
 
-	* io.c (rb_file_open_internal, rb_io_reopen): fname might be altered
-	  while GC.  [ruby-dev:24408]
+Wed Dec  6 18:07:13 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Mon Oct  4 12:53:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* djgpp/config.sed, win32/Makefile.sub: typo.
 
-	* ext/tk/lib/tk/optiondb.rb: support definition of command
-	  resources on widgets
+	* eval.c (rb_mod_define_method): avoid VC4.0 warnings.
 
-	* ext/tk/lib/tk/image.rb: bug fix
+Wed Dec  6 13:38:08 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Oct  3 21:20:03 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* array.c (rb_ary_and): tuning, make hash from shorter operand.
 
-	* lib/net/imap.rb (TEXT_REGEXP): allow 8-bit characters for the german
-	version of Microsoft Exchange Server. (backported from HEAD)
+Wed Dec  6 01:28:50 2000  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
 
-	* lib/net/imap.rb (RTEXT_REGEXP): ditto.
+	* gc.c (rb_gc): __builtin_frame_address() should not be used on
+	  MacOS X.
 
-	* lib/net/imap.rb (CTEXT_REGEXP): ditto.
+	* gc.c (Init_stack): ditto.
 
-Sat Oct  2 20:34:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec  4 13:44:01 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* node.h (NEW_DVAR): extra semicolon.
+	* lib/jcode.rb: consider multibyte. not /n.
 
-Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Dec  4 09:49:36 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* marshal.c (r_byte): retrieve pointer from string value for each
-	  time.  [ruby-dev:24404]
+	* string.c (rb_str_inspect): output whole string contents. no more `...'
 
-	* marshal.c (r_bytes0): ditto.
+	* string.c (rb_str_dump): should propagate taintness.
 
-	* enum.c (sort_by_i): re-entrance check added.  [ruby-dev:24399]
+	* hash.c (env_inspect): hash like human readable output.
 
-	* io.c (io_read): should freeze all reading buffer.
-	  [ruby-dev:24400]
+	* variable.c (rb_ivar_get): prohibiting instance variable access
+	  is too much restriction.
 
-	* string.c (rb_str_sum): should use bignums when bits is greater
-	  than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
+	* class.c (method_list): retrieving information should not be
+	  restricted where $SAFE=4.
 
-	* eval.c (specific_eval): defer pointer retrieval to prevent
-	  unsafe sourcefile string modification.  [ruby-dev:24382]
+	* class.c (rb_obj_singleton_methods): ditto.
 
-	* eval.c (specific_eval): defer pointer retrieval to prevent
-	  unsafe sourcefile string modification.  [ruby-dev:24382]
+	* eval.c (rb_thread_priority): ditto.
 
-	* string.c (rb_str_sum): wrong cast caused wrong result.
-	  [ruby-dev:24385]
+	* eval.c (rb_thread_local_aref): ditto.
 
-	* enum.c (enum_sort_by): hide temporary array from
-	  ObjectSpace.each_object.  [ruby-dev:24386]
+	* variable.c (rb_obj_instance_variables): ditto.
 
-	* string.c (rb_str_sum): check was done with false pointer.
-	  [ruby-dev:24383]
+	* variable.c (rb_mod_const_at): ditto.
 
-	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
+	* variable.c (rb_mod_class_variables): ditto.
 
-Mon Oct 11 17:51:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_exec_end_proc): end_proc should be preserved.
 
-	* io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
-	  avoid mode string modification.  [ruby-dev:24454]
+Sat Dec  2 22:32:43 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (rb_io_getline_fast): should take delim as unsigned char to
-	  distinguish EOF and '\377'.  [ruby-dev:24460]
+	* eval.c (rb_yield_0): || should accept exactly zero argument.
 
-	* io.c (rb_io_getline): add check for RS modification.
-	  [ruby-dev:24461]
+	* parse.y (stmt): multiple right hand side for single assignment
+	  (e.g. a = 1,2) is allowed.
 
-	* enum.c (enum_sort_by): use qsort() directly instead using
-	  rb_iterate().  [ruby-dev:24462]
+Wed Nov 29 07:55:29 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
-	  prevent access to recycled object (via continuation for
-	  example).  [ruby-dev:24463]
+	* marshal.c (w_long): dumping long should be smaller than 32bit max.
 
-Fri Oct  1 11:40:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c (w_long): shorter long format for small integers(-123..122).
 
-	* eval.c (rb_f_eval): defer pointer retrieval to prevent unsafe
-	  sourcefile string modification.  [ruby-dev:24373]
+	* marshal.c (r_long): ditto.
 
-	* io.c (io_read): block string buffer modification during
-	  rb_io_fread() by freezing it temporarily. [ruby-dev:24366]
+Tue Nov 28 18:10:51 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (rb_io_s_popen): mode argument may be altered.
-	  [ruby-dev:24375]
+	* eval.c (rb_mod_define_method): quick hack to implement
+	  on-the-fly method definition.  experimental.
 
-	* file.c (rb_file_s_basename): ext argument may be altered.
-	  [ruby-dev:24377]
+Mon Nov 27 17:00:35 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* enum.c (enum_sort_by): use NODE instead of 2 element arrays.
-	  [ruby-dev:24378]
+	* eval.c (rb_eval): should not redefine builtin classes/modules
+	  from within wrapped load.
 
-	* string.c (rb_str_chomp_bang): StringValue() may change the
-	  receiver.  [ruby-dev:24371]
+Mon Nov 27 08:57:33 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Oct  1 11:25:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (call_end_proc): should be isolated from outer block.
 
-	* ext/tk/lib/tk/grid.rb: revive TkGrid.grid
+Mon Nov 27 00:10:08 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/pack.rb: revive TkPack.pack
+	* io.c (rb_io_ctl): call ioctl/fcntl for fptr->f2 too.
 
-	* ext/tk/lib/tk/place.rb: revive TkPlace.place
+	* process.c (rb_f_fork): call rb_thread_atfork() after creating
+	  child process.
 
-Thu Sep 30 00:50:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_thread_atfork): kill all other threads immediately,
+	  then turn the current thread into the main thread.
 
-	* ext/tcltklib/tcltklib.c (ip_init): bug fix
+Sat Nov 25 23:12:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/tkutil.c (get_eval_string_core): accept a Regexp object
+	* eval.c (ruby_run): move calling point of rb_trap_exit after
+	  cleaning up threads.
 
-	* ext/tk/lib/multi-tk.rb: fix bug on 'exit' operation
+	* eval.c (ruby_finalize): new function to call EXIT trap, END
+	  procs and GC finalizers.
 
-	* ext/tk/lib/tk/text.rb: 'tksearch' accepts a Regexp object as a
-	  matting pattern argument
+	* eval.c (rb_exec_end_proc): prevent recursion.
 
-Wed Sep 29 10:58:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (rb_gc_call_finalizer_at_exit): ditto.
 
-	* enum.c (sort_by_i): internally used object must not be changed
-	  outside.  [ruby-dev:24368]
+	* signal.c (rb_trap_exit): ditto. made static.
 
-Mon Sep 27 13:46:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (rb_f_fork): should swallow all exceptions from block
+	  execution.
 
-	* intern.h, struct.c (rb_struct_s_members, rb_struct_members): public
-	  accessors.  [ruby-dev:24342]
+	* process.c (fork_rescue): should call ruby_finalize().
 
-	* marshal.c (w_object, r_object0): use accessors.
+	* parse.y (yycompile): rb_gc() removed.  I don't remember why I put
+	  this here.  test code?
 
-Mon Sep 27 09:14:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Nov 24 22:03:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
-	  [ruby-talk:113807]
+	* range.c (EXCL): exclusive infomation is now stored in an
+	  instance variable.  this enables proper marshal dump.
 
-Fri Sep 24 16:09:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* process.c (proc_waitpid): should clear rb_last_status ($?) if
+	  no pid was given by waitpid(2).
 
-	* eval.c (proc_invoke): propagate DVAR_DONT_RECYCLE on termination
-	  to avoid double call to rb_gc_force_recycle(). [ruby-dev:24311]
+Thu Nov 23 01:35:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Sep 24 08:29:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* process.c (proc_waitpid2): returns nil if no pid found.
 
-	* array.c (rb_ary_subseq): original object might be modified after
-	  sharing data creation.  [ruby-dev:24327]
+Wed Nov 22 23:45:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* array.c (rb_ary_replace): ditto.
+	* range.c (range_eq): new method.  Compares start and end of range
+	  respectively.
 
-	* array.c (ary_make_shared): freeze shared array. [ruby-dev:24325]
+Wed Nov 22 11:01:32 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* struct.c (struct_members): always check struct size and size of
-	  members list in the class.  [ruby-dev:24320]
+	* variable.c (rb_mod_class_variables): should honor singleton
+	  class variable rule defined yesterday.
 
-Thu Sep 23 09:29:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov 21 23:24:14 2000  Mitsuteru S Nakao  <nakao@kuicr.kyoto-u.ac.jp>
 
-	* string.c (rb_str_sub_bang): check if string is not modified
-	  during iteration.  [ruby-dev:24315]
+	* numeric.c (flodivmod): missing second operand (typo).
 
-	* hash.c (rb_hash_rehash): replace st_foreach() by its deep
-	  checking counterpart.  [ruby-dev:24310]
+Tue Nov 21 03:39:41 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Sep 22 13:38:12 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c (marshal_load): marshal format compatibility check
+	  revised.   greater minor revision is UPWARD compatibile;
+	  downward compatibility is not assured.
 
-	* hash.c (rb_hash_rehash): add iteration check.  [ruby-dev:24301]
+	* eval.c (is_defined): clarify class variable behavior for
+	  singleton classes.  class variables within singleton class
+	  should be treated like within singleton method.
 
-	* st.c (st_foreach): add deep check.
+Mon Nov 20 13:45:21 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Sep 22 13:06:14 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (rb_eval): set ruby_sourceline before evaluating
+	  exceptions.
 
-	* win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
-	  merge from HEAD.
+	* gc.c (gc_sweep): defer finalization in GC during compilation or
+	  interrupt prohibit section.
 
-Wed Sep 22 00:11:12 2004  Dave Thomas  <dave@pragprog.com>
+	* gc.c (gc_sweep): mark all nodes before sweeping if GC happened
+	  during compilation.
 
-	* process.c: Add documentation for fork()
+	* eval.c (rb_eval): should treat class variables specially in a
+	  method defined in the singleton class.
 
-Wed Sep 22 09:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Nov 20 10:20:21 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* array.c (rb_ary_collect_bang): element size might change during
-	  comparison.  [ruby-dev:24300]
+	* dir.c, win32/win32.c, ruby.h: add rb_iglob().
 
-	* array.c (rb_ary_reject_bang): ditto. [ruby-dev:24300]
+Mon Nov 20 00:18:16 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* array.c (rb_ary_eql): ditto. [ruby-dev:24300]
+	* array.c (rb_ary_subseq): should return nil for outbound start
+	  index.
 
-Tue Sep 21 18:29:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c (marshal_load): show format versions explicitly when
+	  format version mismatch happens.
 
-	* array.c (rb_ary_equal): merge miss.
+Sun Nov 19 06:13:24 2000  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* array.c (rb_ary_uniq_bang): element size might change during
-	  comparison.  [ruby-dev:24298]
+	* marshal.c: use long for string/array length.
 
-Mon Sep 20 00:24:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* pack.c (swaps): use bit-or(|) instead of plus(+).
 
-	* enum.c (enum_sort_by): do not use qsort directly.  use
-	  rb_ary_sort_bang() instead.  [ruby-dev:24291]
+	* pack.c (swapl): ditto.
 
-	* enum.c (enum_sort_by): pedantic type check added.
-	  [ruby-dev:24291]
+Sat Nov 18 15:18:16 2000  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* hash.c (rb_hash_foreach_iter): check iter_lev after each
-	  iteration.  [ruby-dev:24289]
+	* array.c (rb_ary_replace): array size should be in long.
 
-	* array.c (rb_ary_and): element size might change during
-	  comparison.  [ruby-dev:24290]
+	* array.c (rb_ary_concat): ditto.
 
-	* array.c (rb_ary_or): ditto. [ruby-dev:24292]
+	* array.c (rb_ary_hash): ditto.
 
-	* array.c (rb_ary_equal): wrong fix. [ruby-dev:24286]
+Sat Nov 18 14:07:20 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Sat Sep 18 15:02:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/http.rb: Socket#readline() reads until "\n", not "\r\n"
 
-	* array.c (rb_ary_equal): element size might change during
-	  comparison.  [ruby-dev:24254]
+Fri Nov 17 14:55:18 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* array.c (rb_ary_diff): ditto. [ruby-dev:24274]
+	* string.c (rb_str_succ): output should be NUL terminated.
 
-	* array.c (rb_ary_select): ditto. [ruby-dev:24278]
+Fri Nov 17 02:54:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* array.c (rb_ary_delete): ditto. [ruby-dev:24283]
+	* io.c (rb_io_close): need not to flush before closing.
 
-	* array.c (rb_ary_rindex): ditto. [ruby-dev:24275]
+	* eval.c (rb_thread_join): should preserve last thread status when
+	  THREAD_TO_KILL.
 
-	* array.c (rb_ary_initialize): element size might change during
-	  initializing block.  [ruby-dev:24284]
+	* eval.c (rb_thread_stop): ditto.
 
-Sat Sep 18 14:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (io_fflush): wrap fflush by TRAP_BEG, TRAP_END.
 
-	* dir.c (dir_s_chdir): avoid memory leak and unnecessary chdir to
-	  the original directory when exception has caused in changing
-	  direcotry or within block.  thanks to Johan Holmberg
-	  <holmberg@iar.se> [ruby-core:03446]
+	* eval.c (rb_eval): method defined within singleton class
+	  definition should behave like singleton method about class
+	  variables.
 
-Fri Sep 17 20:20:27 2004  Minero Aoki  <aamine@loveruby.net>
+	* eval.c (is_defined): ditto.
 
-	* lib/fileutils.rb (mkdir_p): backport from CVS HEAD 1.45. [ruby-core:03420]
+Thu Nov 16 23:06:07 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Fri Sep 17 17:11:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/http.rb: can call {old,new}_implementation any times.
 
-	* array.c (rb_ary_delete): element comparison might change array
-	  size. [ruby-dev:24273]
+	* lib/net/http.rb: HTTP#connecting, receive ->
+	  common_oper, connecting.
 
-	* file.c (rb_file_truncate): clear stdio buffer before truncating
-	  the file.  [ruby-dev:24191]
+	* lib/net/http.rb: output warning if u_header includes
+	  duplicated header.
 
-	* ext/digest/digest.c: use rb_obj_class() instead of CLASS_OF
-	  which might return singleton class.  [ruby-dev:24202]
+	* lib/net/http.rb: not check Connection:/Proxy-Connection;
+	  always read until eof.
 
-Fri Sep 17 16:07:09 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/net/protocol.rb: detects and catches "break" from block.
 
-	* ext/tk/lib/multi-tk.rb: improve exit operation
+Thu Nov 16 16:32:45 2000  Masahiro Tanaka  <masa@stars.gsfc.nasa.gov>
 
-Fri Sep 17 15:01:57 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bignum.c (bigdivrem): should have incremented ny first.
 
-	* ext/tcltklib/tcltklib.c: fix SEGV when (thread_)vwait or
-	  (thread_)tkwait
+Thu Nov 16 14:58:00 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/tk/lib/tk.rb: add alias wait_window to wait_destroy
+	* ext/socket/socket.c (sock_new): duplicates file descriptor 
+	  with myfddup() on mswin32/mingw32.
 
-	* ext/tk/lib/multi-tk.rb: support calling 'mainloop' on slave
-	  interpreters (however, the 'real' eventloop must be run on the
-	  Default Master IP)
+	* win32/win32.h: uses system original fdopen().
 
-	* ext/tk/lib/remote-tk.rb: follow the changes of ext/tk/lib/multi-tk.rb
+	* win32/win32.c (myfddup): newly added instead of myfdopen().
 
-	* ext/tk/sample/remote-ip_sample2.rb: ditto
+	* win32/win32.c (mybind, myconnect, mygetsockname, mygetsockopt, 
+	  mylisten, mysetsockopt): now accept file descriptor only, not 
+	  SOCKET.
 
-	* ext/tk/sample/tkoptdb-safeTk.rb: ditto
+	* win32/win32.c (myaccept, mysocket): return file descriptor, 
+	  instead of SOCKET.
 
-Thu Sep 16 18:12:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Nov 16 10:23:24 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER
-	  to request.user attribute.
+	* eval.c (massign): too strict check for nameless rest argument.
 
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#initialize): should expand
-	  the pathname of document root directory.
+	* eval.c (method_arity): mere * should return -1.
 
-Thu Sep 16 15:49:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (intersect_fds): should check all FDs in the fd_set.
 
-	* string.c (rb_str_intern): protect string argument from GC.
-	  [ruby-core:03411]
+Wed Nov 15 19:33:20 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Wed Sep 15 20:22:23 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_attr): should clear method cache before calling hook.
 
-	* ext/tk/sample/tkoptdb-safeTk.rb: fix a bug depend on the changes
-	  of MultiTkIp
+	* eval.c (rb_eval): ditto.
 
-Tue Sep 14 23:54:11 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_mod_modfunc): ditto.
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string was en-bugged by
-	  the previous changes.
+Mon Nov 13 22:44:52 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Sep 14 23:45:44 2004  Dave Thomas  <dave@pragprog.com>
+	* error.c (rb_bug): print version to stderr.
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::TextFormatter.for):
-	  Add Eric Hodel's simpleformatter.
+Mon Nov 13 19:02:08 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Tue Sep 14 16:59:37 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* win32/win32.c, io.c, process.c: the exit status of program must be
+	  multiplied 256 on mswin32 and msdosdjgpp(system(), ``).
 
-	* ext/tcltklib/tcltklib.c: fix SEGV
+Sat Nov 11 22:57:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: improve safe-level handling of argument proc
+	* parse.y (arg): uniformed treatment of -a**b, where a is a
+	  number literal;  hacky but behavior appears more consistent.
 
-	* ext/tk/sample/multi-ip_sample.rb: rename of old 'safe-tk.rb'
+	* parse.y (newline_node): reduce newline node (one per line).
 
-	* ext/tk/sample/safe-tk.rb: new sample script
+	* random.c (rb_f_srand): should be prohibited in safe level
+	  greater than 4.
 
-Tue Sep 14 00:15:15 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Nov 11 22:37:36 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/zlib/zlib.c: backported from HEAD.
+	* rubysig.h: do not use rb_trap_immediate on win32.
 
-Mon Sep 13 19:16:33 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* rubysig.h: new macros, ATOMIC_TEST, ATOMIC_SET, ATOMIC_INC,
+	  ATOMIC_DEC, RUBY_CRITICAL and new definition of TRAP_BEG,
+	  TRAP_END.
 
-	* eval.c (blk_copy_prev): need frame_dup().  [ruby-dev:24103]
+	* gc.c (ruby_xmalloc): should wrap malloc() by RUBY_CRITICAL.
 
-Mon Sep 13 16:23:27 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* signal.c (sighandle): better win32 sig handling.
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_master and new_slave accept
-	  safe-level value argument
+	* win32/win32.c (flock): better implementation.
 
-Mon Sep 13 10:20:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* win32/win32.c (myselect): ditto.
 
-	* object.c (nil_inspect): fix typo.
+	* win32/win32.c (myaccept): ditto.
 
-Mon Sep 13 01:03:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* win32/win32.c (waitpid): ditto.
 
-	* ext/tcltklib/tcltklib.c: improve control of preserv/release tcltkip
+	* win32/win32.c (myrename): ditto.
 
-	* ext/tcltklib/tcltklib.c: store original 'exit' command
+	* win32/win32.c (wait_events): support function for win32 signal
+	  handling.
 
-	* ext/tk/tkutil.c: fix(?) SEGV
+Sat Nov 11 08:34:18 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Sun Sep 12 23:46:23 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.31.
 
-	* util.c (ruby_strdup): remove unnecessary code. (xmalloc never
-	  returns NULL.)
+	* lib/net/http.rb: initializes header in HTTP, not HTTPCommand.
 
-	* util.c (ruby_getcwd): fix memory leak on failure.
+	* lib/net/protocol.rb, http.rb: rewrites proxy code.
 
-Sun Sep 12 02:41:58 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Nov 10 16:15:53 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp#allow_ruby_exit? and
-	  allow_ruby_exit=
+	* numeric.c (rb_num2long): use to_int, not to_i.
 
+	* error.c: T_SYMBOL was misplaced by T_UNDEF.
 
-	* ext/tk/lib/multi-tk.rb: ditto.
+	* parse.y (yylex): eval("^") caused infinite loop.
 
-	* ext/tk/lib/remote-tk.rb: ditto.
+Thu Nov  9 14:22:13 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tcltklib/MANUAL.euc: ditto.
+	* io.c (rb_io_taint_check): should check IO taintness; no
+	  operation for untainted IO should be allowed in the sandbox.
 
-	* ext/tcltklib/MANUAL.eng: ditto.
+	* rubyio.h (GetOpenFile): check IO taintness inside using
+	  rb_io_taint_check().
 
-	* ext/tcltklib/tcltklib.c: fix some reasons of SEGV
+Wed Nov  8 03:08:53 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/tkutil.c: ditto.
+	* io.c (io_fflush): ensure fflush(3) would not block by calling
+	  rb_thread_fd_writable(). 
 
-	* ext/tk/lib/multi-tk.rb: ditto.
+Tue Nov  7 20:29:56 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* ext/tk/lib/tk/timer.rb: ditto.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.30.
 
-Sat Sep 11 16:09:46 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/protocol.rb, smtp.rb: Command#critical_ok -> error_ok
 
-	* lib/rdoc/parsers/parse_rb.rb: Fix up cross-file class merging.
+	* lib/net/http.rb: reads header when also "100 Continue".
 
-Fri Sep 10 20:20:53 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Nov  7 04:32:19 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c (lib_merge_tklist): fix suspicious
-	  pointer conversion.
+	* bignum.c (bigdivrem): use bit shift to make y's MSB set.
 
-Fri Sep 10 02:43:54 2004  Dave Thomas  <dave@pragprog.com>
+Mon Nov  6  1:22:49 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rdoc/generators/template/kilmer.rb: James Buck's
-	  patch for call-seq.
+	* error.c (warn_print): do not use err_append(), to ensure output
+	  to stderr.
 
-Thu Sep  9 13:58:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* error.c (rb_warn): use warn_print() instead of err_print().
 
-	* ext/tcltklib/tcltklib.c (ip_init): change flag value for setting
-	  'argv' and 'argv0' variable
+	* error.c (rb_warning): ditto.
 
-	* ext/tk/lib/remote-tk.rb: follow changes of multi-tk.rb
+	* error.c (rb_bug): ditto.
 
-Thu Sep  9 11:46:18 2004  Dave Thomas  <dave@pragprog.com>
+	* eval.c (rb_load): re-raise exceptions during load.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_classes): Allow
-	  spaces aroun parameter to define_method_under (James Buck)
+	* time.c (make_time_t): remove useless adjust
 
-Wed Sep  8 18:44:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Nov  2 18:01:16 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/stringio/stringio.c (strio_write): zero fill a gap if exsts.
-	  [ruby-dev:24190]
+	* random.c (rb_f_rand): half-baked float support fixed.  This fix
+	  was originally proposed by K.Kosako <kosako@sofnec.co.jp>.
 
-Wed Sep  8 15:19:49 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Oct 31 17:27:17 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c (ip_init): cannot create a IP at level 4
+	* bignum.c: change digit size to `long|int' if long long is
+	  available.
 
-	* ext/tk/lib/multi-tk.rb: improve 'exit' operation, security check,
-	  and error treatment
+	* marshal.c (w_object): support `long|int' digits.
 
-	* ext/tk/lib/multi-tk.rb: allow a trusted slave IP to create slave IPs
+	* marshal.c (r_object): ditto.
 
-	* ext/tk/lib/tk/listbox.rb: add TkListbox#value, value=, clear,	and
-	  erase
+Sat Oct 28 23:54:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/text.rb: add TkText#clear and erase
+	* parse.y (yylex): allow =end at the end of file (without a
+	  newline at the end).
 
-Tue Sep  7 15:17:49 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Oct 27 10:00:27 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/socket/socket.c (ruby_connect): break immediately if a
-	  socket is non-blocking.  [ruby-talk:111654]
+	* bignum.c (rb_cstr2inum): should ignore trailing white spaces.
 
-Mon Sep  6 11:08:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bignum.c (rb_str2inum): string may not have sentinel NUL.
 
-	* ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
+Fri Oct 27 02:37:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Sep  6 11:00:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (rb_cstr2inum): wrongly assigned base to c before
+	  badcheck check.
 
-	* dir.c (dir_s_chdir): the patch to shut up false warning when
-	  exception occurred within a block.  a patch was given from Johan
-	  Holmberg <holmberg at iar.se>.  [ruby-core:03292]
+Thu Oct 26 02:42:50 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Mon Sep  6 07:51:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/protocol.rb: Command#critical_ok
 
-	* eval.c (cvar_cbase): singletons should refer outer cvar scope.
-	  [ruby-dev:24223]
+	* lib/net/smtp.rb: clear critical flag before go to SMTP
 
-	* eval.c (rb_load): should preserve previous ruby_wrapper value.
-	  [ruby-dev:24226]
+Wed Oct 25 12:30:19 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Sep  4 01:14:57 2004  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.
 
-	* eval.c (cvar_cbase): class variables cause SEGV in
-	  instance_eval() for fixnums and symbols. [ruby-dev:24213]
+	* array.c (rb_ary_replace): replacing array might be the receiver
+	  itself.  use memmove.
 
-Fri Sep  3 17:47:58 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Oct 20 07:56:23 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* struct.c (make_struct): remove redefining constant when
-	  conflict.  [ruby-dev:24210]
+	* eval.c (rb_eval): ARGSPUSH should not modify args array.
 
-Fri Sep  3 11:31:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Oct 19 14:58:17 2000  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* ext/tk/lib/tk.rb: Tk.after makes TkCore::INTERP.tk_cmd_tbl grow
-	  [ruby-dev:24207]
+	* pack.c (NUM2U32): should use NUM2ULONG().
 
-Fri Sep  3 02:12:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Oct 17 17:30:34 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c: fix typo [ruby-talk:111266]
+	* eval.c (error_print): ruby_sourcefile may be NULL.
 
-	* ext/tk/lib/tk/text.rb: fix typo
+Tue Oct 17 16:36:28 2000  Wes Nakamura  <wknaka@pobox.com>
 
-	* ext/tk/lib/multi-tk.rb: improve safe-level treatment on slave IPs
+	* pack.c (NATINT_U32): wrong use of sizeof.
 
-Fri Sep  3 01:54:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct 17 12:48:20 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* ext/extmk.rb: already built-in libraries satisfy dependencies.
-	  [ruby-dev:24028]
+	* eval.c (rb_abort): nil check against ruby_errinfo.
 
-Thu Sep  2 11:36:20 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (rb_thread_schedule): use FOREACH_THREAD_FROM instead of
+	  FOREACH_THREAD, since curr_thread may be removed from thread ring.
 
-	* eval.c (rb_obj_instance_eval): backported from HEAD.
+	* eval.c (THREAD_ALLOC): errinfo should be Qnil.
 
-Wed Sep  1 21:18:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (rb_callcc): th->prev,th->next are now already
+	  initialized in THREAD_ALLOC.
 
-	* ext/tk/lib/tk/spinbox.rb: fix typo
+Mon Oct 16 15:37:33 2000  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Tue Aug 31 18:24:04 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (rb_thread_inspect): tag size was shorter than required.
 
-	* ext/tk/tkutil.c (cbsubst_init): fix memory leak
+	* object.c (rb_obj_inspect): ditto.
 
-	* ext/tk/tkutil.c (cbsubst_get_all_subst_keys): fix SEGV
+Mon Oct 16 14:25:18 2000  Shugo Maeda  <shugo@ruby-lang.org>
 
-Tue Aug 31 16:04:22 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* object.c (sym_inspect): used `name' before initialization.
 
-	* ext/tcltklib/tcltklib.c (ip_delete): when a tcltkip is deleted,
-	  destroy its root widget
+Mon Oct 16 14:06:00 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Aug 31 12:30:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* pack.c (pack_pack): use NATINT_U32 for 'l', 'L', and 'N'.
 
-	* ext/tcltklib/tcltklib.c (del_root): fix SEGV
+	* pack.c (I32,U32): 32 bit sized integer.
 
-Mon Aug 30 23:11:06 2004  Dave Thomas  <dave@pragprog.com>
+	* pack.c (OFF16,OFF32B): big endian offset for network byteorder.
 
-	* lib/rdoc/ri/ri_driver.rb (and others): ri now merges documentation
-	  if it finds the same class in multiple places.
+Mon Oct 16 06:39:32 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Mon Aug 30 22:40:30 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/net/http.rb: hex-alpha is not [a-h] but [a-f].
 
-	* ext/tk/lib/multi-tk.rb: 'restart' method accepts arguments
+Mon Oct 16 01:02:02 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Aug 30 21:50:14 2004  Dave Thomas  <dave@pragprog.com>
+	* eval.c (rb_thread_start_0): should not abort on exception if
+	  $SAFE >= 4.
 
-	* object.c: Add RDoc for Module.included.
+	* parse.y (sym): symbols for class variable names.
 
-Mon Aug 30 15:10:46 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sun Oct 15 01:49:18 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]
+	* file.c (rb_file_flock): should accept interrupt.
 
-Mon Aug 30 11:29:35 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* process.c (rb_waitpid): ditto.
 
-	* win32/win32.c (CreateChild): strip trailing spaces. [ruby-dev:24143]
-	  merge from HEAD.
+	* process.c (rb_waitpid): ditto.
 
-Sun Aug 29 14:08:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* process.c (proc_wait): ditto.
 
-	* ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]
+	* process.c (proc_waitpid2): wrong recursion.
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string does not work
+Sat Oct 14 03:32:13 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Aug 28 23:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_thread_alloc): should not link a new thread in the
+	  live thread ring before initialization.
 
-	* bignum.c (rb_big_and): protect parameters from GC.
-	  [ruby-talk:110664]
+Fri Oct 13 17:08:09 2000  Shugo Maeda  <shugo@ruby-lang.org>
 
-Thu Aug 26 04:38:29 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/imap.rb: new file.
 
-	* eval.c (return_jump): Minor typo in error message. Now reads
-	  "return can't jump across threads".
+Thu Oct 12 18:56:28 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Tue Aug 24 17:30:00 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/net/pop.rb: POP3#reset
 
-	* lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not
-	  use a session id as a filename. (backported from HEAD)
+	* lib/net/http.rb: a code for "Switch Protocol" was wrongly 100.
 
-	* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): ditto.
+Thu Oct 12 01:23:38 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): use
-	  Dir::tmpdir. (backported from HEAD)
+	* lib/cgi.rb: bug fix: CGI::html(): PRETTY option didn't work.
 
-Tue Aug 24 14:40:16 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Thu Oct 12 00:03:02 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/cgi/session.rb (CGI::Session::FileStore#initialize): untaint
-	  session id after check. (backported from HEAD)
+	* object.c (sym_inspect): should adjust string length.
 
-Tue Aug 24 09:09:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* struct.c (rb_struct_to_s): ditto.
 
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): d2i
-	  functions may replace the pointer indicated by the first argument.
+	* struct.c (rb_struct_inspect): ditto.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
+Wed Oct 11 22:15:47 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
+	* eval.c (rb_thread_inspect): should adjust string length.
 
-Mon Aug 23 14:04:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* object.c (rb_any_to_s): ditto.
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read):
-	  - should return an empty string if specified length to read is 0.
-	  - should check for pending data and wait for fd before reading.
-	  - call underlying IO's sysread if SSL session is not started.
-	  [ruby-dev:24072], [ruby-dev:24075]
+	* object.c (rb_obj_inspect): ditto.
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_write):
-	  - call underlying IO's syswrite if SSL session is not started.
+Wed Oct 11 18:13:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_pending): new method
-	  OpenSSL::SSL#pending.
+	* eval.c (rb_thread_start_0): should check insecure exit.
 
-	* ext/openssl/lib/openssl/buffering.rb: should not use select.
+Wed Oct 11 14:29:51 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Mon Aug 23 12:40:56 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/net/protocol.rb: 2nd arg for ProtocolError#initialize is
+	  optional.
 
-	* lib/resolv.rb (Config.default_config_hash): when multiple domains
-	  are set, Win32::Resolv.get_resolv_info returns Array.
+	* lib/net/http.rb: code refining.
 
-Sun Aug 22 01:15:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Oct 11 11:13:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
-	  should call :ProxyContentHandler before finishing CONNECT.
+	* parse.y (primary): setter method (e.g. foo=) should always be
+	  public.
 
-Sat Aug 21 06:41:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_thread_raise): should not raise SecurityError if
+	  exception raised by the interpreter.
 
-	* ext/tcltklib/extconf.rb (find_tcl, find_tk): find stub library.
+	* eval.c (rb_thread_cleanup): skip all THREAD_KILLED threads
+	  before FOREACH_THREAD.
 
-	* lib/mkmf.rb (arg_config, with_config): deal with '-' and '_'
-	  uniformly.  [ruby-dev:24118]
+Tue Oct 10 16:11:54 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Aug 19 16:29:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* dln.c (dln_load): remove unused code for Cygwin.
 
-	* ext/tk/lib/tk.rb: Fail to treat a hash value of 'font' option.
+Tue Oct 10 09:49:23 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion infomation.
+	* file.c (Init_File): FileTest.size should return 0 (not nil) for
+	  empty files.
 
-	* ext/tk/lib/menu.rb: typo bug.
+Sun Oct  8 13:20:26 2000  Guy Decoux  <decoux@moulon.inra.fr>
 
-Thu Aug 19 15:15:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (POP_SCOPE): not just set SCOPE_DONT_RECYCLE, but do
+	  scope_dup().
 
-	* dir.c (free_dir): fix memory leak.  reported by yamamoto
-	  madoka.
+Sat Oct  7 15:10:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Aug 19 11:00:00 2004  Akiyoshi, Masamichi  <masamichi.akiyoshi@hp.com>
+	* string.c (rb_str_reverse_bang): unnecessary ALLOCA_N() was
+	  removed.
 
-	* dln.c (dln_load): Modify to call lib$find_image_symbol for VMS.
-	* io.c (rb_io_fwrite): Use fputc() for VMS non-stream file.
+Fri Oct  6 14:50:24 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Thu Aug 19 06:07:45 2004  why the lucky stiff  <why@ruby-lang.org>
+	* ext/extmk.rb.in, lib/mkmf.rb: remove "DESTDIR =".
 
-	* ext/syck/token.c: re2c no longer compiled with bit vectors.  caused
-	  problems for non-ascii characters. [ruby-core:03280]
-	* ext/syck/implicit.c: ditto.
-	* ext/syck/bytecode.c: ditto.
+	* Makefile.in, win32/Makefile.sub, ruby.1: renamed -X to -C.
 
-	* lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
-	  fixed problem with extra line feeds at end of folding, whitespace
-	  opening scalar blocks.
+Fri Oct  6 12:50:52 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/yaml/rubytypes.rb: subtelties in handling strings with
-	  non-printable characters and odd whitespace patterns.
+	* array.c (rb_ary_plus): use to_ary(), not Check_Type().
 
-Wed Aug 18 23:41:33 2004  Minero Aoki  <aamine@loveruby.net>
+	* array.c (rb_ary_concat): ditto.
 
-	* lib/net/protocol.rb (rbuf_fill): OpenSSL::SSL::SSLSocket has its own
-	  buffer, select(2) might not work. [ruby-dev:24072]
+	* gc.c (rb_gc): use __builtin_frame_address() for gcc.
 
-Wed Aug 18 17:10:12 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (stack_length): ditto.
 
-	* ext/tcltklib/stubs.c (ruby_tcltk_stubs): need to call
-	  Tcl_FindExecutable() for Tcl/Tk 8.4.
+	* parse.y (assign_in_cond): stop warning till some better warning
+	  condition will be found.
 
-Wed Aug 18 12:52:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Oct  5 18:02:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_obj_instance_eval): evaluates under special singleton
-	  classes as for special constants.
+	* object.c (rb_obj_dup): should have propagated taint flag.
+	  (ruby-bugs:#PR64,65)
 
-Tue Aug 17 17:20:59 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Oct  4 00:26:11 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (rb_io_reopen): should clear allocated OpenFile.  pointed
-	  out by Guy Decoux. [ruby-core:03288]
+	* eval.c (proc_arity): proc{|a|}'s arity should be -1.
 
-Tue Aug 17 01:36:32 2004  Dave Thomas  <dave@pragprog.com>
+Mon Oct  2 05:28:58 2000  akira yamada  <akira@ruby-lang.org>
 
-	* lib/rdoc/usage.rb: Remove extra indent. Tidy 'ri' option
-	  parsing so RDoc::usage plays better with OptionParser.
+	* string.c (trnext): minus at the end of pattern.
 
-Sat Aug 14 13:09:10 2004  Minero Aoki  <aamine@loveruby.net>
+Sun Oct  1 00:43:34 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/fileutils.rb: backport from CVS HEAD (rev1.44).
+	* configure.in: exp-name was wrong on cygwin and mingw32.
 
-	* lib/fileutils.rb: cp_r should copy symlink itself, except cp_r
-	  root.
+Thu Sep 28 14:57:09 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/fileutils.rb: new option mv :force.
+	* regex.c (re_compile_pattern): should try must_string calculation
+	  every time.
 
-	* lib/fileutils.rb: new module FileUtils::DryRun.
+Tue Sep 19 23:47:44 2000  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
 
-Sat Aug 14 02:48:16 2004  Dave Thomas  <dave@pragprog.com>
+	* configure.in, config.guess, config.sub: MacOS X support.
 
-	* lib/rdoc/usage.rb: Added. Allows command line programs
-	  to report usage using their initial RDoc comment.
+Wed Sep 27 18:40:05 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Aug 13 13:23:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* stable version 1.6.1 released.
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_range_header):
-	  fix regex for range-spec.
+Wed Sep 27 16:13:05 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::DefaultFileHandler#make_partial_content):
-	  multipart/byteranges response was broken.
+	* mkconfig.rb: variables should be expanded only if /\$\{?\w+\}?/.
 
-	* lib/webrick/httpservlet/erbhandler.rb
-	  (WEBrick::HTTPServlet::ERBHandler#do_GET): should select media type
-	  by suffix of script filename.
+Tue Sep 26 18:09:51 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/xmlrpc/server.rb: refine example code.
+	* string.c: include <math.h>
 
-Wed Aug 11 17:17:50 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Tue Sep 26 15:59:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
+	* object.c (rb_mod_dup): metaclasses of class/module should not be
+	  cleared by rb_obj_dup.
 
-Sun Aug  8 00:43:31 2004  why the lucky stiff  <why@ruby-lang.org>
+Tue Sep 26 02:44:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/implicit.c: added sexagecimal float#base60.
+	* gc.c (GC_MALLOC_LIMIT): size extended.
 
-	* ext/syck/rubyext.c (yaml_org_handler): ditto.
+	* regex.c (DOUBLE_STACK): use machine's stack region for regex
+	  stack if its size is small enough.
 
-	* lib/token.c: indentation absolutely ignored when processing flow
-	  collections.  plain scalars are trimmed if indentation follows in
-	  an ambiguous flow collection.
+Mon Sep 25 18:13:07 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Aug  7 00:50:01 2004  Tanaka Akira  <akr@m17n.org>
+	* regex.c: include <defines.h>.
 
-	* ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns "" instead of nil.
+	* eval.c (rb_add_method): cache mismatch by method
+	  definition. need to clear_cache_by_id every time.
 
-Tue Aug  3 13:49:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Sep 25 13:31:45 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* ext/tk/lib/tk/namespace.rb: bug fix
+	* win32/win32.c (NtCmdGlob): substitute '\\' with '/'.
 
-	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: add Tk::TreeCtrl.loupe
+Mon Sep 25 00:35:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Mon Aug  2 18:04:21 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* defines.h: #undef HAVE_SETITIMER on cygwin.
 
-	* ext/tk/lib/tk/msgcat.rb (set_translation): bug fix (fail to set
-	  trans_str to the same as src_str when trans_str is not given.)
+Sun Sep 24 03:01:53 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Mon Aug  2 11:53:06 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/protocol.rb, http.rb: typo.
 
-	* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion
-	  looking up some top level symbols (batsman)
+Sat Sep 23 07:33:20 2000  Aleksi Niemela  <aleksi.niemela@cinnober.com>
 
-Mon Aug  2 11:48:29 2004  Dave Thomas  <dave@pragprog.com>
+	* regex.c (re_compile_pattern): nicer regexp error messages for
+	  invalid patterns.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Allow '.'s in
-	  variable names to support SWIG generated files (Hans Fugal)
+Sat Sep 23 03:06:25 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jul 31 17:40:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* variable.c (rb_autoload_load): should not require already
+	  provided features. 
 
-	* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial,
-	  ruby-calculate-indent, ruby-move-to-block, ruby-forward-sexp,
-	  ruby-backward-sexp): keywords must match word-wise.
+Fri Sep 22 15:46:21 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Sat Jul 31 05:47:37 2004  why the lucky stiff  <why@ruby-lang.org>
+	* lib/net/http.rb: too early parameter expansion in string.
 
-	* lib/yaml.rb (YAML::load_file, YAML::parse_file): added.
+Fri Sep 22 13:58:51 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/yaml/rubytypes.rb: exceptions were using an older
-	  YAML.object_maker. [ruby-core:03080]
+	* ext/extmk.rb.in: don't use default $:
 
-	* ext/syck/token.c (sycklex_yaml_utf8): using newline_len to
-	  handline CR-LFs.  "\000" was showing up on folded blocks which
-	  stopped at EOF.
+Fri Sep 22 13:42:50 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* ext/syck/token.c: re2c compiled with bit vectors now.
-	* ext/syck/implicit.c: ditto.
-	* ext/syck/bytecode.c: ditto.
+	* regex.c (PUSH_FAILURE_COUNT): avoid casting warning on alpha.
 
-Fri Jul 30 16:10:54 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* regex.c (PUSH_FAILURE_POINT): ditto.
 
-	* ext/tcltklib/tcltklib.c (lib_fromUTF8_core): raise ArgumentError when
-	  the unknown encoding name is given.
+Fri Sep 22 10:16:21 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* ext/tcltklib/tcltklib.c (lib_toUTF8_core): ditto.
+	* win32/config.h.in: add HAVE_TELLDIR, HAVE_SEEKDIR
 
-	* ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertfrom): bug fix.
+Thu Sep 21 19:04:34 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertto): ditto.
+	* ext/extmk.rb, lib/mkmf.rb (install_rb): check whether libdir is
+	  directory or not.
 
-Wed Jul 28 18:59:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Sep 21 17:23:05 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/cgi.rb (CGI::initialize): remove at_exit code for CGI_PARAMS
-	  and CGI_COOKIES.  they will no longer be used.
+	* file.c (rb_file_s_symlink): use HAVE_SYMLINK.
 
-Wed Jul 28 01:04:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (rb_file_s_readlink): use HAVE_READLINK.
 
-	* gc.c (run_final): wrong order of data. [ruby-dev:23984]
+	* dir.c (dir_tell): use HAVE_TELLDIR.
 
-Tue Jul 27 07:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* dir.c (dir_seek): use HAVE_SEEKDIR.
 
-	* eval.c (rb_eval): copy on write for argument local variable
-	  assignment.
+	* configure.in (AC_CHECK_FUNCS): lstat, symlink, readlink,
+	  telldir, seekdir checks added.
 
-	* eval.c (assign): ditto.
+	* file.c (lstat): should use stat(2) if lstat(2) is not
+	  available.
 
-	* eval.c (rb_call0): update ruby_frame->argv with the default
-	  value used for the optional arguments.
+Thu Sep 21 15:59:23 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* object.c (Init_Object): "===" calls rb_obj_equal() directly.
-	  [ruby-list:39937]
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.29.
 
-Mon Jul 26 11:22:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/net/http.rb: HTTPReadAdapter -> HTTPResponseReceiver
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape): should
-	  escape space.
+	* lib/net/http.rb (connecting): response is got in receive()
 
-Sun Jul 25 11:05:21 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Sep 21 15:49:07 2000  Wayne Scott  <wscott@ichips.intel.com>
 
-	* win32/win32.{h,c} (rb_w32_{f,fd,fs}open): workaround for bcc32's
-	  {f,fd,fs}open bug. set errno EMFILE and EBADF. [ruby-dev:23963]
+	* lib/find.rb (find): should not follow symbolic links;
+	  tuned performance too.
 
-Sat Jul 24 13:32:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Sep 20 23:21:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* range.c (rb_range_beg_len): returns Qnil only when "beg" points
-	  outside of a range.  No boundary check for "end".
+	* ruby.c (load_file): two Ctrl-D was required to stop ruby at the
+	  beginning of stdin script read.
 
-Fri Jul 23 16:40:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Sep 20 14:01:45 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* gc.c (define_final): should not disclose NODE* to Ruby world.
-	  [ruby-dev:23957]
+	* eval.c (rb_provided): detect infinite load loop.
 
-Fri Jul 23 09:03:16 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* eval.c (rb_provided): too weak filename comparison.
 
-	* lib/net/imap.rb (disconnected?): new method. (backported from HEAD)
+	* eval.c (rb_thread_alloc): avoid recycling still referenced
+	  dvar structures. 
 
-Thu Jul 22 16:41:54 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_callcc): ditto.
 
-	* lib/cgi/session.rb (CGI::Session::FileStore#update): sets the
-	 permission of the session data file to 0600.
+	* eval.c (THREAD_ALLOC): fiil dyna_vars field by ruby_dyna_vars.
 
-	* lib/cgi/session/pstore.rb (CGI::Session::Pstore#initialize):
-	  ditto.
+Tue Sep 19 17:47:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jul 22 00:02:21 2004  Masahiro Kitajima  <katonbo@katontech.com>
+	* stable version 1.6.0 released.
 
-	* process.c (rb_f_system): not need to call last_status_set() any
-	  longer on _WIN32.
+Tue Sep 19 16:24:52 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Jul 20 09:15:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* marshal.c (Init_marshal): provide marshal.so no more.
 
-	* test/fileutils/test_fileutils.rb: File.link raises EINVAL on BeOS.
+Tue Sep 19 14:01:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Mon Jul 19 01:15:07 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* configure.in, win32/setup.mak: include version number
+	  in RUBY_SO_NAME.
 
-	* lib/webrick/httpservlet/cgihandler.rb
-	  (WEBrick::HTTPServlet::CGIhandler#do_GET): set SystemRoot environment
-	  variable to CGI process on Windows native platforms. [ruby-dev:23936]
+Tue Sep 19 13:07:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/webrick/httpservlet/cgihandler.rb
-	  (WEBrick::HTTPServlet::CGIhandler#do_GET): use $?.exitstatus and
-	  refine log message.
+	* parse.y (yylex): was confusing $~ and $_.
 
-Sun Jul 18 16:14:29 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Sep 19 13:06:53 2000  GOTOU YUUZOU  <gotoyuzo@notwork.org>
 
-	* ext/tk/lib/tk/msgcat.rb (TkMsgCatalog.callback): bug fix
-	  ( wrong number of argument )
+	* signal.c (rb_f_kill): signum may be a negative number, should be
+	  treated by signed number.
 
-Sun Jul 18 08:13:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep 19 01:14:56 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* sprintf.c (rb_f_sprintf): remove extra sign digit.
+	* eval.c (rb_provide): better feature handling.
 
-Sun Jul 18 03:21:42 2004  Akinori MUSHA  <knu@iDaemons.org>
+	* eval.c (rb_f_require): loading ruby library may be partial
+	  state.  checks in rb_thread_loading is integrated.
 
-	* dir.c (range): use NULL instead of 0.
+	* eval.c (rb_provided): better thread awareness.
 
-	* dir.c (range): get rid of a gcc 3.4 warning.
+	* lib/irb/frame.rb: 6 (not 5) parameters for trace_func proc.
 
-Sun Jul 18 03:12:11 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* eval.c (error_print): should print error position even if
+	  get_backtrace() failed.
 
-	* lib/net/imap.rb (receive_responses): return if a LOGOUT response
-	received. (backported from HEAD)
-	* lib/net/imap.rb (send_string_data): wait command continuation
-	requests before sending octet data of literals. (backported from HEAD)
+Sat Sep 16 03:29:59 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jul 17 23:54:59 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_f_require): rb_provided() was called too early; does
+	  not work well with threads.
 
-	* ext/tk/lib/tk/variable.rb: TkVariable#ref returns a TkVariable object
+	* parse.y (ensure): should distinguish empty ensure and non
+	  existing ensure.
 
-Sat Jul 17 22:04:44 2004  akira yamada  <akira@ruby-lang.org>
+	* file.c (Init_File): extending File by class of FileTest was
+	  serious mistake.
 
-	* lib/uri/ldap.rb: method hierarchical? should be in URI::LDAP.
+Thu Sep 14 02:46:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jul 17 18:29:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_thread_yield): array strip should be done in this
+	  function. 
 
-	* parse.y (stmt): not to show same error messages twice.
+Wed Sep 13 17:01:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jul 17 13:13:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (rb_big_eq): incomplete value comparison of bignums.
 
-	* lib/irb/ruby-lex.rb (RubyLex::identify_string): %s string do not
-	  process expression interpolation.  [ruby-talk:106691]
+Wed Sep 13 06:39:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jul 17 05:26:27 2004  Dave Thomas  <dave@pragprog.com>
+	* variable.c (rb_mod_class_variables): Module#class_variables added.
 
-	* lib/rdoc/diagram.rb: Incorporate Micheal Neuman's
-	  client-side imagemao patch
+Wed Sep 13 06:09:26 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-Sat Jul 17 01:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/cgi.rb: bug fix: CGI::header(): output status header.
 
-	* eval.c (THREAD_ALLOC): th->thread should be initialized to NULL.
-	  [ruby-talk:106657]  The solution was found by Guy Decoux.
+Wed Sep 13 01:09:12 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jul 16 22:30:28 2004  Michael Neumann  <mneumann@ntecs.de>
+	* parse.y (yylex): allow global variables like '$__a'.
 
-	* file.c (rb_stat_dev_major): new methods File::Stat#dev_major and
-	  #dev_minor. [ruby-core:03195]
+Tue Sep 12 22:28:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Fri Jul 16 15:23:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/extconf.rb: avoid using terrible <netinet/tcp.h>
+	  on cygwin 1.1.5.
 
-	* eval.c (return_jump, break_jump): raise unexpceted local jump
-	  exception directly.  [ruby-dev:23740]
+Tue Sep 12 16:01:58 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/base64.rb (Deprecated): super in bound method calls original
-	  name method in stable version.  [ruby-dev:23916]
+	* array.c (rb_ary_unshift_m): typo.
 
-Fri Jul 16 11:31:49 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Sep 12 15:37:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/test/unit/ui/{fox,gtk,gtk2}/testrunner.rb: remove
-	  garbage (patch from akira yamada) [ruby-dev:23911]
+	* eval.c (rb_yield_0): stripped array too much, should remove just
+	  for proc_call().
 
-Fri Jul 16 11:20:00 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Sep 12 07:05:24 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* sprintf.c (rb_f_sprintf): fix output of NaN, Inf and -Inf with
-	  "%f" or etc on MSVCRT platforms. (backported from HEAD)
+	* lib/cgi.rb: version 2.0.0: require ruby1.5.4 or later.
 
-Fri Jul 16 11:17:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/telnet.rb: version 1.6.0
 
-	* error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
-	  [ruby-dev:23913]
+Tue Sep 12 03:26:07 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* error.c (exit_success_p): new method SystemExit#success?.
-	  [ruby-dev:23912]
+	* eval.c (massign): use to_ary to get an array if available.
 
-	* error.c (syserr_initialize): initialization for subclasses.
-	  [ruby-dev:23912]
+	* object.c (rb_Array): ditto.
 
-Thu Jul 15 23:53:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Sep 11 14:24:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/optparse.rb (OptionParser#warn, OptionParser#abort): Exception
-	  no longer has to_str method.
+	* hash.c (ruby_setenv): should not free the element of
+	  origenvironment.
 
-Thu Jul 15 22:59:48 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* parse.y (command_call): kYIELD moved to this rule to allow
+	  'a = yield b'. (ruby-bugs-ja:#PR15) 
 
-	* ext/readline/extconf.rb: added dir_config for curses, ncurses,
-	termcap. (backported from HEAD)
+Mon Sep 11 01:27:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jul 15 20:29:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (rb_yield_0): proc#call([]) should pass single value to
+	  the block.
 
-	* class.c, error.c, eval.c, intern.h, object.c, variable.c:
-	  do not set path if it is a singleton class.  [ruby-dev:22588]
-	  (backport from 1.9)
+	* eval.c (callargs): reduce array allocation.
 
-Thu Jul 15 10:15:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (massign): precise check for argument number.
 
-	* ext/tk/, ext/tcltklib/: bug fix
+Fri Sep  8 10:05:17 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: better operation for SIGINT when processing
-	  callbacks.
-	* ext/tk/lib/tk/msgcat.rb: ditto.
-	* ext/tk/lib/tk/variable.rb: ditto.
-	* ext/tk/lib/tk/timer.rb: ditto.
+	* gc.c (STR_NO_ORIG): should be FL_USER2.
 
-	* ext/tk/lib/tk/validation.rb: add Tk::ValidateConfigure.__def_validcmd
-	  to define validatecommand methods easier
+Thu Sep  7 14:17:51 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb (_genobj_for_tkwidget): support autoload Tk ext
-	  classes
+	* string.c (rb_str_cat): should work even for concatenating same
+	  string.
 
-	* ext/tk/lib/tk/canvas.rb and so on: remove the parent widget type
-	  check for items (e.g. canvas items; depends on the class) to
-	  avoid some troubles on Tk extension widget class definition.
+Wed Sep  6 17:06:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/: add Iwidget and TkTable extension support
+	* variable.c (rb_cvar_declare): should check superclass's class
+	  variable first.
 
-	* ext/tk/sample/tkextlib/: add samples of Iwidget and TkTable
+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.
 
-Wed Jul 14 18:08:37 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* misc/ruby-mode.el (ruby-parse-region): should not give up if
+	  modifiers are at the end of line.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of
-	  argument. [ruby-dev:23891]
+	* misc/ruby-mode.el (ruby-expr-beg): indented wrongly if modified
+	  statement was size 1.
 
-	* test/openssl/test_x509store.rb: prune tests for CRL checking
-	  unless X509::V_FLAG_CRL_CHECK is defined.
+Wed Sep  6 10:41:19 2000  Kenichi Komiya  <kom@mail1.accsnet.ne.jp>
 
-Wed Jul 14 12:29:07 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* misc/ruby-mode.el (ruby-parse-region): modifier was not handled
+	  well on emacs19.
 
-	* util.c (ruby_strtod): should not convert string in the form of
-	  "-I.FE-X" which both "I" and "F" are ommitted. [ruby-dev:23883]
+Tue Sep  5 17:10:12 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/ruby/test_float.rb (test_strtod): add test for bug fix.
+	* time.c (time_to_s): fixed zone string UTC for utc time object.
 
-Wed Jul 14 00:31:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Sep  5 00:26:06 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* array.c: rdoc patch. merged patch from Johan Holmberg
-	  <holmberg@iar.se> [ruby-core:3170]
+	* regex.c (re_search): range worked wrongly on bm_search().
 
-Tue Jul 13 19:39:12 2004  akira yamada  <akira@ruby-lang.org>
+Mon Sep  4 13:40:40 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/uri/generic.rb (URI::Generic#merge_path):
-	  "URI('http://www.example.com/foo/..') + './'" should return
-	  "URI('http://www.example.com/')".  [ruby-list:39838]
-	  "URI('http://www.example.com/') + './foo/bar/..'" should return
-	  "URI('http://www.example.com/foo/')".  [ruby-list:39844]
+	* configure.in: renamed libruby.a to libruby.{cygwin,mingw32}.a
+	  on cygwin and mingw32.
 
-	* test/uri/test_generic.rb (TestGeneric#test_merge): added tests.
+Sun Sep  3 23:44:04 2000  Noriaki Harada  <tenmei@maoh.office.ne.jp>
 
-Tue Jul 13 15:51:45 2004  Akinori MUSHA  <knu@iDaemons.org>
+	* io.c (NO_SAFE_RENAME): for BeOS too.
 
-	* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
-	   extmk mode.
+Sun Sep  3 11:31:53 2000  Takaaki Tateishi  <ttate@jaist.ac.jp>
 
-	* lib/mkmf.rb (dir_config): Prepend a new library path instead of
-	  appending so it is tried first.
+	* parse.y (rescue): no assignment was done if rescue body was
+	  empty.
 
-Tue Jul 13 00:50:48 2004  Dave Thomas  <dave@pragprog.com>
+Sat Sep  2 10:52:21 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files.
+	* parse.y (call_args,aref_args): block_call can be the last
+	  argument.
 
-Mon Jul 12 21:20:36 2004  Dave Thomas  <dave@pragprog.com>
+	* parse.y (COND_PUSH,COND_POP): maintain condition stack to allow
+	  kDO2 in parentheses in while/until/for conditions.
 
-	* html_generator.rb: Support hyperlinks of the form {any text}[xxx]
-	  as well as stuff[xxx]
+	* parse.y (yylex): generate kDO2 for EXPR_ARG outside of
+	  while/until/for condition.
 
-Sat Jul 10 09:30:24 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Sep  1 10:36:29 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/soap/marshal/test_struct.rb: use qualified build-tin class name
-	  (::Struct) to avoid name crash.
+	* parse.y (aref_args,opt_call_args): add block_call to allow a
+	  method without parentheses and with block as a last argument.
 
-Sat Jul 10 04:21:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* hash.c (rb_hash_sort): should not return nil.
 
-	* ext/tk/lib/tk.rb: better operation for SIGINT when processing
-	  callbacks.
-	* ext/tk/lib/tk/msgcat.rb: ditto.
-	* ext/tk/lib/tk/variable.rb: ditto.
-	* ext/tk/lib/tk/timer.rb: ditto.
+	* re.c (match_aref): should use rb_reg_nth_match().
 
-	* ext/tk/lib/tk/validation.rb (__def_validcmd):  add a module
-	  function of Tk::ValidateConfigure to define validatecommand
-	  methods easier
+	* eval.c (POP_SCOPE): recycled scopes too much
 
-Fri Jul  9 22:36:36 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* eval.c (Init_eval): extend room for stack allowance.
 
-	* array.c, enum.c, pack.c: rdoc patch from Johan Holmberg
-	  <holmberg@iar.se> [ruby-core:3132] [ruby-core:3136]
+	* eval.c (POP_SCOPE): frees scope too much.
 
-	* numeric.c: rdoc patch.
+Thu Aug 31 14:28:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jul  9 19:26:39 2004  Tanaka Akira  <akr@m17n.org>
+	* gc.c (rb_gc_mark): T_SCOPE condition must be more precise.
 
-	* lib/open-uri.rb (URI::HTTPS#proxy_open): raise ArgumentError to
-	  notice https is not supported.
+	* eval.c (scope_dup): should not make all duped scope orphan.
 
-Fri Jul  9 14:28:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Aug 31 10:11:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_thread_raise): accept third argument as well as
-	  Kernel#raise, and evaluate the arguments to create an exception in
-	  the caller's context.  [ruby-talk:105507]
+	* parse.y (stmt): allow stmt_rhs to be right hand side of multiple
+	  assignment.
 
-Fri Jul  9 01:47:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* time.c (rb_time_timeval): type error should not mention the word
+	  'interval'.
 
-	* ext/tk/lib : bug fix
-	* ext/tk/lib/tkextlib/itcl : add [incr Tcl] support
-	* ext/tk/lib/tkextlib/itk  : add [incr Tk] support
-	* ext/tk/lib/tkextlib/iwidgets : midway point of [incr Widgets] support
-	* ext/tk/sample/tkextlib/iwidgets : very simple examples of
-	  [incr Widgets]
+Wed Aug 30 23:21:20 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jul  8 22:52:19 2004  Kouhei Sutou  <kou@cozmixng.org>
+	* numeric.c (rb_num2long): use rb_Integer() instead of independent
+	  convert routine.
 
-	* lib/rss/{rss,parser,0.9,1.0,2.0}.rb: supported RSS 0.9x/2.0
-	  validation and validation which disregard order of elements.
-	* test/rss/test_parser.rb: added tests for RSS 0.9x/2.0
-	  validation.
-	* test/rss/{test_trackback,rss-testcase}.rb: fixed no good method
-	  name.
+	* eval.c (rb_rescue2): now takes arbitrary number of exception types.
 
-Thu Jul  8 00:05:23 2004  akira yamada  <akira@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile::initialize): got out code of
-	  generating tmpname.  [ruby-dev:23832][ruby-dev:23837]
-
-Wed Jul  7 15:53:14 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* string.c (rb_str_match): raise TypeError when both arguments are
-	  strings. [ruby-dev:22869] (backported from HEAD)
-
-	* string.c (rb_str_match2): removed.
-
-	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
-	  wince/Makefile.sub (string.c): now not depend on version.h.
-
-Wed Jul  7 00:48:34 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/tk/lib/tkextlib/tktrans.rb,
-	  ext/tk/lib/tkextlib/treectrl.rb: fix syntax errors.
-
-Tue Jul  6 18:38:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib : improve framework of developping Tcl/Tk extension
-	  wrappers
-
-Mon Jul  5 23:56:42 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/{trackback,syndication,dublincore,content}.rb: worked
-	  with ruby 1.6 again.
-
-	* test/rss/rss-assertions.rb: ditto.
-
-Mon Jul  5 22:54:39 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/uri/common.rb (Kernel#URI): new global method for parsing URIs.
-
-Mon Jul  5 09:02:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_thread_yield, rb_f_catch): 4th argument to rb_yield_0()
-	  is a set of bit flags.  [ruby-dev:23859]
-
-Mon Jul  5 01:27:32 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close
-	  the socket whose last-access-time is oldest. (and add new one)
-	  [ruby-dev:23860]
-
-Sun Jul  4 12:24:50 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: added copyright header.
-
-Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* added files
-	  * lib/soap/attachment.rb
-	  * lib/soap/header
-	  * lib/soap/mimemessage.rb
-	  * lib/soap/rpc/httpserver.rb
-	  * lib/wsdl/soap/cgiStubCreator.rb
-	  * lib/wsdl/soap/classDefCreator.rb
-	  * lib/wsdl/soap/classDefCreatorSupport.rb
-	  * lib/wsdl/soap/clientSkeltonCreator.rb
-	  * lib/wsdl/soap/driverCreator.rb
-	  * lib/wsdl/soap/mappingRegistryCreator.rb
-	  * lib/wsdl/soap/methodDefCreator.rb
-	  * lib/wsdl/soap/servantSkeltonCreator.rb
-	  * lib/wsdl/soap/standaloneServerStubCreator.rb
-	  * lib/wsdl/xmlSchema/enumeration.rb
-	  * lib/wsdl/xmlSchema/simpleRestriction.rb
-	  * lib/wsdl/xmlSchema/simpleType.rb
-	  * lib/xsd/codegen
-	  * lib/xsd/codegen.rb
-	  * sample/soap/authheader
-	  * sample/soap/raa2.4
-	  * sample/soap/ssl
-	  * sample/soap/swa
-	  * sample/soap/whois.rb
-	  * sample/soap/calc/samplehttpd.conf
-	  * sample/soap/exchange/samplehttpd.conf
-	  * sample/soap/sampleStruct/samplehttpd.conf
-	  * sample/wsdl/raa2.4
-	  * sample/wsdl/googleSearch/samplehttpd.conf
-	  * test/openssl/_test_ssl.rb
-	  * test/soap/header
-	  * test/soap/ssl
-	  * test/soap/struct
-	  * test/soap/swa
-	  * test/soap/wsdlDriver
-	  * test/wsdl/multiplefault.wsdl
-	  * test/wsdl/simpletype
-	  * test/wsdl/test_multiplefault.rb
-
-	* modified files
-	  * lib/soap/baseData.rb
-	  * lib/soap/element.rb
-	  * lib/soap/generator.rb
-	  * lib/soap/marshal.rb
-	  * lib/soap/netHttpClient.rb
-	  * lib/soap/parser.rb
-	  * lib/soap/processor.rb
-	  * lib/soap/property.rb
-	  * lib/soap/soap.rb
-	  * lib/soap/streamHandler.rb
-	  * lib/soap/wsdlDriver.rb
-	  * lib/soap/encodingstyle/handler.rb
-	  * lib/soap/encodingstyle/literalHandler.rb
-	  * lib/soap/encodingstyle/soapHandler.rb
-	  * lib/soap/mapping/factory.rb
-	  * lib/soap/mapping/mapping.rb
-	  * lib/soap/mapping/registry.rb
-	  * lib/soap/mapping/rubytypeFactory.rb
-	  * lib/soap/mapping/wsdlRegistry.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/soaplet.rb
-	  * lib/soap/rpc/standaloneServer.rb
-	  * lib/wsdl/data.rb
-	  * lib/wsdl/definitions.rb
-	  * lib/wsdl/operation.rb
-	  * lib/wsdl/parser.rb
-	  * lib/wsdl/soap/definitions.rb
-	  * lib/wsdl/xmlSchema/complexContent.rb
-	  * lib/wsdl/xmlSchema/complexType.rb
-	  * lib/wsdl/xmlSchema/data.rb
-	  * lib/wsdl/xmlSchema/parser.rb
-	  * lib/wsdl/xmlSchema/schema.rb
-	  * lib/xsd/datatypes.rb
-	  * lib/xsd/qname.rb
-	  * sample/soap/calc/httpd.rb
-	  * sample/soap/exchange/httpd.rb
-	  * sample/soap/sampleStruct/httpd.rb
-	  * sample/soap/sampleStruct/server.rb
-	  * sample/wsdl/amazon/AmazonSearch.rb
-	  * sample/wsdl/amazon/AmazonSearchDriver.rb
-	  * sample/wsdl/googleSearch/httpd.rb
-	  * test/soap/test_basetype.rb
-	  * test/soap/test_property.rb
-	  * test/soap/test_streamhandler.rb
-	  * test/soap/calc/test_calc.rb
-	  * test/soap/calc/test_calc2.rb
-	  * test/soap/calc/test_calc_cgi.rb
-	  * test/soap/helloworld/test_helloworld.rb
-	  * test/wsdl/test_emptycomplextype.rb
-	  * test/wsdl/axisArray/test_axisarray.rb
-	  * test/wsdl/datetime/test_datetime.rb
-	  * test/wsdl/raa/test_raa.rb
-	  * test/xsd/test_xmlschemaparser.rb
-	  * test/xsd/test_xsd.rb
-
-	* summary
-	  * add SOAP Header mustUnderstand support.
-
-	  * add HTTP client SSL configuration and Cookies support (works
-	    completely with http-access2).
-
-	  * add header handler for handling sending/receiving SOAP Header.
-
-	  * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object
-	    Model.  it caused error.
-
-	  * add WSDL simpleType support to restrict lexical value space.
-
-	  * add SOAP with Attachment support.
-
-Sat Jul  3 17:19:44 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/tk/lib/tkextlib/tkDND.rb: fix syntax error.
-
-Thu Jul  1 23:15:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/pstore.rb (transaction): safer backup scheme.  [ruby-list:39102]
-
-	* lib/pstore.rb (commit_new): use FileUtils.copy_stream for Cygwin.
-	  [ruby-dev:23157]
-
-	* lib/pstore.rb (transaction): allow overriding dump and load.
-	  [ruby-dev:23567]
-
-	* lib/pstore.rb (PStore#transaction): get rid of opening in write mode
-	  when read only transaction.  [ruby-dev:23842]
-
-	* lib/yaml/store.rb: follow lib/pstore.rb's change.
+	* object.c (rb_convert_type): use rb_rescue2 now to handle NameError.
 
-Thu Jul  1 18:36:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* object.c (rb_convert_type): better error message.
 
-	* ext/tk/lib/tcltklib : bug fix
+Wed Aug 30 17:09:14 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* ext/tk/lib/tk : bug fix and add Tcl/Tk extension support libraries
+	* ext/Win32API/Win32API.c (Win32API_initialize): AlphaNT support.
 
-Thu Jul  1 11:59:45 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Aug 30 14:19:07 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/extconf.rb: check for EVP_CIPHER_CTX_copy, ENGINE_add,
-	  EVP_CIPHER_CTX_set_padding, EVP_CipherFinal_ex, EVP_CipherInit_ex,
-	  EVP_DigestFinal_ex and EVP_DigestInit_ex.
+	* parse.y (node_assign): should support NODE_CVASGN2 too.
 
-	* ext/openssl/openssl_missing.c (EVP_CIPHER_CTX_copy): new function.
+Wed Aug 30 11:31:47 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* ext/openssl/openssl_missing.h (EVP_DigestInit_ex, EVP_DigestFinal_ex,
-	  EVP_CipherInit_ex, EVP_CipherFinal_ex, HMAC_Init_ex): new macro for
-	  OpenSSL 0.9.6.
+	* ext/Win32API/Win32API.c (Win32API_initialize): add the
+	  arguments checking.
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_encrypt, ossl_cipher_decrypt):
-	  re-implemnt (the arguments for this method is ).
+	* ext/Win32API/Win32API.c (Win32API_initialize): add taint
+	  checking. allow String object in the third argument.
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_pkcs5_keyivgen): new method
-	  OpenSSL::Cipher::Cipher#pkcs5_keyivgen. it calls EVP_BytesToKey().
+Wed Aug 30 10:29:40 2000  Masahiro Tomita  <tommy@tmtm.org>
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_alloc, ossl_cipher_initialize,
-	  ossl_cipher_copy, ossl_cipher_reset ossl_cipher_final,
-	  ossl_cipher_set_key, ossl_cipher_set_iv): replace all EVP_CipherInit
-	  and EVP_CipherFinal into EVP_CipherInit_ex and EVP_CipherFinal_ex.
-	  and EVP_CIPHER_CTX_init should only be called once.
+	* io.c (rb_f_p): flush output buffer.
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method
-	  OpenSSL::Cipher::Cipher#key_len=.
+Tue Aug 29 16:29:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_init_deprecated): new
-	  finction; print warning for Cipher#<<.
+	* parse.y (assignable): remove NODE_CVASGN3.
 
-	* ext/openssl/ossl_digest.c: replace all EVP_DigestInit and
-	  EVP_DigestFinal into EVP_DigestInit_ex and EVP_DigestFinal_ex.
-	  and EVP_MD_CTX_init should only be called once.
+	* parse.y (gettable): remove NODE_CVAR3.
 
-	* ext/openssl/ossl_digest.c (digest_final): should call
-	  EVP_MD_CTX_cleanup to avoid memory leak.
+Tue Aug 29 02:02:14 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_hmac.c (ossl_hmac_initialize): repalce HMAC_init
-	  into HMAC_init_ex. and HMAC_CTX_init is moved to ossl_hmac_alloc.
+	* lib/mkmf.rb (create_makefile): handles create_makefile("a/b").
 
-	* ext/openssl/ossl_hmac.c (hmac_final): should call
-	  HMAC_CTX_cleanup to avoid memory leak.
+	* ext/extmk.rb.in (create_makefile): ditto
 
-	* test/openssl/test_cipher.rb, test/openssl/test_digest.rb,
-	  test/openssl/test_hmac.rb: new file.
+Mon Aug 28 18:43:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jul  1 04:08:30 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (is_defined): now handles class variables.
 
-	* ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
-	  workaround for the versions earlier than OpenSSL-0.9.7.
+	* eval.c (rb_eval): class variable behavior revisited.
 
-Thu Jul  1 03:33:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (assignable): ditto.
 
-	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
-	  empty pkey object if no argument is passed. [ruby-talk:103328]
+	* parse.y (gettable): ditto.
 
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): 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>.
 
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
+Fri Aug 25 15:24:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
-	  OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
-	  OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
-	  OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
+	* variable.c (rb_cvar_get): should not follow __attached__.
 
-	* ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
-	  OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
-	  OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
-	  OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
-	  OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
+	* variable.c (rb_cvar_set): ditto.
 
-Thu Jul  1 03:16:09 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* variable.c (rb_cvar_declare): ditto.
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read): take optional second argument
-	  to specify a string to be written.
+	* variable.c (mod_av_set): second class variable assignment at the
+	  toplevel should not give warning.
 
-	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#read):
-	  take optional second argument to specify a string to be written.
+Fri Aug 25 01:18:36 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#gets):
-	  refine regexp for end-of-line.
+	* io.c (next_argv): prepare path for open file.
 
-	* ext/opnessl/lib/openssl/ssl.rb
-	  (OpenSSL::SSL::SocketForwarder#listen): fix typo.
+	* string.c (rb_str_setter): moved from io.c.
 
-Wed Jun 30 11:38:51 2004  Mikael Brockman  <phubuh@phubuh.org>
+	* io.c (next_argv): filename should be "-" for refreshed ARGF.
 
-	* parse.y (primary): should not be NULL.  [ruby-core:03098]
+Thu Aug 24 15:27:39 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Wed Jun 30 02:53:24 2004  why the lucky stiff  <why@ruby-lang.org>
+	* ext/socket/socketport.h: use `extern int h_errno' if needed.
 
-	* ext/syck/rubyext.c (syck_emitter_new): set buffer after
-	  Data_Wrap_Struct to avoid possible GC. [ruby-talk:104835]
+Sat Aug 19 01:34:02 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Tue Jun 29 10:31:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/sdbm/_sdbm.c (sdbm_prep): flags should be or-ed by O_BINARY on
+	  Win32 too.
 
-	* eval.c (rb_eval_cmd, rb_thread_trap_eval): restore safe level.
+	* ext/sdbm/_sdbm.c (makroom): fill hole with 0 on Win32 too.
 
-	* gc.c (define_final, run_final): preserve and restore safe level for
-	  finalizers.  [ruby-core:03058]
+Fri Aug 18 13:23:59 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* signal.c (signal_exec, rb_trap_exit, trap): preserve and restore
-	  safe level for signal handlers.  [ruby-dev:23829]
+	* eval.c (rb_eval): should preserve and clear $! value before
+	  compilation. 
 
-Mon Jun 28 14:57:56 2004  Jeff Mitchell  <quixoticsycophant@yahoo.com>
+	* eval.c (eval): ditto.
 
-	* configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
-	  DOSISH compilers.  [ruby-core:03107]
+Fri Aug 18 11:06:19 2000  Shugo Maeda  <shugo@ruby-lang.org>
 
-Mon Jun 28 00:30:19 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* ext/socket/socket.c (s_accept): start GC on EMFILE/ENFILE.
 
-	* sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
+Thu Aug 17 16:04:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sun Jun 27 22:39:51 2004  Kouhei Sutou  <kou@cozmixng.org>
+	* eval.c (is_defined): should clear ruby_errinfo.
 
-	* sample/rss/tdiary_plugin/rss-recent.rb: supported Hiki.
+Thu Aug 17 04:26:31 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Sun Jun 27 12:19:46 2004  Kouhei Sutou  <kou@cozmixng.org>
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.27.
 
-	* {lib,sample,test}/rss: added RSS Parser. [ruby-dev:23780]
+	* lib/net/protocol.rb: writing methods returns written byte size.
 
-Sat Jun 26 11:07:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/smtp.rb: send_mail accepts many destinations.
 
-	* configure.in (aix): -b must come at the start of the command line,
-	  and -e must not appear while testing libraries.  [ruby-talk:104501]
+Wed Aug 16 00:43:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/mkmf.rb (dir_config): quote directory names if necessary.
-	  [ruby-talk:104505]
+	* time.c (time_s_times): use CLK_TCK for HZ if it's defined.
 
-Fri Jun 25 15:33:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug 15 17:30:59 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/iconv/extconf.rb: check stricter.  [ruby-talk:104501]
+	* eval.c (frame_dup): should set flag FRAME_MALLOC after
+	  argv allocation.
 
-	* ext/iconv/extconf.rb: include iconv.h for libiconv.  [ruby-dev:22715]
+	* eval.c (blk_free): should not free argv if GC was called before
+	  frame_dup.
 
-Fri Jun 25 08:31:29 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Aug 15 16:08:40 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* eval.c (rb_thread_atfork): remove "fork terminates thread"
-	  warning.  [ruby-dev:23768]
+	* configure.in: add ac_cv_func_times=yes for mingw32.
 
-	* object.c (rb_obj_clone): backport FL_FINALIZE patch from 1.9.
-	  [ruby-core:02786][ruby-core:03067]
+	* win32/win32.c (mytimes): typo.
 
-	* ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
-	  should give us packed address, not struct sockaddr.
-	  [ruby-core:03053]
+Tue Aug 15 01:45:28 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jun 25 02:04:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* io.c (argf_eof): should return true at the end of ARGF without
+	  checking stdout if arguments are given.
 
-	* {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when
-	  including version.h. [ruby-talk:104456] (backported from HEAD)
+Mon Aug 14 10:34:32 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jun 24 14:23:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_thread_status): status should return false for normal
+	  termination, nil for termination by exception.
 
-	* io.c (rb_io_fread): return already read data when system call is
-	  interrupted.  [ruby-talk:97206]
+Fri Aug 11 15:43:46 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jun 24 01:32:43 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* eval.c (rb_undef): give warning for undefining __id__, __send__.
 
-	* version.h: added declarations of ruby_version,
-	  ruby_release_date, ruby_platform.
-	  (backported from HEAD)
+Thu Aug 10 08:05:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Jun 23 22:23:37 2004  Dave Thomas  <dave@pragprog.com>
+	* eval.c (rb_callcc): returned current thread instead of
+	  continuation wrongly.
 
-	* ext/socket/socket.c (sock_s_gethostbyaddr): Work around problem
-	  with OS X not returning 'from' parameter to recvfrom for
-	  connection-oriented sockets.
+Thu Aug 10 05:40:28 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Wed Jun 23 01:45:27 2004  Dave Thomas  <dave@pragprog.com>
+	* ext/extmk.rb.in: $CPPFLAGS should be initialized.
 
-	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_quotation):
-	  Fix problem with the 'r' being dropped from %r{xxx}
+	* ext/tcltklib/depend: add stubs.o.
 
-Wed Jun 23 00:20:20 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/tcltklib/extconf.rb: use $CPPFLAGS instead of $CFLAGS.
 
-	* ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
-	  CRs and LFs. (doesn't depend on CR+LF) [ruby-dev:23749]
+Wed Aug  9 16:31:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Jun 23 00:00:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_callcc): thread status for continuations must be
+	  THREAD_KILLED, otherwise thread_free() breaks other threads.
 
-	* io.c (rb_io_initialize): should check fcntl result.  [ruby-dev:23742]
+Wed Aug  9 13:24:25 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Tue Jun 22 21:11:36 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* win32/win32.[ch]: emulate rename(2).
 
-	* ext/win32ole/win32ole.c (OLE_FREE): should not call CoFreeUnuse-
-	  dLibraries().
+Tue Aug  8 14:01:46 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* ext/win32ole/win32ole.c (ole_event_free): ditto.
+	* ext/tcltklib/tcltklib.c: support --enable-tcltk_stubs
 
-	* ext/win32ole/win32ole.c (ole_hresult2msg): truncate error message
-	  before CR.
+	* ext/tcltklib/extconf.rb: ditto.
 
-Tue Jun 22 16:47:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* ext/tcltklib/stubs.c: created. examine candidate shared libraries.
 
-	* lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
-	Thanks, Rutger Nijlunsing.
+Mon Aug  7 13:59:12 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jun 21 10:19:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ruby.h (CLONESETUP): should copy flags before any potential
+	  object allocation.
 
-	* win32/win32.c (rb_w32_opendir): use FindFirstFile()/FindNextFile()/
-	  FindClose() instead of _findfirst()/_findnext()/_findclose().
-	  merge from HEAD.
+	* regex.c (re_match): check for stack depth was needed.
 
-Sat Jun 19 13:24:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug  5 16:43:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* eval.c (method_call): allow changing $SAFE.  [ruby-dev:23713]
+	* djgpp/*: convert DOS line endings to UNIX style.
 
-Fri Jun 18 23:12:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* djgpp/config.status: rename to config.sed for SFN.
 
-	* eval.c (proc_save_safe_level, rb_set_safe_level, safe_setter): limit
-	  safe level.
+	* lib/ftools.rb (compare, safe_unlink, chmod): avoid warnings.
 
-Wed Jun 16 23:05:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/ftools.rb (move): typo. not `tpath', but `to'.
 
-	* object.c (rb_mod_freeze): prepare string representation before
-	  freezing. [ruby-talk:103646]
+Fri Aug  4 23:26:48 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Jun 16 16:04:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (proc_call): gives warning if a block is supplied.
 
-	* object.c (rb_mod_le): singleton class inherits Class rather than its
-	  object's class.  [ruby-dev:23690]
+	* eval.c (rb_eval): no warning for discarding if an alias for the
+	  method is already made.
 
-Wed Jun 16 16:01:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug  4 16:32:29 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* gc.c (stack_grow_direction): memoize the direction.
+	* array.c (rb_ary_reject_bang): returns nil if no element removed.
 
-	* gc.c (Init_stack): should always move to end of VALUE.
+	* hash.c (rb_hash_reject_bang): returns nil if no element removed.
 
-Tue Jun 15 12:10:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Aug  3 19:44:26 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tk.rb: bug fix (TkWindow#grab)
+	* eval.c (rb_thread_fd_writable): should return integer value.
 
-Mon Jun 14 18:23:27 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* array.c (rb_ary_assoc): search array element whose length is
+	  longer than 0 (not 1).
 
-	* ext/tk/lib/remote-tk.rb: bug fix
+Wed Aug  2 18:27:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Jun 13 00:23:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_thread_wait_fd): prohibit thread context switch
+	  during compilation.
 
-	* ext/tcltklib/extconf.rb: [EXPERIMENTAL] MacOS X (darwin) support
+	* eval.c (rb_cont_call): prohibit Continuation#call across threads.
 
-	* ext/tcltklib/tcltklib.c: fix thread trouble on callback proc, and
-	  eliminate warning about instance variable access
+Wed Aug  2 08:22:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tk/menubar.rb: improve supported menu_spec
+	* gc.c (rb_gc): clear malloc_memories to zero, to avoid potential
+	  super frequent GC invocation. (ruby-bugs:#PR48)
 
-	* ext/tk/lib/tk/menuspec.rb: [add] menu_spec support library
+	* gc.c (rb_gc): only add_heap() if GC trigger condition is
+	  satisfied.
 
-	* ext/tk/lib/tk/root.rb: add menu_spec support
+Tue Aug  1 16:41:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tk/text.rb: bug fix
+	* ruby.c (proc_options): global load path setting moved from
+	  ruby_prog_init().
 
-	* ext/tk/lib/tk/toplevel.rb: add menu_spec support
+	* 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.
 
-	* ext/tk/sample/menubar?.rb: [add] sample of menu_spec usage
+Sat Jul 29 23:42:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Jun 12 11:15:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* dir.c (dir_each): should check whether dir is closed during the
+	  block execution. (ruby-bugs:#PR47)
 
-	* configure.in (target_os): strip -gnu suffix on Linux.
+Sat Jul 29 21:57:30 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Fri Jun 11 17:08:21 2004  Akinori MUSHA  <knu@iDaemons.org>
+	* ruby.c (rubylib_mangle): provide another buffer for the result.
 
-	* config.guess: Restore a wrongly removed hyphen.
+Wed Jul 26 10:09:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Fri Jun 11 14:30:08 2004  Akinori MUSHA  <knu@iDaemons.org>
+	* configure.in: set SOLIBS to LIBS on Cygwin.
 
-	* config.guess: Attempt to avoid system name change on
-	  Darwin platforms also.
+	* configure.in: LIBRUBY_SO='$(RUBY_INSTALL_NAME)'.$target_os.dll
+	  on cygwin and mingw32. ruby-cygwin.dll is bad. why?
 
-Fri Jun 11 14:22:45 2004  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 26 10:04:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* config.guess, config.sub: Attempt to avoid system name change on
-	  Linux platforms.  We have been using "linux" instead of
-	  "linux-gnu" on this branch.
+	* gc.c (gc_sweep): avoid full scan during compilation.
 
-Thu Jun 10 19:19:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (rb_gc): add heap during no gc period (including
+	  compilation).
 
-	* ext/sdbm/init.c (fsdbm_store): sdbm should use StringValue().
-	  [ruby-talk:103062]
+Tue Jul 25 19:03:04 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Wed Jun  9 18:04:14 2004  akira yamada  <akira@ruby-lang.org>
+	* cygwin/GNUmakefile: use puts instead of print, because
+	  Cygwin DLL's behavior is changed(or bug?).
 
-	* lib/uri/generic.rb (URI::Generic::merge,
-	  URI::Generic::route_from): accepts non-hierarchical URI.
-	  [ruby-dev:23631]
+	* configure.in: LIBRUBY_SO='$(RUBY_INSTALL_NAME)'-$target_os.dll
+	  on cygwin and mingw32.
 
-	* test/uri/test_generic.rb (TestGeneric::test_route,
-	  TestGeneric::test_merge): added tests for above changes.
+	* cygwin/GNUmakefile: ditto.
 
-Wed Jun  9 17:39:37 2004  Akinori MUSHA  <knu@iDaemons.org>
+	* Makefile.in: $(SOLIBS) should be put after dmyext.@OBJEXT@.
 
-	* config.guess, config.sub: Update to a more recent version as of
-	  2004-01-20.
+	* instruby.rb: install $(LIBRUBY) to libdir
+	  if $(LIBRUBY) != $(LIBRUBY_A_).
 
-	* configure.in: Add support for DragonFly BSD.
+Tue Jul 25 15:16:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Jun  2 20:16:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (rb_p): redirect to $defout.
 
-	* string.c (str_new4): should share shared instance if it already
-	  exists.  [ruby-dev:23665]
+Mon Jul 24 18:52:55 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Wed Jun  2 12:41:53 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c (win32_getenv): should remove `static'.
 
-	* io.c (rb_io_gets_m): set lastline ($_) even when read line is
-	  nil.  [ruby-dev:23663]
+	* ruby.c (rubylib_mangle): support "/hoge;/foo"
 
-Fri May 28 11:20:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 24 10:28:55 2000  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
 
-	* eval.c (rb_eval): bad influence on frame node.
+	* string.c (rb_str_count): raise exception if no argument is
+	  given.
 
-	* eval.c (eval): reverted wrongly removed condition.  [ruby-dev:23638]
+Sun Jul 23 12:55:04 2000  Dave Thomas  <Dave@Thomases.com>
 
-Thu May 27 23:15:18 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* string.c (rb_str_rindex): Support negative end position.
 
-	* lib/logger.rb: leading 0 padding of timestamp usec part.
+Fri Jul 21 17:35:01 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/csv.rb (CSV.parse): [CAUTION] behavior changed.  in the past,
-	  CSV.parse accepts a filename to be read-opened (it was just a
-	  shortcut of CSV.open(filename, 'r')).  now CSV.parse accepts a
-	  string or a stream to be parsed e.g.
-	  CSV.parse("1,2\n3,r") #=> [['1', '2'], ['3', '4']]
+	* parse.y (aref_args): command_call now be permitted as
+	  aref_args.
 
-	* lib/csv.rb: CSV::Row and CSV::Cell are deprecated.  these classes
-	  are removed in the future.  in the new csv.rb, row is represented
-	  as just an Array.  since CSV::Row was a subclass of Array, it won't
-	  hurt almost all programs except one which depended CSV::Row#match.
-	  and a cell is represented as just a String or nil(NULL).  this
-	  change will cause widespread destruction.
+	* process.c (proc_getpriority): getpriority(2) may return valid
+	  negative number.  use errno to detect error.
 
-	      CSV.open("foo.csv", "r") do |row|
-		row.each do |cell|
-		  if cell.is_null       # using Cell#is_null
-		    p "(NULL)"
-		  else
-		    p cell.data         # using Cell#data
-		  end
-		end
-	      end
+	* marshal.c (dump_ensure): dumped string should be tainted if
+	  any among target objects is tainted.
 
-	    must be just;
+	* marshal.c (r_regist): restored object should be tainted if and
+	  only if the source is a file or a tainted string.
 
-	      CSV.open("foo.csv", "r") do |row|
-		row.each do |cell|
-		  if cell.nil?
-		    p "(NULL)"
-		  else
-		    p cell
-		  end
-		end
-	      end
+Wed Jul 19 15:14:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/csv.rb: [CAUTION] record separator(CR, LF, CR+LF) behavior
-	  change.  CSV.open, CSV.parse, and CSV,generate now do not force
-	  opened file binmode.  formerly it set binmode explicitly.
+	* bignum.c (bigdivrem): should use rb_int2big(), not rb_uint2big().
 
-	  with CSV.open, binmode of opened file depends the given mode
-	  parameter "r", "w", "rb", and "wb".  CSV.parse and CSV.generate open
-	  file with "r" and "w".
+Tue Jul 18 14:58:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	  setting mode properly is user's responsibility now.
+	* eval.c (ruby_options): should treat SystemExit etc. properly.
 
-	* lib/csv.rb: accepts String as a fs (field separator/column separator)
-	  and rs (record separator/row separator)
+	* parse.y (yycompile): should check compile_for_eval, not
+	  ruby_in_eval.
 
-	* lib/csv.rb (CSV.read, CSV.readlines): added.  works as IO.read and
-	  IO.readlines in CSV format.
+Mon Jul 17 04:29:50 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/csv.rb: added CSV.foreach(path, rs = nil, &block).  CSV.foreach
-	  now does not handle "| cmd" as a path different from IO.foreach.
-	  needed?
+	* lib/mkmf.rb: converts extension of $objs into $OBJEXT.
 
-	* test/csv/test_csv.rb: updated.
+Sun Jul 16 03:02:34 2000  Dave Thomas <dave@thomases.com>
 
-	* test/ruby/test_float.rb: added test_strtod to test Float("0").
+	* lib/weakref.rb: Change to use new ObjectSpace calls.
 
-Thu May 27 21:37:50 2004  Tanaka Akira  <akr@m17n.org>
+Sat Jul 15 21:59:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/pathname.rb (Pathname#initialize): refine pathname initialization
-	  by pathname.
+	* eval.c (rb_eval): should not redefine __id__ nor __send__.
 
-Thu May 27 20:22:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* 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.
 
-	* io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
+Sat Jul 15 01:32:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu May 27 14:53:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (rb_mod_method): implements unbound method.
 
-	* io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
-	  add errno checking.  [ruby-dev:23627]
+	* eval.c (Init_eval): should prohibit `module_function' for class
+	  Class.
 
-Wed May 26 14:19:42 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul 14 17:19:59 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* eval.c (rb_eval, eval): make line number consistent on eval with
-	  Proc.  [ruby-talk:101253]
+	* cygwin/GNUmakefile.in: use miniruby instead of sed.
 
-Wed May 26 13:59:17 2004  Dave Thomas  <dave@pragprog.com>
+Fri Jul 14 12:49:50 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::skip_for_variable): Allow for
-	  'do' after for statement
+	* io.c (argf_eof): need to check stdin, when next_p == -1.
 
-Wed May 26 13:56:03 2004  Dave Thomas  <dave@pragprog.com>
+	* io.c (read_all): use io_fread() instead of fread(3).
 
-	* lib/rdoc/generators/html_generator.rb (Generators::MarkUp::style_url): Fix
-	  relative path to code CSS file
+	* io.c (io_reopen): should clearerr FILE if fd < 3.
 
-Wed May 26 13:14:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* re.c (rb_reg_match_m): the result is exported, so it should be
+	  declared as busy.
 
-	* io.c (rb_io_init_copy): copy also positions.  [ruby-talk:100910]
+	* eval.c (rb_eval): should preserve errinfo even if return, break,
+	  etc. is called in rescue clause.
 
-Wed May 26 00:00:00 2004  why the lucky stiff  <why@ruby-lang.org>
+	* instruby.rb: install irb too.
 
-	* ext/syck/syck.c (syck_new_parser): clear parser on init.
-	  thanks, ts. [ruby-core:02931]
+Wed Jul 12 15:32:57 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/token.c (sycklex_yaml_utf8): buffer underflow.
-	  thanks, ts. [ruby-core:02929]
+	* variable.c (rb_const_get): constants for builtin classes must
+	  have higher priority than constants from included modules at
+	  Object class.
 
-	* lib/yaml/baseemitter.rb (indent_text): simpler flow block code.
+	* bignum.c (bigdivrem): small embarrassing typo.
 
-	* lib/yaml.rb: added rdoc to beginning of lib.
+Wed Jul 12 15:06:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon May 24 10:46:26 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* eval.c (rb_eval): use rb_const_get_at().
 
-	* lib/rdoc/generators/template/html/html.rb: SYSTEM identifiers
-	  must be absolute URIs
+	* variable.c (top_const_get): retrieve toplevel constants only,
+	  not ones of Object (and its included modules) in general.
 
-Sat May 22 12:00:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 12 15:04:11 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* MANIFEST: add new encodings in rexml.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
 
-	* ext/tk/MANIFEST: add recent files.
+	* 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
 
-Sat May 22 05:37:11 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Jul 12 13:10:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/remote-tk.rb: (NEW library) controll Tk interpreters
-	  on the other processes by Tcl/Tk's 'send' command
+	* bignum.c (bigdivrem): defer bignorm().
 
-Fri May 21 09:22:05 2004  Dave Thomas  <dave@pragprog.com>
+	* bignum.c (bignorm): accepts accidental fixnums.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_parameters):
-	  Add ()'s around parameters that don't have them
+Tue Jul 11 16:54:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu May 20 17:02:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (yylex): `@<digit>' is no longer a valid instance
+	  variable name.
 
-	* lib/mkmf.rb (check_sizeof): define result size.  [ruby-core:02911]
+Tue Jul 11 01:51:50 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/mkmf.rb (create_header): macro name should not include equal
-	  sign.
+	* bignum.c (rb_big_divmod): should not use Integer(float) for
+	  the right operand.
 
-Thu May 20 15:59:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bignum.c (rb_big_remainder): ditto.
 
-	* ext/socket/socket.c: fix SEGV. [ruby-dev:23550]
+	* bignum.c (rb_big_modulo): ditto.
 
-Thu May 20 14:35:52 2004  Tanaka Akira  <akr@m17n.org>
+Mon Jul 10 15:27:16 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* ext/socket/socket.c: check SCM_RIGHTS macro addition to
-	  the msg_control field to test existence of file descriptor passing
-	  by msg_control.
+	* io.c (pipe_finalize): should set rb_last_status when pclose().
 
-Thu May 20 12:38:06 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul 10 09:07:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* numeric.c (flo_eq): always check if operands are NaN.
-	  [ruby-list:39685]
+	* error.c (rb_bug): print version number and such too.
 
-Thu May 20 12:34:39 2004  Dave Thomas  <dave@pragprog.com>
+Sat Jul  8 23:08:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_visibility):
-	  At Ryan Davis' suggestion, honor visibility modifers if guarded by a
-	  statement modifier
+	* eval.c (rb_thread_start_0): should copy previous scopes to
+	  prevent rb_gc_force_recycle().
 
-Thu May 20 12:22:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul  7 23:36:36 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* lib/mkmf.rb (have_type): do not check pointer to incomplete type,
-	  which always get compiled.  [ruby-list:39683]
+	* ext/socket/addrinfo.h: move IN_EXPERIMENTAL and IN_LOOPBACKNET
+	  definitions to ext/socket/sockport.h.
 
-Wed May 19 11:09:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/socket/extconf.rb: add getservbyport() and arpa/inet.h check.
 
-	* ext/tk/lib/tk.rb: change permition of TkObject#tk_send from
-	  private to public
+	* ext/socket/getaddrinfo.c (getaddrinfo): SOCK_RAW may not be
+	  defined (ex. BeOS, Palm OS 2.x or before).
 
-Tue May 18 14:00:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/getnameinfo.c (getnameinfo): getservbyport() may not
+	  exist (ex. BeOS, Palm OS).
 
-	* node.h (NEW_DSTR): adjust list length.
+	* ext/socket/sockport.h: add IN_EXPERIMENTAL, IN_CLASSA_NSHIFT,
+	  IN_LOOPBACKNET, AF_UNSPEC, PF_UNSPEC and PF_INET.
 
-	* parse.y (literal_concat): ditto.
+Fri Jul  7 03:30:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon May 17 16:14:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* parse.y (aref_args): should allow Hash[:a=>2] etc.
 
-	* numeric.c (flo_to_s): it's preferable that "p 0.0" outputs "0.0"
-	  instead of "0.0e+00". [ruby-dev:23480]
+	* numeric.c (fix_aref): convert index by NUM2INT, not FIX2INT. 
+	  (ruby-bugs:#PR37)
 
-	* numeric.c (flo_to_s): it's preferable that "p 0.00000000000000000001"
-	  outputs "1.0e-20" instead of "9.999999999999999e-21". (the precision
-	  is considered, but there is assumption DBL_DIG == 15 in current
-	  implementation)
+	* time.c (time_localtime): should prohibit for frozen time.
 
-Mon May 17 10:13:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* time.c (time_gmtime): ditto.
 
-	* ext/socket/socket.c (setup_domain_and_type): honor duck typing.
-	  [ruby-dev:23522]
+Thu Jul  6 19:12:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/socket/socket.c (sock_s_getnameinfo): ditto.
+	* io.c (rb_file_s_open): should not terminate fptr; just clear it.
 
-Mon May 17 01:15:23 2004  why the lucky stiff  <why@ruby-lang.org>
+	* ruby.c (proc_options): should not call require_libraries()
+	  twice.
 
-	* lib/yaml.rb: removed fallback to pure Ruby parser.
+	* ruby.c (require_libraries): clear req_list_head.next after
+	  execution. 
 
-	* lib/yaml/baseemitter.rb (indent_text): was forcing a mod value
-	  of zero at times, which kept some blocks from getting indentation.
+Thu Jul  6 13:51:57 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/yaml/baseemitter.rb (node_text): rewriting folded scalars.
+	* object.c (rb_to_id): name may not be symbol nor fixnum.
 
-	* ext/syck/syck.h: reports style of scalars now, be they plain, block
-	  single-, or double-quoted.
+	* struct.c (rb_struct_s_def): name may be nil.
 
-	* ext/syck/syck.c: ditto.
+Thu Jul  6 02:09:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/gram.c: ditto.
+	* bignum.c (bigdivrem): new function to return remainder.
 
-	* ext/syck/node.c: ditto.
+	* numeric.c (fixdivmod): now returns modulo, not remainder.
 
-	* ext/syck/token.c: ditto.
+	* numeric.c (flodivmod): ditto.
 
-	* ext/syck/rubyext.c (yaml_org_handler): symbols loaded only
-	  if scalar style is plain.
+	* bignum.c (bigdivmod): ditto.
 
-	* ext/syck/rubyext.c (yaml_org_handler): some empty strings were
-	  loaded as symbols.
+	* numeric.c (num_modulo): new method; alias to '%'.
 
-	* test/yaml/test_yaml.rb (test_perl_regexp): updated test to
-	  match new regexp serialization.
+Thu Jul  6 00:51:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Mon May 17 00:03:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* win32/win32.c (NtCmdGlob): patterns should be separated and
+	  NUL terminated.
 
-	* lib/drb/drb.rb: Cosmetic documentation changes.
+Wed Jul  5 22:27:56 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Sun May 16 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* cygwin/GNUmakefile: use ruby.def to make rubycw.dll.
 
-	* lib/test/unit.rb: Removed :nodoc: directive (it prevented effective
-	  RDoc operation), and added file-level comment.
+	* ext/extmk.rb.in: create target.def.
 
-Sun May 16 20:55:49 2004  Tanaka Akira  <akr@m17n.org>
+	* lib/mkmf.rb: ditto.
 
-	* ext/dbm/dbm.c (fdbm_initialize): accept optional 3rd argument to
-	  specify an open flag.
-	  (Init_dbm): define open flags: DBM::READER, DBM::WRITER, DBM::WRCREAT
-	  and DBM::NEWDB.
+Wed Jul  5 09:47:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun May 16 13:10:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* time.c (time_arg): Time::local, Time::gm now take 7th optional
+	  argument for usec.
 
-	* lib/test/unit/**/*.rb: Removed :nodoc: directives (many were
-	  generating warnings, many were on private methods).
+	* numeric.c (num_ceil, etc): default ceil, floor, round, truncate
+	  implementation for Numeric, using `to_f'.
 
-Sat May 15 01:41:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_io_reopen): clear fptr->path after free() to prevent
+	  potential GC crash.
 
-	* eval.c (eval): forgot to restore $SAFE value before evaluating
-	  compiled node.  [ruby-core:02872]
+	* io.c (rb_file_s_open): terminate fptr unless null.
 
-Sat May 15 01:33:12 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_file_initialize): ditto.
 
-	* range.c (range_each_func): terminates loop if generating value
-	  is same to @end.  [ruby-talk:100269]
+	* lib/tempfile.rb: specify FILE::CREAT|File::EXCL to open for
+	  better security.
 
-Fri May 14 22:08:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* numeric.c (flo_truncate): new method.
 
-	* string.c (rb_str_new4): should not reuse frozen shared string if
-	  the original is not an instance of String. [ruby-talk:100193]
+Wed Jul  5 01:02:53 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Fri May 14 18:39:25 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/extmk.rb.in: join ' ' -> join(' ').
 
-	* ext/tk/lib/tk/canvas.rb: improve coords support for canvas items.
-	  Now, supports all of the followings.
-	    TkcLine.new(c, 0, 0, 100, 100, :fill=>'red')
-	    TkcLine.new(c, [0, 0, 100, 100], :fill=>'red')
-	    TkcLine.new(c, [0, 0], [100, 100], :fill=>'red')
-	    TkcLine.new(c, [[0, 0], [100, 100]], :fill=>'red')
-	    TkcLine.new(c, :coords=>[0, 0, 100, 100], :fill=>'red')
-	    TkcLine.new(c, :coords=>[[0, 0], [100, 100]], :fill=>'red')
+	* lib/mkmf.rb: ditto.
 
-Fri May 14 12:11:43 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Jul  4 13:51:29 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* util.c (ruby_strtod): strtod("0", &end); => end should point '\0'.
-	 [ruby-dev:23498]
+	* ext/dbm/dbm.c: add methods added to Hash in 1.5.x.
 
-Thu May 13 15:47:30 2004  akira yamada  <akira@ruby-lang.org>
+	* ext/gdbm/gdbm.c: ditto.
 
-	* lib/net/telnet.rb (Net::Telnet::login): "options" can specify
-	  regexps for login prompt and/or password prompt.
+	* ext/sdbm/init.c: ditto.
 
-Thu May 13 14:23:45 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (proc_call): args may be Qundef (means no argument), do
+	  not call TYPE() for args.
 
-	* hash.c (delete_if_i): use st_delete_safe() (via
-	  rb_hash_delete()) instead of returning ST_DELETE.
-	  backport from HEAD.  [ruby-dev:23487]
+Tue Jul  4 13:20:56 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Thu May 13 13:01:30 2004  akira yamada  <akira@ruby-lang.org>
+	* ext/extmk.rb.in: make command line must be single-quoted.
+	  $(RUBY_INSTALL_NAME) is command substitution in the POSIX sh.
 
-	* lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment.
+Tue Jul  4 13:16:02 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu May 13 11:04:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* util.c (rb_type): should add T_UNDEF.
 
-	* pack.c (pack_pack): always add with null for 'Z'.
+Tue Jul  4 09:30:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* pack.c (pack_unpack): terminated by null for 'Z'.  [ruby-talk:98281]
+	* parse.y (here_document): supports EOF right after terminator.
 
-Wed May 12 19:59:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* random.c (rb_f_rand): argument is now optional (rand(max=0)). 
 
-	* lib/mkmf.rb (have_type, check_sizeof): replace unusable characters.
-	  [ruby-talk:99788]
+Tue Jul  4 01:50:49 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Wed May 12 17:41:42 2004  Tanaka Akira  <akr@m17n.org>
+	* win32/ruby.def: remove ruby_mktemp.
 
-	* lib/resolv.rb (Resolv::DNS::Config): make it configurable without
-	  external file such as /etc/resolv.conf.
+Tue Jul  4 01:27:13 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed May 12 14:37:27 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (rb_rescue2): new function to rescue arbitrary exception.
 
-	* ext/openssl/ossl_x509name.c: attribute value of DC (short name of
-	  domainComponent) should be IA5String.
+	* numeric.c (do_coerce): should catch NameError explicitly.
 
-Wed May 12 13:20:19 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Jul  4 00:15:23 2000  Dave Thomas  <Dave@thomases.com>
 
-	* ext/tk/lib/tk/composite.rb: improve configure methods (based on
-	  the proposal of [ruby-talk:99671]).
+	* numeric.c (Init_Numeric): forgot to register Numeric#remainder.
 
-Wed May 12 11:51:08 2004  Dave Thomas  <dave@pragprog.com>
+Mon Jul  3 23:46:56 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* class.c (rb_obj_singleton_methods): fix rdoc
+	* win32/win32.c (myselect, myaccept): disable interrupt while
+	  executing accept() or select() to avoid Ctrl-C causes
+	  "unknown software exception (0xc0000029)".
 
-Mon May 10 21:44:42 2004  Dave Thomas  <dave@pragprog.com>
+Mon Jul  3 18:35:41 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/rdoc/generators/html_generator.rb: Change scheme for
-	  looking up symbols in  HTML generator.
+	* lib/mkmf.rb: use null device if it exists for cross-compiling.
 
-Mon May 10 16:45:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul  3 18:19:51 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* eval.c (eval): warning during eval should not cause deadlock.
-	  [ruby-talk:98651]
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
 
-	* eval.c (rb_eval): raise TypeError exception for superclass
-	  mismatch.  [ruby-list:39567]
+	* lib/net/protocol.rb (finish): do nothing unless active.
 
-Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/http.rb: HTTP#{get,post}2 again (for new impl).
 
-	* lib/rdoc/generators/html_generator.rb: Hack to search parents
-	  for unqualified constant names.
+Mon Jul  3 16:47:22 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
+	* cygwin/GNUmakefile: librubys.a -> lib$(RUBY_INSTALL_NAME)s.a
 
-	* lib/rdoc/generators/html_generator.rb: Hack to search parents
-	  for unqualified constant names.
+	* configure.in: use AC_CANONICAL_{HOST,TARGET,BUILD}.
 
-Sun May  9 22:37:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Mon Jul  3 13:15:02 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/net/ftp.rb: improved documentation
-	* lib/net/imap.rb: ditto
-	* lib/net/pop.rb: ditto
-	* lib/net/smtp.rb: ditto
-	* lib/net/telnet.rb: ditto
+	* numeric.c (fix_divmod): x * d + m = y where d, m = x.divmod(y).
 
-Fri May  7 21:50:21 2004  Dave Thomas  <dave@pragprog.com>
+	* bignum.c (rb_big_divmod): ditto.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_include): Allow
-	  multiple arguments to 'include'
+	* numeric.c (fixdivmod): does not depend C's undefined %
+	  behavior.  adopt to fmod(3m) behavior.
 
-Fri May  7 21:31:56 2004  Minero Aoki  <aamine@loveruby.net>
+	* numeric.c (flo_mod): modulo now reserves fmod(3m) behavior.
 
-	* lib/fileutils.rb (fu_list): Array() breaks pathes including "\n".
-	  [ruby-core:02843]
+	* numeric.c (num_remainder): 'deprecated' warning.
 
-Fri May  7 11:25:53 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jul  3 10:27:28 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* util.c (ruby_strtod): "0.0000000000000000001" should be converted
-	  to 1.0e-19 instead of 0.0. (leading zeros aren't significant digits)
-	  [ruby-talk:99318] [ruby-dev:23465]
+	* configure.in: use AC_CANONICAL_SYSTEM.
 
-Fri May  7 10:00:05 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sun Jul  2 21:17:37 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
+	* configure.in: support without --enable-shared for cygwin/mingw32.
 
-Thu May  6 22:13:17 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* cygwin/GNUmakefile: ditto.
 
-	* ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
-	  hostname.
+	* ext/extmk.rb.in: use null device if it exists for cross-compiling.
 
-Thu May  6 14:22:29 2004  why the lucky stiff  <why@ruby-lang.org>
+	* lib/mkmf.rb: ditto.
 
-	* lib/yaml/rubytypes.rb (to_yaml): added instance variable handling
-	  for Ranges, Strings, Structs, Regexps.
+	* util.c (ruby_mktemp): remove unused ruby_mktemp().
 
-	* lib/yaml/rubytypes.rb (to_yaml_fold): new method for setting a
-	  String's flow style.
+Sun Jul  2 14:18:04 2000  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/yaml.rb (YAML::object_maker): now uses Object.allocate.
+	* eval.c (TMP_PROTECT_END): tmp__protect_tmp may be NULL.
 
-	* ext/syck/gram.c: fixed transfer methods on structs, broke it
-	  last commit.
+Sun Jul  2 03:37:50 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Thu May  6 11:40:28 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.25.
 
-	* lib/net/imap.rb (string): accept NIL.
+	* lib/net/protocol.rb (each_crlf_line): beg = 0 is needed in adding{}
 
-	* lib/net/imap.rb (body_type_basic): allow body-fields omissions.
+	* lib/net/smtp.rb: allow String for to_addr of SMTP#sendmail
 
-Thu May  6 01:59:04 2004  Dave Thomas  <dave@pragprog.com>
+Sat Jul  1 15:22:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params):
-	  Don't include the &block parameter if we have explicit
-	  yield parameters.
+	* numeric.c (fix_rshift): should handle shift value more than
+	  sizeof(long). 
 
-Wed May  5 03:40:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Jul  1 15:22:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rinda/ring.rb: use recv instead of recvfrom.
+	* eval.c (rb_eval): the value from RTEST() is not valid Ruby
+	  object.  result should be either true or false.
 
-Tue May  4 23:52:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sat Jul  1 09:30:06 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* lib/gserver.rb: documented
+	* re.c (rb_reg_initialize): was freeing invalid pointer.
 
-Tue May  4 23:46:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sat Jul  1 03:25:56 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/xmlrpc/README.txt: introduced for documentation purposes
+	* parse.y (call_args): command_call can be the last argument of
+	  call_args.  It had to be the only argument.
 
-Mon May  3 09:47:24 2004  Dave Thomas  <dave@pragprog.com>
+	* re.c (rb_reg_s_quote): should not dump core even for unsane mbc
+	  string.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
-	  Fix parsing bug if yield called within 1 line block
+Fri Jun 30 01:36:20 2000  Aleksi Niemela  <aleksi.niemela@cinnober.com>
 
-Sun May  2 01:04:38 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* parse.y (f_norm_arg): better, nicer error message.
 
-	* ext/tcltklib, ext/tk: renewal Ruby/Tk
+Thu Jun 29 07:45:33 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Apr 30 20:08:41 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/socket/socket.c (udp_send): destination may be packed
+	  struct sockaddr.
 
-	* time.c (SIZEOF_TIME_T): support SIZEOF_TIME_T == SIZEOF_INT.
+	* object.c (rb_Integer): Integer(nil) should be invalid, on the
+	  other hand, nil.to_i is OK.
 
-Tue Apr 27 13:12:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jun 28 17:26:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_eval): too many line trace call. (ruby-bugs PR#1320)
+	* ext/socket/socket.c (ip_recvfrom): udp_recvfrom and tcp_recvfrom
+	  is merged and moved to IPSocket#recvfrom.
 
-Tue Apr 27 08:41:28 2004  why the lucky stiff  <why@ruby-lang.org>
+	* ext/socket/socket.c (sock_s_getaddrinfo): family can be a
+	  strings such as "AF_INET" etc.
 
-	* lib/yaml/rubytypes.rb: passing Range tests.
+	* ruby.c (require_libraries): . and RUBYLIB added to $load_path
+	  just before -r procedure.
 
-	* ext/syck/syck.h: version 0.44.
+	* ruby.c (proc_options): -e, - did not exec -r.
 
-	* ext/syck/gram.c: transfers no longer open an indentation.
-	  fixed transfers which precede blocks.
+Wed Jun 28 14:52:28 2000  Koga Youichirou <y-koga@mms.mt.nec.co.jp>
 
-	* ext/syck/token.c: ditto.
+	* config.sub: NetBSD/hpcmips support.
 
-	* ext/syck/syck.c: fixed segfault if an anchor has been released already.
+Wed Jun 28 10:11:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/node.c (syck_free_members): organized order of free'd nodes.
+	* gc.c: gc trigger threshold changed; GC_NEWOBJ_LIMIT removed,
+	  FREE_MIN is increased to 4096.
 
-	* ext/syck/rubyext.c (syck_emitter_write_m): test for proper string with
-	  StringValue.
+Tue Jun 27 22:39:28 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Mon Apr 26 23:56:54 2004  Daniel Kelley  <news-1082945587@dkelley.gmp.san-jose.ca.us>
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.24.
 
-	* README.EXT, README.EXT.ja: fixed wrong function signature.
-	  [ruby-talk:98349]
+	* lib/net/protocol.rb: modified each_crlf_line again.
 
-Mon Apr 26 21:40:09 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/protocol.rb: do_write_beg,do_write_end -> writing{}
+	  do_write_do -> do_write
 
-	* lib/rdoc/code_objects.rb (RDoc::Context::add_alias): Only alias
-	  to instance methods.
+	* lib/net/http.rb: can make proxy connection by passing
+	  addresses to HTTP.new, start.
 
-Sat Apr 24 10:38:31 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/http.rb: HTTP.new_implementation, old_implementation:
+	  can use 1.2 implementation of head, get, post, put.
+	  (see document)
 
-	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::group_lines):
-	  Fix bug where consecutive headings are merged.
+Tue Jun 27 12:05:10 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Fri Apr 23 23:26:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32.c (myfdclr): new function.
 
-	* lib/mkmf.rb: $hdrdir should not contain macros for backward
-	  compatibility.  [bruby-dev:28]
+	* win32.h: add FD_CLR.
 
-	* version.c (ruby_show_copyright): obtain copyright year from
-	  RUBY_RELEASE_YEAR.
+Mon Jun 26 23:41:41 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* win32/resource.rb: ditto.
+	* ruby.h: add cast for ANSI style.
 
-	* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
-	  include them.
+	* gc.c (rb_data_object_alloc): use RUBY_DATA_FUNC.
 
-	* win32/resource.rb: include winver.h for older WindowsCE.
+Mon Jun 26 22:20:03 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Fri Apr 23 16:38:46 2004  Tanaka Akira  <akr@m17n.org>
+	* win32/win32.c (is_socket, extract_file_fd): New function.
 
-	* lib/pathname.rb: sync taint/freeze flag between
-	  a pathname object and its internal string object.
+	* win32/win32.c (myfdopen): use is_socket().
 
-Fri Apr 23 14:52:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (myselect): return non socket files immediately
+	  if file and socket handles are mixed.
 
-	* parse.y (stmt, arg, aref_args): should not make sole splat into
-	  array, in aref_args other than aref with op_asgn.
+Mon Jun 26 16:21:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Apr 23 14:14:38 2004  Tanaka Akira  <akr@m17n.org>
+	* eval.c (rb_thread_schedule): wait_for cleared too early.
 
-	* lib/resolv.rb: don't use Regexp#source to embed regexps.
-	  [ruby-dev:23432]
+Mon Jun 26 09:15:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Apr 22 04:15:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* pack.c: remove obsolete 'F', 'D' specifiers.
 
-	* parse.y (aref_args): should pass expanded list.  [ruby-core:02793]
+Sun Jun 25 00:55:03 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Thu Apr 22 01:12:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/socket.c (sock_s_getnameinfo): `res' would not
+	  be assigned if TYPE(sa) == T_STRING.
 
-	* numeric.c (flo_to_s): tweak output string based to preserve
-	  decimal point and to remove trailing zeros.  [ruby-talk:97891]
+Sat Jun 24 14:36:29 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* string.c (rb_str_index_m): use unsigned comparison for T_FIXNUM
-	  search.  [ruby-talk:97342]
+	* config*.dj, configure.bat, top.sed: move to djgpp/.
 
-Wed Apr 21 22:57:27 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Jun 24 02:34:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rinda/rinda.rb, test/rinda/test_rinda.rb: check Hash tuple size.
+	* ruby.c (load_file): call require_libraries() here to let
+	  debug.rb work properly.
 
-Wed Apr 21 20:05:00 2004  Tanaka Akira  <akr@m17n.org>
+Fri Jun 23 22:34:51 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* lib/open-uri.rb (URI::HTTP#proxy_open): set Host: field explicitly.
-	  [ruby-list:39542]
+	* bignum.c (rb_big_lshift): reorder xds assignment to avoid
+	  reusing `x' as `len' by VC++ 6.0 SP3 compiler with -Ox switch.
 
-Mon Apr 19 18:11:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jun 23 01:11:27 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* hash.c (rb_hash_equal): returns true if two hashes have same set
-	  of key-value set.  [ruby-talk:97559]
+	* string.c (rb_str_substr): should return empty string (""), 
+	  if beg == str.size and len == zero, mostly for convenience and
+	  backward compatibility.
 
-	* hash.c (rb_hash_eql): returns true if two hashes are equal and
-	  have same default values.
+	* parse.y (new_super): should tweak block_pass node for super too.
 
-Mon Apr 19 08:19:58 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
+	* string.c (rb_str_split_m): last split element should not be nil,
+	  but "" when limit is specified.
 
-	* dln.c, io.c, lib/benchmark.rb, lib/cgi.rb, lib/csv.rb, lib/date.rb,
-	  lib/ftools.rb, lib/getoptlong.rb, lib/logger.rb, lib/matrix.rb,
-	  lib/monitor.rb, lib/set.rb, lib/thwait.rb, lib/timeout.rb,
-	  lib/yaml.rb, lib/drb/drb.rb, lib/irb/workspace.rb, lib/net/ftp.rb,
-	  lib/net/http.rb, lib/net/imap.rb, lib/net/telnet.rb,
-	  lib/racc/parser.rb, lib/rinda/rinda.rb, lib/rinda/tuplespace.rb,
-	  lib/shell/command-processor.rb, lib/soap/rpc/soaplet.rb,
-	  lib/test/unit/testcase.rb, lib/test/unit/testsuite.rb: typo fix.
+Thu Jun 22 17:27:46 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Apr 19 08:14:18 2004  Dave Thomas  <dave@pragprog.com>
+	* string.c (rb_str_substr): str[n,m] now returns nil when n equals
+	  to str.size.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Allow for
-	  #ifdef HAVE_PROTOTYPES
+Thu Jun 22 13:49:02 2000  Uechi Yasumasa <uechi@ryucom.ne.jp>
 
-Fri Apr 16 22:33:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* lib/net/ftp.rb: support resuming.
 
-	* ext/iconv/iconv.c: nearly finished RDoc comments.
+Thu Jun 22 13:37:19 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Fri Apr 16 17:04:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_thread_sleep_forever): merge pause() macro.
 
-	* string.c (rb_str_equal): always returns true or false, never
-	  returns nil. [ruby-dev:23404]
+Wed Jun 21 08:49:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Apr 16 08:27:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): should not raise exception just by defining
+	  singleton class.
 
-	* ext/extmk.rb: skip linking when libraries to be preloaded not
-	  compiled.  [ruby-list:39561]
+Wed Jun 21 01:18:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Apr 15 23:21:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.h: two macros RUBY_DATA_FUNC and RUBY_METHOD_FUNC are added
+	  to make writing C++ extensions easier.
 
-	* process.c (pst_success_p): new method Process::Status#success?.
-	  [ruby-dev:23385]
+	* array.c (rb_ary_dup): internal classes should not be shared by dup.
 
-Thu Apr 15 17:12:13 2004  Tanaka Akira  <akr@m17n.org>
+	* hash.c (rb_hash_dup): ditto.
 
-	* ext/gdbm/gdbm.c (Init_gdbm): define GDBM::READER, GDBM::WRITER,
-	  GDBM::WRCREAT and GDBM::NEWDB.
-	  (fgdbm_initialize): use specified read/write flag.
+	* object.c (rb_obj_dup): ditto.
 
-Wed Apr 14 11:29:56 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* string.c (rb_str_dup): ditto.
 
-	* numeric.c (flo_eq): workaround for bcc32's bug.
-	  (ruby-bugs-ja:PR#594)
+	* error.c (Init_Exception): renamed NotImplementError to
+	  NotImplementedError. 
 
-Wed Apr 14 13:06:35 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
+Tue Jun 20 16:22:38 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* array.c, enum.c, eval.c, file.c, io.c, numeric.c, object.c, prec.c,
-	  process.c, re.c, string.c: typos in RDoc comments.  [ruby-core:02783]
+	* time.c (make_time_t): bug in DST boundary.
 
-Wed Apr 14 11:06:38 2004  Dave Thomas  <dave@pragprog.com>
+Tue Jun 20 10:54:19 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::scan): Changed
-	  behavior of :enddoc: -- it now unconditionally terminates
-	  processing of the current file.
+	* configure.in: add eval sitedir.
 
-Wed Apr 14 11:03:22 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Jun 20 06:14:43 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* defines.h: include <net/socket.h> to get fd_set definition in BeOS.
+	* lib/cgi.rb: change: version syntax. old: x.yz, now: x.y.z
 
-Tue Apr 13 23:06:30 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/net/telnet.rb: ditto.
 
-	* lib/rinda/rinda.rb: change pattern matching.
-	  a === b -> a == b || a === b. [druby-ja:98]
+Tue Jun 20 00:37:45 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/rinda/test_rinda.rb: ditto.
+	* re.c (rb_reg_kcode_m): Regexp#kcode returns nil for code unfixed
+	  regexp object.
 
-Tue Apr 13 19:54:29 2004  Minero Aoki  <aamine@loveruby.net>
+	* bignum.c (bigdivmod): bignum zero check was wrong.
 
-	* lib/net/http.rb: should not overwrite HTTP request header.
-	  [ruby-list:39543]
+Mon Jun 19 10:48:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Apr 13 01:30:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* variable.c (rb_cvar_set): forgot to add security check for class
+	  variable assignment.
 
-	* ext/iconv/iconv.c: RDoc documentation (from RD; nearly finished).
-	* ext/iconv/charset_alias.rb: Prevent from RDoc'ing.
+Sun Jun 18 22:49:13 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Mon Apr 12 19:11:29 2004  Eric Hodel  <drbrain@segment7.net>
+	* configure.in: single quoted sitedir.
 
-	* gc.c (rb_gc_copy_finalizer): typo.  [ruby-core:02774]
+	* mkconfig.rb: add DESTDIR for cross-compiling.
 
-Mon Apr 12 18:52:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/mkmf.rb: add DESTDIR.
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
-	  a value.
+	* ruby.c (load_file): force binmode if fname includes ".exe"
+	  on DOSISH.
 
-Mon Apr 12 10:43:47 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jun 17 23:22:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* dir.c (rb_glob2, rb_glob, rb_globi, push_globs, push_braces,
-	  rb_push_glob): fix memory leak. (leaked when block was interrupted)
+	* sprintf.c (rb_f_sprintf): should ignore negative precision given
+	  by <%.*>.
 
-Mon Apr 12 10:27:37 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* sprintf.c (rb_f_sprintf): should allow zero precision.
 
-	* bcc32/Makefile.sub: backport SIZEOF_TIME_T definition from 1.9.
+Sat Jun 17 03:13:29 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* win32/Makefile.sub: ditto.
+	* 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>
 
-	* wince/Makefile.sub: ditto.
+	* io.c (rb_io_rewind): set lineno to zero.
 
-Sun Apr 11 19:12:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun 16 22:47:47 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* ruby.c (require_libraries): restore source file/line after
-	  statically linked extensions initialized.  [ruby-dev:23357]
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.23.
 
-Sun Apr 11 10:47:04 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/protocol.rb: too many CRLF in last line.
 
-	* lib/rdoc/code_objects.rb (RDoc::TopLevel::add_class_or_module): Toplevel
-	  classes and modules are a special case too... (handle extending existing
-	  classes with or without :enddoc:)
+Fri Jun 16 21:23:59 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Sat Apr 10 23:51:13 2004  Dave Thomas  <dave@pragprog.com>
+	* configure.in: add pause(2) checking.
 
-	* lib/rdoc/code_objects.rb (RDoc::Context::add_to): Implementation of :enddoc:
-	  made one too many assumptions...
+	* eval.c: define pause() if missing.
 
-Sat Apr 10 00:00:19 2004  Dave Thomas  <dave@pragprog.com>
+Fri Jun 16 18:41:58 2000  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/rdoc/markup/simple_markup/inline.rb: Fix problem
-	  with \_cat_<b>dog</b>
+	* process.c (proc_setsid): BSD-style setpgrp() don't return 
+	  process group ID, but 0 or -1.
 
-Wed Apr  7 00:19:50 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Fri Jun 16 16:23:35 2000  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/rinda/rinda.rb: fix hash tuple bug.
+	* file.c (rb_stat_inspect): gives detailed information;
+	  compatibility with ruby-1.4.x.
 
-	* lib/rinda/tuplespace.rb: ditto.
+Fri Jun 16 05:18:45 2000  Yasuhiro Fukuma  <yasuf@bsdclub.org>
 
-	* test/rinda/test_rinda.rb
+	* configure.in: FreeBSD: do not link dummy libxpg4 which was
+	  merged into libc.
 
-Tue Apr  6 18:24:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jun 16 03:17:36 2000  Satoshi Nojo  <nojo@t-samukawa.or.jp>
 
-	* io.c (rb_io_reopen): should use rb_io_check_io().
+	* ext/dbm/dbm.c (fdbm_length): use GetDBM. empty?, [] too.
 
-Tue Apr  6 16:46:09 2004  Tanaka Akira  <akr@m17n.org>
+	* ext/gdbm/gdbm.c (fgdbm_length): ditto.
 
-	* configure.in: check the size of time_t.
+	* ext/sdbm/init.c (fsdbm_length): ditto.
 
-	* time.c (time_add): new function.
-	  (time_plus): use time_add.
-	  (time_minus): use time_add.
+Fri Jun 16 01:57:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Apr  6 13:21:30 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (rb_thread_sleep_forever): pause(2) instead of sleep(3).
 
-	* ext/socket/socket.c (make_hostent): must return value.
+Thu Jun 15 10:46:36 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Apr  6 00:05:30 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* string.c (rb_str_sub_bang): should probagate taintness from
+	  replacement string.
 
-	* lib/rinda/rinda.rb: add require 'drb/drb'
+Wed Jun 14 17:01:41 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Mon Apr  5 08:18:23 2004  Dave Thomas  <dave@pragprog.com>
+	* rubytest.rb: add CONFIG['EXEEXT'] to the executable file name.
 
-	* lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
-	  references work properly.
+Wed Jun 14 14:50:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Apr  4 20:33:42 2004  Minero Aoki  <aamine@loveruby.net>
+	* string.c (rb_f_sub): assign to $_ only if modification happens.
 
-	* eval.c (Init_load): make $LOADED_FEATURES built-in.
-	  [ruby-dev:23299]
+	* string.c (rb_f_gsub): ditto.
 
-	* ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
+	* string.c (rb_f_chop): ditto.
 
-	* lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
+	* string.c (rb_f_chomp): ditto.
 
-Sun Apr  4 14:01:20 2004  Dave Thomas  <dave@pragprog.com>
+	* io.c (io_reopen): preserve file position by ftell/fseek, if io
+	  is a seekable.
 
-	* lib/rdoc/options.rb (Options::parse): Allow multiple -x options to RDoc.
-	  Fix bug where files weren't being excluded properly
+	* eval.c (method_arity): wrong arity number for the methods with
+	  optional arguments.
 
-Sat Apr  3 17:11:05 2004  why the lucky stiff  <why@ruby-lang.org>
+	* time.c (make_time_t): opposite timezone shift (should be negative).
 
-	* ext/syck/syck.h: version 0.43.
+Wed Jun 14 14:07:38 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* ext/syck/lib/gram.c: allow root-level inline collections.
-	 [ruby-talk:94922]
+	* io.c: typo(ig/if).
 
-	* lib/yaml/rubytypes.rb (Symbol#to_yaml): emit symbols as implicits.
-	 [ruby-talk:94930]
+	* re.c: typo(re/reg). add rb_reg_check().
 
-	* ext/syck/bytecode.c: turn off default implicit typing.
+	* time.c: remove unneeded declare(daylight, timezone).
 
-	* ext/syck/implicit.c: detect base60 integers.
+	* configure.in: add include <time.h> when daylight checking.
 
-	* ext/syck/rubyext.c: handle base60, as well as hex and octal
-	  with commas.  implicit typing of ruby symbols.
+Wed Jun 14 11:36:52 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Fri Apr  2 17:27:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c (r_object): modified for symbols.
 
-	* eval.c (top_include): include in the wrapped load is done for
-	  the wrapper, not for a singleton class for wrapped main.
-	  [ruby-dev:23305]
+	* marshal.c (w_object): ditto.
 
-Fri Apr  2 15:13:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jun 14 10:04:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* bignum.c (rb_big_eq): use temporary double variable to save the
-	  result (internal float register may be bigger than 64 bits, for
-	  example, 80 bits on x86).  [ruby-dev:23311]
+	* re.c (rb_memcmp): should compare according to ruby_ignorecase.
 
-Fri Apr  2 14:35:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_cmp): use rb_memcmp.
 
-	* eval.c (block_pass): should generate unique identifier of the
-	  pushing block.  [ruby-talk:96363]
+	* string.c (rb_str_index): ditto.
 
-Fri Apr  2 07:31:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_rindex): ditto.
 
-	* ext/socket/socket.c (make_hostent): fix memory leak, based on
-	  the patch from HORIKAWA Hisashi <vzw00011@nifty.ne.jp>.
+	* string.c (rb_str_each_line): ditto.
 
-Thu Apr  1 22:55:33 2004  Dave Thomas  <dave@pragprog.com>
+Wed Jun 14 04:58:53 2000  Dave Thomas  <dave@thomases.com>
 
-	* lib/rdoc/parsers/parse_rb.rb: Allow rdoc comments in
-	  =begin rdoc/=end
+	* io.c (rb_io_set_lineno): should have returned VALUE, not
+	  integer.
 
-	* lib/rdoc/parsers/parse_rb.rb: Fix problem with comment in
-	  top-level method being taken as file comment.
+Wed Jun 14 09:29:42 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Apr  1 22:55:04 2004  Dave Thomas  <dave@pragprog.com>
+	* string.c (rb_str_dup): dup should always propagate taintness.
 
-	* lib/rdoc/ri/ri_options.rb: Fix undefined variable warning.
+Wed Jun 14 00:50:14 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-Thu Apr  1 19:58:37 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/cgi.rb: read_multipart(): if no content body then raise EOFError.
 
-	* lib/soap/mapping/{factory.rb,registry.rb}: fixed illegal mapped URI
-	  object with soap/marshal.
-	  added URIFactory class for URI mapping.  BasetypeFactory checks
-	  instance_variables when original mapping is not allowed (ivar must
-	  be empty).  Instance of URI have instance_variables but it must be
-	  llowed whenever original mapping is allowed or not.
+Tue Jun 13 11:46:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/xsd/datatypes.rb: check the smallest positive non-zero
-	  single-precision float exactly instead of packing with "f".
-	  [ruby-talk:88822]
+	* process.c (proc_setsid): try implement it using setpgrp() and
+	  ioctl(fd, TIOCNOTTY, NULL).
 
-	* lib/soap/mapping/rubytypeFactory.rb: should not dump singleton class.
-	  [ruby-dev:22588]
-	  c = class << Object.new; class C; self; end; end; SOAPMarshal.dump(c)
+	* re.c (rb_reg_prepare_re): magic variable $= should affect regex
+	  pattern match. 
 
-Wed Mar 31 19:06:23 2004  Tanaka Akira  <akr@m17n.org>
+	* time.c (make_time_t): use tm.tm_gmtoff if possible.
 
-	* time.c (year_leap_p): new function.
-	  (timegm_noleapsecond): ditto.
-	  (search_time_t): use timegm_noleapsecond instead of
-	  mktime for first guess.
+	* time.c (time_zone): use tm.tm_zone if available.
 
-Wed Mar 31 12:04:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 13 01:50:57 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/delegate.rb (DelegateClass): define internal methods of the
-	  result class, but not metaclass of the caller.  [ruby-talk:96156]
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.22.
 
-	* intern.h: provide proper prototypes.  [ruby-core:02724]
+	* lib/net/http.rb: HTTPResponse#body returns body.
 
-	* ruby.h: missing.h is now prerequisite to intern.h.
+Mon Jun 12 23:41:54 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Tue Mar 30 20:25:34 2004  Tanaka Akira  <akr@m17n.org>
+	* configure.in (daylight): avoid GCC optimization.
 
-	* time.c (search_time_t): limit guess range by mktime if it is
-	  available.  [ruby-dev:23274]
+Mon Jun 12 19:02:27 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Sun Mar 28 14:16:59 2004  Minero Aoki  <aamine@loveruby.net>
+	* configure.in: cygwin has strange timezone.
 
-	* lib/net/pop.rb (auth): failed when account/password include "%".
-	  [ruby-talk:95933]
+	* time.c (time_zone): use tzname and daylight.
 
-Sat Mar 27 21:40:41 2004  Tanaka Akira  <akr@m17n.org>
+Sat Jun 10 23:10:32 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/open-uri.rb: permit extra semicolon in content-type field.
+	* io.c (rb_io_seek): whence is optional, default is SEEK_SET.
 
-Sat Mar 27 10:40:48 2004  Tanaka Akira  <akr@m17n.org>
+Fri Jun  9 17:00:29 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* (lib/pp.rb, lib/prettyprint.rb): define seplist in PP::PPMethods
-	  instead of PrettyPrint.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.21.
 
-Thu Mar 25 23:28:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/http.rb: exception is raised with response object.
 
-	* time.c (time_overflow_p): backport 1.9 usec overflow function.
-	  (ruby-bugs PR#1307)
+Fri Jun  9 15:11:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Mar 25 23:15:24 2004  Dave Thomas  <dave@pragprog.com>
+	* time.c (make_time_t): supports daylight saving time.
 
-	* lib/rdoc/ri/ri_options.rb (RI::Options::show_version):
-	  Add --version option
+	* eval.c (rb_thread_safe_level): should retrieve current $SAFE
+	  value if a thread is the current thread.
 
-Thu Mar 25 04:16:18 2004  Dave Thomas  <dave@pragprog.com>
+Thu Jun  8 14:25:45 2000  Hiroshi Igarashi  <iga@ruby-lang.org>
 
-	* lib/rdoc/ri/ri_options.rb (RI::Options): Add the --list-names option,
-	  which dumps our all known names
+	* lib/mkmf.rb: add target `distclean' in Makefile for extlib.
+	  target `clean' doesn't remove Makefile.
 
-Thu Mar 25 03:57:47 2004  Dave Thomas  <dave@pragprog.com>
+Thu Jun  8 13:34:03 2000  Dave Thomas  <dave@thomases.com>
 
-	* lib/rdoc/ri/ri_util.rb (NameDescriptor::initialize): No longer
-	  allow nested classes to be designated using "."--you must
-	  now use "::"
+	* numeric.c: add nan?, infinite?, and finite? to Float
 
-Thu Mar 25 02:00:18 2004  Dave Thomas  <dave@pragprog.com>
+Thu Jun  8 00:31:04 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/rdoc/generators/template/html/one_page_html.rb (Page):
-	  Fix to work with C modules.
+	* regex.h: export re_mbctab properly on cygwin.
 
-Wed Mar 24 21:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* dln.c: use dlopen instead of LoadLibrary on cygwin.
 
-	* lib/uri.rb: Documented (thanks Dmitry V. Sabanin).
-	* lib/uri/common.rb: Ditto.
-	* lib/uri/ftp.rb: Ditto.
-	* lib/uri/generic.rb: Ditto.
-	* lib/uri/http.rb: Ditto.
-	* lib/uri/https.rb: Ditto.
-	* lib/uri/ldap.rb: Ditto.
-	* lib/uri/mailto.rb: Ditto.
-	  (All backported from 1.9)
+Thu Jun  8 13:41:34 2000  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Wed Mar 24 18:48:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c (rb_file_s_basename): might dump core.
 
-	* lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by
-	  DESTDIR after installed.
+Tue Jun  6 03:29:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/mkmf.rb (RUBY): / is not recognized as path separator on
-	  nmake/bmake. [ruby-list:39388]
+	* dir.c (dir_foreach): now returns nil for consistency.
 
-	* lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
+	* bignum.c (bigdivmod): modulo by small numbers was wrong.
 
-Wed Mar 24 12:32:56 2004  Dave Thomas  <dave@pragprog.com>
+Mon Jun  5 00:18:08 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_class_module):
-	  Don't document methods if we don't know for sure the
-	  class or module.
+	* bignum.c: avoid conflict with USHORT on mingw32.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
-	  Don't store documentation for singleton classes if we
-	  don't know the real class.
+Mon Jun  5 00:13:35 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Wed Mar 24 11:11:26 2004  Dave Thomas  <dave@pragprog.com>
+	* eval.c (rb_thread_schedule): =/== typo.
 
-	* lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template):
-	  Allow non-RDoc templates by putting a slash in the template name
+Sun Jun  4 03:17:36 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-Mon Mar 22 16:19:57 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/cgi.rb: improve: CGI::pretty()
 
-	* ruby.1: add -width option to .Bl for old groff.
+Sun Jun  4 02:01:10 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Sun Mar 21 21:11:16 2004  Keiju Ishitsuka  <keiju@ishitsuka.com>
+	* lib/mkmf.rb: do not need to add -L$(topdir) in --enable-shared case.
 
-	* lib/shell/*: bug fix for Shell#system(command_line_string).
+Sat Jun  3 13:50:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Mar 20 20:57:10 2004  David Black  <dblack@wobblini.net>
+	* parse.y (rb_id2name): should support constant attrset
+	  identifiers. 
 
-	* lib/scanf.rb: Backported 1.9 branch
-	  modifications/corrections to 1.8 branch
+	* bignum.c (rb_big_eq): Bignum#== should not raise exception.
 
-Sat Mar 20 23:51:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Fri Jun  2 11:24:48 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_require_safe): preserve old ruby_errinfo.
-	  [ruby-talk:95409]
+	* io.c (rb_io_popen): open with a block returns the value from the
+	  block.  old behavior was back.
 
-	* eval.c (rb_f_raise): should not clear backtrace information if
-	  exception object already have one.
+Fri Jun  2 00:42:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Mar 20 15:25:36 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Force
-	  page background to white.
+	* eval.c (rb_thread_cleanup): should clear priority for thread
+	  termination.
 
-Sat Mar 20 09:52:33 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+Thu Jun  1 22:39:41 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/date.rb, lib/date/format.rb: _parse() now accepts fractional
-	  part of second minute that follows a comma or a full stop.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.20.
 
-Fri Mar 19 01:55:57 2004  Mauricio Fernandez  <batsman.geo@yahoo.com>
+	* lib/net/http.rb: wrongly closed the socket twice
+	  when no Content-Length: was given.
 
-	* io.c (rb_io_sync): need not to check writable. [ruby-core:02674]
+Thu Jun  1 00:59:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Mar 18 21:44:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* eval.c (rb_yield_0): convert Qundef to [].
 
-	* lib/drb/drb.rb: backport drb.rb 1.16.
+Wed May 31 20:45:59 2000  Dave Thomas  <Dave@Thomases.com>
 
-Fri Mar 18 17:49:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_slice_bang): wrong argument number.
 
-	* struct.c (make_struct): allow const_id for accessor names.
-	  [ruby-core:04585]
+Wed May 31 12:37:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_attr): check if attribute name is local_id or
-	  const_id.
+	* eval.c (rb_exec_end_proc): print error message from END procs.
 
-Thu Mar 18 16:22:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed May 31 04:06:41 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-	* eval.c (proc_eq): avoid false positive by using scope and
-	  dyna_vars.  no longer use frame.uniq.
+	* lib/cgi.rb: change: CGI#out() if "HEAD" == REQUEST_METHOD then
+	  output only HTTP header.
 
-Wed Mar 17 14:44:43 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed May 31 01:54:21 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* dir.c (range): fix possible "\0" overrun. (in case of "\0-")
+	* eval.c (rb_thread_schedule): set main_thread->status to
+	  THREAD_TO_KILL, before raising deadlock error.
 
-Mon Mar 15 07:39:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_thread_deadlock): if curr_thread == main_thread, do
+	  not call rb_thread_restore_context()
 
-	* eval.c (rb_yield_0): should not re-submit TAG_BREAK if this
-	  yield is not break destination. [ruby-dev:23197]
+Tue May 30 23:33:41 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Sat Mar 13 14:28:16 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/mkmf.rb (create_makefile): add $(TARGET).ilk and *.pdb
+	  to cleanup files for mswin32.
 
-	* test/drb/test_drbssl.rb: rescue LoadError. (Barkport from main
-	  trunk)
+Mon May 29 10:41:10 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* test/drb/test_drbunix.rb: ditto.
+	* file.c (rb_file_s_basename): should propagate taintness.
 
-Wed Mar 10 22:28:09 2004  Minero Aoki  <aamine@loveruby.net>
+Sun May 28 21:37:13 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/fileutils.rb (remove_dir): should handle symlink correctly.
-	  This patch is contributed by Christian Loew.  [ruby-talk:94635]
-	  (Backport from main trunk)
+	* eval.c: bug fix: DLEXT2.
 
-Wed Mar 10 16:28:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun May 28 19:21:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* eval.c (return_jump): set return value to the return
-	  destination.  separated from localjump_destination().
+	* win32/win32.c: use ruby's glob.
 
-	* eval.c (break_jump): break innermost loop (or thread or proc).
+	* dir.c: "glob" exported and renamed to "rb_glob".
 
-	* eval.c (rb_yield_0): set exit_value for block break.
+	* 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".
 
-Wed Mar 10 15:58:43 2004  Ryan Davis  <ryand@zenspider.com>
+	* lib/mkmf.rb: ditto.
 
-	* eval.c (eval): Only print backtrace if generating the backtrace
-	  doesn't generate an exception.  [ruby-core:02621]
+Thu May 25 22:01:32 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Tue Mar  9 13:04:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* defines.h: mswin32: remove obsolete USHORT definition.
 
-	* io.c (rb_io_ungetc): raise IOError instead of calling
-	  rb_sys_fail().  [ruby-talk:23181]
+	* re.h: mswin32: use EXTERN instead of extern.
 
-Mon Mar  8 19:32:28 2004  akira yamada  <akira@ruby-lang.org>
+	* regex.h: mswin32: export re_mbctab properly.
 
-	* lib/uri/common.rb (URI::REGEXP::PATTERN::HOSTPORT): (?:#{PORT})
-	  -> (?::#{PORT}).  [ruby-dev:23170]
+	* win32/ruby.def: add ruby_ignorecase and regex.c's exports.
 
-Mon Mar  8 15:31:41 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu May 25 21:28:44 2000  Minero Aoki <aamine@dp.u-netsurf.ne.jp>
 
-	* dir.c (range): treat incomplete '[' as ordinary character (like
-	  has_magic does).
+	* re.c (rb_reg_expr_str): escape un-printable character.
 
-	* dir.c (range):  Cancel above change. More discussion is needed.
+Thu May 25 01:35:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Mar  7 22:37:46 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* parse.y (tokadd_escape): forgot to add `\x' to hexadecimal
+	  escape sequences.
 
-	* test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
+	* object.c (rb_obj_dup): dup for normal object (T_OBJECT) copies
+	  instance variables only.
 
-	* test/drb/ut_eval.rb: ditto.
+Wed May 24 23:49:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/drb/ut_large.rb: ditto.
+	* object.c (rb_mod_initialize): should provide initialize.
 
-	* test/drb/ut_safe1.rb: ditto.
+Wed May 24 23:17:50 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* test/drb/ut_drb_drbssl.rb: use 'drbssl://localhost:0'.
+	* win32/Makefile: remove unnecessary mv and rm command call.
 
-Sun Mar  7 16:22:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed May 24 21:01:04 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* Makefile.in (lex.c): use $? instead of $<.
+	* ext/pty/pty.c: use "" instead of <> to include ruby.h and rubyio.h
+	  for BeOS (PowerPC).
 
-Fri Mar  5 00:54:14 2004  Dave Thomas  <dave@pragprog.com>
+	* file.c (rb_find_file): should check dln_find_file() result.
 
-	* lib/test/unit.rb: MOve RDoc documentation so that you can
-	  now say 'ri Test::Unit'
+	* win32/ruby.def: add rb_block_given_p.
 
-Tue Mar  2 12:32:59 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed May 24 16:32:45 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* win32/Makefile.sub, wince/Makefile.sub (config.h): shouldn't check
-	  defined? NORETURN. [ruby-dev:23100]
+	* io.c (rb_io_popen): popen does not take 3rd argument anymore.
 
-Mon Mar  1 12:24:10 2004  Dave Thomas  <dave@pragprog.com>
+	* re.c (rb_reg_desc): re may be zero, check before dereferencing.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_alias):
-	  Allow aliases to have parentheses
+Wed May 24 16:03:06 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
 
-Sun Feb 29 23:14:53 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/cgi.rb: bug fix: CGI::escape(), CGI::Cookie::new()
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
-	  Handle :nodoc: on singleton classes.
+	* lib/net/telnet.rb: improve: binmode(), telnetmode() interface
 
-Sat Feb 28 10:58:49 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed May 24 13:12:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* MANIFEST: add test_erb.rb
+	* misc/ruby-mode.el (ruby-parse-region): support `while .. do'
+	  etc. But corresponding keywords must be at the beginning of
+	  line. 
 
-	* lib/erb.rb, test/erb/test_erb.rb: don't forget filename,
-	  if both filename and safe_level given. [ruby-dev:23050]
+Tue May 23 23:50:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Feb 27 01:00:09 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* re.c (rb_reg_initialize_m): wrong kcode value.
 
-	* lib/drb/drb.rb, test/drb/drbtest.rb: require drb/eq.rb by default
+	* re.c (rb_reg_s_new): forgot to initialize re->ptr.
 
-Wed Feb 25 21:16:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May 23 08:36:24 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* instruby.rb (with_destdir): should return the given argument if no
-	  DESTDIR is given.
+	* regex.c (re_compile_pattern): forgot to restore old option
+	  status by (?ix-ix).
 
-	* instruby.rb: use path name expansion of cmd.exe.
+	* regex.c (re_compile_fastmap): anychar may match newline if
+	  RE_OPTION_MULTILINE or RE_OPTION_POSIXLINE is set.
 
-Wed Feb 25 09:35:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon May 22 22:45:06 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* error.c (NameError::Message): new class for lazy evaluation of
-	  message to ensure replaced before marshalling. merge from HEAD.
-	  (ruby-bugs-ja:PR#588)
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.19.
 
-	* eval.c (rb_method_missing): use NameError::Message. merge from
-	  HEAD. (ruby-bugs-ja:PR#588)
+	* lib/net/http.rb: do not use Regexp "p" option.
 
-Tue Feb 24 18:59:37 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon May 22 21:56:43 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* dir.c (glob_helper): '**/' should not match leading period
-	  unless File::FNM_DOTMATCH is set. (like '*/') [ruby-dev:23014]
+	* struct.c (rb_struct_getmember): should use ID2SYM, not INT2NUM.
 
-Tue Feb 24 13:22:21 2004  Dave Thomas  <dave@pragprog.com>
+Mon May 22 15:07:37 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/rdoc.rb (RDoc::RDoc::normalized_file_list): Attempt to get better
-	  heuristics on which files to include and exclude. Now only include
-	  non-standard files if they are explicitly named in ARGV.
+	* file.c (rb_find_file): should check if the file really exists.
 
-Tue Feb 24 07:23:30 2004  Dave Thomas  <dave@pragprog.com>
+Mon May 22 09:08:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/generators/html_generator.rb: Deal with :stopdoc: when
-	  choosing a default main page to display (ie. don't select a page
-	  if we don't have documentation for it).
+	* io.c (rb_io_popen): _exit(0) after processing block under the
+	  child process.
 
-Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
+	* io.c (rb_io_popen): flush stdout/stderr before subprocess
+	  termination.
 
-	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
-	  class variables in code listings
+	* eval.c (rb_check_safe_str): insert rb_secure(4); operation
+	  requires untainted string should be prohibited in level 4.
 
-Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
+Sun May 21 21:17:00 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
-	  class variables in code listings
+	* configure.in: add Setup.dj for djgpp cross-compiling.
 
-Tue Feb 24 06:32:27 2004  Dave Thomas  <dave@pragprog.com>
+	* Setup.dj: add readline.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_aliases): Handle
-	  aliases in C files.
+	* instruby.rb: copy win32/win32.h to archlibdir on mingw32.
 
-Tue Feb 24 06:16:22 2004  Dave Thomas  <dave@pragprog.com>
+Sun May 21 20:58:08 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* lib/rdoc/rdoc.rb (RDoc::RDoc::document): Now create op dir _before_
-	  parsing files.
+	* pack.c: fix OFF16 and OFF32 definitions for Alpha and IRIX64.
 
-Tue Feb 24 06:08:47 2004  Dave Thomas  <dave@pragprog.com>
+Sun May 21 17:31:37 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_constant):
-	  Start collecting text of constant values earlier: was missing
-	  values in output if there was no space after '='
+	* instruby.rb: support "make install" for cross-compiling.
 
-Tue Feb 24 06:08:25 2004  Dave Thomas  <dave@pragprog.com>
+	* 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.
 
-	* lib/rdoc/generators/html_generator.rb: Escape contant values.
+Sat May 20 23:29:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Feb 24 03:45:06 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* dir.c (dir_s_new): does not take block; "open" does.
 
-	* ext/openssl/ossl_config.c (ossl_config_each): add new method
-	  OpenSSL::Config#each. it iterates with section name, field name
-	  and value.
+	* io.c (rb_io_s_new): ditto.
 
-	* ext/openssl/ossl_config.c (Init_ossl_config): include Enumerable.
+Fri May 19 07:44:26 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Feb 23 09:16:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c (dir_s_open): Dir#open does not returns closed Dir if a
+	  block is given to the method.
 
-	* instruby.rb (DOSISH): embedded path in batch files should not be
-	  prefixed by DESTDIR.  [ruby-core:02186]
+	* re.c (rb_reg_initialize_m): Regexp::new calls initialize now.
 
-Sun Feb 22 09:54:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* string.c (Init_String): String#delete_at removed.
 
-	* re.c: corrected documentation format (again)
+	* string.c (rb_str_aset_m): should have checked argc != 2.
 
-Sun Feb 22 09:43:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* eval.c (rb_thread_schedule): select(2) was called too many.
 
-	* re.c: corrected documentation format (rb_reg_initialize_m)
+	* regex.c (re_compile_pattern): a bug in (?m) support.  Pointed
+	  out by Dave Thomas <Dave@thomases.com>.
 
-Sat Feb 21 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu May 18 23:55:26 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* ext/zlib/zlib.c: documented, but needs more effort.
+	* 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 *'.
 
-Sat Feb 21 11:12:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* marshal.c (w_symbol, w_object): ditto.
 
-	* missing/os2.c, missing/x68.c: typo fix.  pointed out by greentea.
+	* parse.y (rb_intern): ditto.
 
-Fri Feb 20 18:59:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu May 18 18:00:35 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/irb/init.rb (IRB::IRB.parse_opts): add -I option to
-	  irb. [ruby-dev:39243]
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.18.
 
-Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/protocol.rb: Net::Version was removed.
 
-	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
-	  Support visibility modifiers for attributes
+	* lib/net/smtp.rb: use Socket.gethostname to get local host name.
 
-Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
+Thu May 18 13:34:57 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
-	  Support visibility modifiers for attributes
+	* ext/socket/socket.c (ruby_connect): should not have replaced
+	  thread_write_select() by rb_thread_fd_writable().
 
-Thu Feb 19 22:39:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu May 18 09:01:25 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* test/rinda/test_rinda.rb: DRb.start_service only once in testsuites.
-	  DRb.start_service could handle this.
+	* 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.
 
-Thu Feb 19 22:19:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* instruby.rb: no longer use libruby.so.LIB and import.h.
 
-	* lib/ostruct.rb: documented
+	* io.c: fix READ_DATA_PENDING definition for BeOS (PowerPC).
 
-Thu Feb 19 21:28:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Wed May 17 14:14:23 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/strscan/strscan.c: improved documentation
+	* re.c (rb_reg_new_1): use /m instead of /p.
 
-Thu Feb 19 03:10:52 2004  Minero Aoki  <aamine@loveruby.net>
+Wed May 17 02:22:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/strscan/strscan.c: synchronized with main trunk (rev 1.11).
+	* eval.c (rb_thread_polling): wait 0.06 second to let other
+	  processes run.
 
-Thu Feb 19 02:30:34 2004  Minero Aoki  <aamine@loveruby.net>
+	* process.c (rb_waitpid): avoid busy wait using rb_thread_polling.
 
-	* ext/strscan/strscan.c: documentation checked.
+	* file.c (rb_thread_flock): ditto.
 
-Thu Feb 19 00:11:05 2004  Dave Thomas  <dave@pragprog.com>
+	* parse.y (expr): avoid calling value_expr() twice.
 
-	* lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::handle):
-	  Strip extraneous space from filenames in :include:
+Wed May 17 00:45:57 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Wed Feb 18 22:52:00 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* io.c (rb_io_binmode): should check PLATFORMs, not O_BINARY, sigh...
 
-	* lib/drb/unix.rb: remove O_NONBLOCK, thanks \ay
+Wed May 17 00:40:15 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Wed Feb 18 22:47:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* win32/config.h: add DLEXT2, now DLEXT on mswin32 is "so".
 
-	* ext/strscan/strscan.c: documented
+	* win32/config.status: ditto.
 
-Wed Feb 18 22:03:11 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* win32/ruby.def: add symbol "rb_big_divmod".
 
-	* test/*: should not depend on $KCODE.
+Tue May 16 19:45:32 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Wed Feb 18 17:18:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* intern.h: use EXTERN instead of extern.
 
-	* ext/win32ole/win32ole.c: need to include <olectl.h> on Cygwin.
+	* 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.
 
-Wed Feb 18 10:40:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue May 16 17:00:05 2000  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
 
-	* sprintf.c (rb_f_sprintf): do not prepend dots for negative
-	  numbers if FZERO is specified.  [ruby-list:39218]
+	* eval.c (rb_thread_select): should check whether fds are null.
 
-Tue Feb 17 23:40:34 2004  Guy Decoux  <ts@moulon.inra.fr>
+Tue May 16 11:51:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* sprintf.c (rb_f_sprintf): preserve original val for
-	  format_integer. [ruby-talk:92975]
+	* io.c (pipe_open): synchronize subprocess stdout/stderr.
 
-Tue Feb 17 23:28:45 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon May 15 15:38:09 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/marshaltestlib.rb: common marshal testcase added.
+	* ruby.h: exported symbols should be for xmalloc etc. are now
+	  prefixed by 'ruby_', e.g. ruby_xmalloc().
 
-	* test/ruby/test_marshal.rb: use above testsuite.
+	* eval.c (rb_thread_select): remove busy wait for select.
 
-	* test/soap/marshal/test_marshal.rb: ditto.
+	* dir.c (glob): trailing path may be null, e.g. glob("**").
 
-	* test/soap/marshal/cmarshal.rb: removed (not used).
+Mon May 15 14:48:41 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Tue Feb 17 10:51:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* io.c (rb_io_pid): new method; returns nil if no process attached
+	  to the IO.
 
-	* ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
+Mon May 15 01:18:20 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Feb 17 01:35:28 2004  Tanaka Akira  <akr@m17n.org>
+	* io.c (rb_io_s_popen): _exit after Proc execution.
 
-	* eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
-	  to NODE_LIT.  [ruby-dev:22920]
+Sun May 14 18:05:59 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Tue Feb 17 01:24:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* Makefile.in: missing/nt.c -> win32/win32.c
 
-	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
-	  STACK_GROW_DIRECTION. [ruby-dev:22910]
+	* configure.in: bug fix; static linking on mingw32.
 
-	* bcc32/Makefile.sub (config.h): add newer checks.
+	* cygwin/GNUmakefile.in: remove VPATH.
 
-	* wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
+	* ext/extmk.rb.in: Makefile set binmode with mingw32 on cygwin32.
 
-Tue Feb 17 00:38:10 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/mkmf.rb: ditto.
 
-	* lib/rinda/tuplespace.rb: TupleSpace#initialize, stop doubling timeout
+	* win32/config.h: undef HAVE_SYS_FILE_H.
 
-Tue Feb 17 00:18:03 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun May 14 02:02:48 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* test/rinda/test_rinda.rb: import test_rinda.rb
+	* lib/irb/ruby-lex.rb: '/' should be escaped in character class.
 
-Tue Feb 17 00:14:30 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun May 14 00:54:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* bcc32/Makefile.sub: avoid warning "Redefinition of macro
-	  'HAVE_GETLOGIN'".
+	* configure.in, ...: support mingw32.
 
-	* vms/config.h_in: ditto.
+	* defines.h: ditto. undef EXTERN for tcl/tk on cygwin.
 
-Mon Feb 16 23:28:14 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/*/extconf.rb: replace PLATFORM with RUBY_PLATFORM.
 
-	* lib/csv.rb: document reduction.  [ruby-core:02429]
+	* ext/socket/sockport.h: define IN_MULTICAST for missing IN_MULTICAST.
 
-Mon Feb 16 22:08:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* ext/tcltklib/tcltklib.c: remove declaration of rb_argv0.
 
-	* lib/generator.rb: corrected doc format
-	* lib/rinda/rinda.rb: added documentation (from Hugh Sasse)
-	* lib/rinda/tuplespace.rb: ditto
+	* file.c: should check S_IXGRP, S_ISGID, not NT.
 
-Mon Feb 16 20:41:32 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* io.c (rb_io_binmode): should check _IOBIN, O_BINARY, not PLATFORMs.
 
-	* bcc32/Makefile.sub: show more warnings. (refering to mingw)
+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.
 
-	* bcc32/setup.mak: ditto.
+Thu May 11 21:19:29 2000  Hiroshi Igarashi  <iga@ruby-lang.org>
 
-Mon Feb 16 13:39:44 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* intern.h: add missing declarations of ruby API functions.
 
-	* dir.c (rb_glob, rb_globi): add const.
+	* 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.
 
-Mon Feb 16 02:16:33 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* cygwin/GNUmakefile.in: ditto.
 
-	* bcc32/Makefile.sub: should warn suspicious pointer conversion.
+	* ext/Win32API/Win32API.c: directly "call" in asm statement for
+	  gcc 2.95.x or newer.
 
-	* bcc32/setup.mak: ditto.
+Sat Apr 29 04:58:12 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Sun Feb 15 19:06:42 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* array.c (rb_ary_unshift_m): performance improvement.
 
-	* lib/rinda/tuplespace.rb: TupleSpace#read(tpl, 0), raise
-	  RequestExpiredError if not found.
+Fri Apr 28 00:19:22 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Sun Feb 15 15:56:46 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* array.c (rb_ary_unshift_m): takes items to push.
 
-	* ext/win32ole/win32ole.c: add IDispatch wrapper in val2variant.
-	  Thanks, arton.
+Wed Apr 26 15:23:02 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Feb 15 01:46:05 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* string.c (rb_str_succ): insert carrying character just before
+	  the leftmost alpha numeric character.
 
-	* lib/mkmf.rb: absolute path of ruby is assigned to $(RUBY).
-	  [ruby-dev:22870]
+	* string.c (rb_str_succ): proper behavior for "".succ and "\377".succ.
 
-Sat Feb 14 11:29:41 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* string.c (rb_str_succ): use realloc and memmove.
 
-	* sample/drb/*: import lib/drb/sample
+Tue Apr 25 18:28:45 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Sat Feb 14 11:08:23 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.16.
 
-	* lib/drb/drb.rb: add pretty_print, thanks gotoken.
+	* lib/net/smtp.rb: add SMTP AUTH
 
-Fri Feb 13 12:35:08 2004  Minero Aoki  <aamine@loveruby.net>
+Tue Apr 25 14:30:13 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/fileutils/test_fileutils.rb: File.link may raise EINVAL and
-	  EACCES on Windows.
+	* io.c (rb_io_gets_internal): shortcut when rs == rb_default_rs.
 
-Thu Feb 12 21:45:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sat Apr 22 23:14:41 2000  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
 
-	* lib/ftools.rb: documented
+	* configure.in: MacOS X support.
 
-Thu Feb 12 21:25:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sat Apr 22 16:37:10 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/base64.rb: backported from HEAD (modularised and documented)
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.15.
 
-Thu Feb 12 20:31:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/http.rb:  closing socket by watching both
+	  user header and server response
 
-	* lib/mkmf.rb (create_tmpsrc): cpp32 of Borland C++ ignores #error
-	  directives in DOS line-ending files at all.
+Fri Apr 21 21:44:34 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Thu Feb 12 02:23:56 2004  Tanaka Akira  <akr@m17n.org>
+	* io.c (rb_io_s_pipe): should set FMODE_SYNC.
 
-	* lib/pathname.rb: use assert_raise instead of assert_raises.
+Thu Apr 20 16:59:22 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* lib/pp.rb: ditto.
+	* eval.c (massign): `*lvalue = false' should assign `[false]' to
+	  lvalue.
 
-	* lib/time.rb: ditto.
+Wed Apr 19 08:35:08 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/tsort.rb: ditto.
-	  use TSortHash and TSortArray instead of Hash and Array in test.
+	* class.c (rb_singleton_class): generate singleton class for
+	  special constants: nil, true, false.
 
-Wed Feb 11 20:01:12 2004  akira yamada  <akira@ruby-lang.org>
+Wed Apr 19 02:09:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_file.rb (TestFile::test_fnmatch): added tests for
-	  File.fnmatch. [ruby-dev:22815][ruby-dev:22819]
+	* class.c (rb_singleton_class): singleton method for nil, true,
+	  false is possible now.
 
-	* test/ruby/test_proc.rb (TestProc::test_eq): added a
-	  test.  [ruby-dev:22599]
+	* eval.c (rb_eval): ditto.
 
-	* test/ruby/test_proc.rb (TestProc::test_eq): added tests for
-	   Proc#==.  [ruby-dev:22592], [ruby-dev:22601]
+Tue Apr 18 18:54:25 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Tue Feb 10 16:43:56 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.14.
 
-	* eval.c (umethod_bind): purge unused check.  [ruby-dev:22850]
+	* lib/net/http.rb: new method HTTP#head2.
 
-Mon Feb  9 17:16:00 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/net/http.rb: get2/post2 does not raise exceptions.
 
-	* lib/rdoc/parsers/parse_c.rb: escape '{' and '}' to avoid warnings.
+Mon Apr 17 15:16:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Feb  9 13:00:55 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* io.c (rb_io_close): to detect some exceptional status, writable
+	  IO should be flushed before close;
 
-	* dir.c (fnmatch): File.fnmatch('*?', 'a') should return true.
-	  [ruby-dev:22815]
+Sat Apr 15 18:29:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* dir.c (fnmatch): File.fnmatch('\[1\]' , '[1]') should return true.
-	  [ruby-dev:22819]
+	* array.c (rb_ary_collect_bang): Array#filter renamed.
 
-Sun Feb  8 16:46:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 14 19:47:11 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/pp.rb (PP::PPMethods::object_address_group): suppress negative
-	  sign for higher heap areas.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.13.
 
-Fri Feb  6 22:48:16 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/pop.rb: accept illegal timestamp
 
-	* lib/rdoc/generators/html_generator.rb (gen_url): Support
-	  https in RDoc hyperlinks
+	* lib/net/http.rb: when body was chunked, does not set Content-Length:
 
-Fri Feb  6 22:41:22 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Apr 11 21:14:42 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): rollback the previous
-	  commit.  [ruby-dev:22813]
+	* 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@.
 
-Fri Feb  6 22:22:50 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Apr 11 16:25:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): remove instance
-	  variable which is defined in the test.
+	* bignum.c (rb_big_2comp): unnecessary lvalue cast removed.
 
-Fri Feb  6 00:48:37 2004  Tanaka Akira  <akr@m17n.org>
+Tue Apr 11 02:25:53 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/prettyprint.rb (PrettyPrint#first?): obsoleted.
+	* hash.c (env_fetch): new method.
 
-Thu Feb  5 23:56:55 2004  Tanaka Akira  <akr@m17n.org>
+	* marshal.c (marshal_dump): accepts depth = nil for unlimited depth.
 
-	* lib/prettyprint.rb (PrettyPrint#seplist): added.
+Sun Apr  9 20:49:19 2000  Dave Thomas  <Dave@Thomases.com>
 
-	* lib/pp.rb (PPMethods#pp_object): use seplist.
-	  (PPMethods#pp_hash): ditto.
-	  (Array#pretty_print): ditto.
-	  (Struct#pretty_print): ditto.
-	  (MatchData#pretty_print): ditto.
+	* parse.y (str_extend): Allow class variables to be expanded.
 
-	* lib/set.rb (Set#pretty_print): use seplist.
+Fri Apr  7 02:03:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Feb  4 02:12:06 2004  Tanaka Akira  <akr@m17n.org>
+	* error.c (rb_sys_fail): escape non-printable characters.
 
-	* file.c (test_l): fix wrong method name in document.
-	  (test_S): ditto.
-	  (test_b): ditto.
-	  (test_c): ditto.
-	  (test_suid): ditto.
-	  (test_sgid): ditto.
-	  (test_sticky): ditto.
+Thu Apr  6 20:10:47 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Tue Feb  3 08:04:57 2004  Tanaka Akira  <akr@m17n.org>
+	* ext/extmk.rb.in (create_makefile): BeOS --program-suffix support.
+	* lib/mkmf.rb (create_makefile): ditto.
 
-	* lib/pp.rb (Struct#pretty_print_cycle): follow 1.8 style.
+Thu Apr  6 09:55:26 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Mon Feb  2 19:33:49 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* error.c (rb_sys_fail): need rb_exc_new2() call on BeOS.
 
-	* configure.in: backport from 1.9 for Interix.
+Mon Apr  3 17:22:27 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* dln.c (dln_load): ditto.
+	* io.c (rb_io_reopen): support tempfile.
 
-Mon Feb  2 13:31:51 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (catch_i): should supply argument.
 
-	* lib/net/http.rb (canonical_each): fix merge miss.
+Sat Apr  1 22:50:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Feb  2 01:54:00 2004  Tanaka Akira  <akr@m17n.org>
+	* marshal.c (r_object): wrong symbol restoration.
 
-	* lib/pp.rb (Struct#pretty_print): make it 1.8 style.
-	  (Numeric#pretty_print, FalseClass#pretty_print)
-	  (TrueClass#pretty_print, Module#pretty_print): fix pp for objects
-	  with instance variables.  [ruby-talk:91157]
+Sat Apr  1 21:30:53 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/open-uri.rb (URI::Generic#find_proxy): return nil on loopback
-	  address.
+	* io.c (rb_io_printf, rb_f_printf): should use rb_io_write.
 
-	* lib/resolv-replace.rb (BasicSocket#send): don't replace because
-	  it has no hostname argument.
-	  (IPSocket.getaddress): raise SocketError instead of
-	  Resolv::ResolvError for errors.
-	  (TCPSocket#initialize, UDPSocket#bind, UDPSocket#connect)
-	  (SOCKSSocket#initialize): use IPSocket.getaddress instead of
-	  Resolv.getaddress.
-	  (UDPSocket#send): recognize 3 arguments form.  try all addresses on
-	  4 arguments form.
+Sat Apr  1 00:16:05 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Feb  1 18:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* gc.c (rb_gc_call_finalizer_at_exit): should be clear flags
+	  before calling finalizers.
 
-	* lib/net/http.rb: merged coding style changes from HEAD.
+	* eval.c (specific_eval): can be called without SecurityError, if
+	  $SAFE >= 4.
 
-Sun Feb  1 16:15:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* object.c (sym_inspect): inspect gives ":sym", to_s gives "sym".
 
-	* lib/test/unit.rb: rearranged documentation for RDoc's sake.
-	* lib/matrix.rb: improved documentation.
-	* lib/net/http.rb: slight documentation formatting improvement.
+Fri Mar 31 22:07:04 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Sun Feb  1 05:30:06 2004  Tanaka Akira  <akr@m17n.org>
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.12.
 
-	* lib/open-uri.rb (URI::Generic#find_proxy): warn HTTP_PROXY.
-	 raise an errror on non-http proxy URI.
-	 (OpenURI::Buffer#<<): make a tempfile binmode.  [ruby-talk:90793]
+	* lib/net/protocol.rb:  update Net::Protocol::Proxy#connect
 
-Sat Jan 31 09:20:32 2004  NAKAMURA, Hiroshi  <nakahiro@sairon.co.jp>
+	* lib/net/protocol.rb:  ReplyCode is not a class
 
-	* sample/openssl/gen_csr.rb: wrong usage string.
+	* lib/net/http.rb: header value format was change:
+	  values do not include header name
 
-Sat Jan 31 01:00:32 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/net/http.rb: header is not a Hash, but HTTPResponse
 
-	* lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
-	  "parts" attribute of soap:body element in WSDL.
+Thu Mar 30 12:19:44 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* lib/wsdl/xmlSchema/schema.rb: friendly warning message for
-	  simpleType element which is not supported for now.
+	* enum.c (enum_find): rb_eval_cmd() should be called with array.
 
-	* lib/soap/mapping/factory.rb: deleted unused methods.
+Tue Mar 28 13:57:05 2000  Clemens Hintze  <c.hintze@gmx.net>
 
-	* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
-	  string <-> Ruby class name matching.
+	* ext/dbm/dbm.c (fdbm_invert): should return new hash.
 
-	* test/wsdl/soap/{soapbodyparts.wsdl,test_soapbodyparts.wsdl}: new
-	  files.
+	* ext/gdbm/gdbm.c (fgdbm_invert): ditto.
 
-Thu Jan 29 23:56:00 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Tue Mar 28 00:58:03 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* util.c (mblen): fix overrun.  [ruby-dev:22672]
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.11.
 
-Thu Jan 29 22:41:53 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: does not
+	  dispatch any commands while dispatching command.
 
-	* lib/rdoc/generators/html_generator.rb: Allow 'link:' in Tidylinks.
-	  THis means you can write "see f1[link:files/f1_rb.html]".
+	* lib/net/protocol.rb: failed to get error class of
+	  inherited ReplyCode
 
-Thu Jan 29 15:33:23 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/net/http.rb: change feature of "get2", "post2"
 
-	* ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change
-	  second argument. it expected to be a Hash not an Integer.
+Mon Mar 27 01:34:58 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): add new
-	  function for OpenSSL::X509::Name#add_entry.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.10.
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): append ASN.1
-	  tag number to each element of return value.
+	* lib/net/http.rb: return value of 'head' was wrong.
 
-	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): add constants
-	  OpenSSL::X509::Name::DEFAULT_OBJECT_TYPE and OBJECT_TYPE_TEMPLATE.
+Sun Mar 26 17:47:35 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#initialize):
-	  second argument takes OBJECT_TYPE_TEMPLATE by default.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.9.
 
-	* sample/openssl/gen_csr.rb: use OpenSSL::X509::Name.parse.
+	* lib/net/smtp.rb: SMTP#do_ready wrongly took no arguments
 
-Wed Jan 28 04:29:41 2004  Eric Schwartz  <emschwar@fc.hp.com>
+Sat Mar 25 23:21:10 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/cgi/session.rb: use LOCK_SH to read, and a few other
-	  improvements.  [ruby-core:02328]
+	* marshal.c (w_object): symbols should be converted to ID before
+	  dumping out.
 
-Tue Jan 27 11:09:29 2004  FUKUMOTO Atsushi  <fukumoto@nospam.imasy.or.jp>
+Fri Mar 24 18:26:51 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/socket/socket.c (s_recvfrom): sending length should be an
-	  invariant while retrying on EAGAIN.  [ruby-talk:89962]
+	* file.c (test_check): should have checked exact number of arguments.
 
-Tue Jan 27 10:35:18 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Mar 24 21:02:11 2000  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* ext/win32ole/win32ole.c (set_argv): fix condition.
+	* signal.c (trap): should treat some symbols as the signal.
 
-Tue Jan 27 02:26:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Mar 24 06:58:03 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/webrick/httputils.rb (WEBrick:HTTPUtils::parse_header):
-	  refine regex for header-name.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.8.
 
-Tue Jan 27 00:30:11 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/net/http.rb:  post, get2, post2, get_body
 
-	* win32/Makefile.sub: rollback.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: separate
+	  Command/Socket documentation.
 
-Mon Jan 26 22:53:04 2004  Dave Thomas  <dave@pragprog.com>
+Thu Mar 23 02:26:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c: Remove documentation references to $defout.
+	* io.c (rb_io_fptr_finalize): fptr may be null.
 
-Mon Jan 26 15:11:47 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* io.c (rb_io_s_new): now calls `initialize'.
 
-	* sample/exyacc.rb: escape '}' to avoid warning.
+	* io.c (rb_io_initialize): actual open done in this method.
 
-Mon Jan 26 14:41:46 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_file_initialize): ditto.
 
-	* lib/delegate.rb (Delegator::initialize): preserve
-	  singleton_method_added method [ruby-dev:22685]
+	* eval.c (rb_eval): class variables in singleton class definition
+	  is now handled properly (I hope).
 
-	* lib/delegate.rb (Delegator::initialize): use Kernel::raise
-	  instead of mere raise.  [ruby-dev:22681]
+Wed Mar 22 21:49:36 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Mon Jan 26 12:47:17 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* st.c (st_delete_safe): skip already deleted entry.
 
-	* ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7
+	* hash.c (rb_hash_delete): modify brace miss.
 
-Mon Jan 26 11:35:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 22 08:53:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/extmk.rb: Makefiles should depend on also rbconfig.rb.
-	  (ruby-bugs:PR#1256)
+	* eval.c (exec_under): do not push cbase if ruby_cbase == under.
 
-	* ext/win32ole/win32ole.c (set_argv): set real arguments to
-	  WIN32OLE::ARGV.  [ruby-list:39073]
+	* node.h (NEW_CREF0): preserve cbase nesting.
 
-Thu Jan 22 22:54:53 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Mar 21 12:57:50 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/net/imap.rb (BEG_REGEXP): allow 8-bit characters in quoted
-	  strings for Novell GroupWise Internet Agent.
-	* lib/net/imap.rb (DATA_REGEXP): ditto.
+	* object.c (rb_class_s_new): Class::new should call `inherited'.
 
-Thu Jan 22 16:21:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Mar 18 12:36:09 2000  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-	* parse.y (string_content): reset lexical states at the beginning of
-	  string contents.  [ruby-list:39061]
+	* eval.c (rb_backtrace, make_backtrace): removed unused variable
+	  `lev'.
 
-Wed Jan 21 21:55:51 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* eval.c (rb_attr): calls `method_added' at attribute definition.
 
-	* lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
-	* lib/drb/extserv.rb: typo
+	* eval.c (rb_mod_modfunc): calls `singleton_method_added' while
+	  `module_function'.
 
-Wed Jan 21 17:57:56 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* eval.c (rb_eval): parameter to `method_added' and
+	  `singleton_method_added' is Symbol.
 
-	* lib/net/imap.rb (envelope): allow NIL.
-	* lib/net/imap.rb (body): ditto.
-	* lib/net/imap.rb (number): ditto.
-	* lib/net/imap.rb (ensure_nz_number): show a detailed error
-	  message.
+	* eval.c (Init_eval): caches IDs for `method_added' and
+	  `singleton_method_added'.
 
-Wed Jan 21 16:44:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Mar 18 11:25:10 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/mkmf.rb (merge_libs): squeeze successive same libraries.
-	  [ruby-dev:22652]
+	* parse.y (rescue): allows `rescue Error in foo'.  experimental.
+	  which is better this or preparing alias `exception' for `$!'?
 
-Wed Jan 21 16:01:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Mar 17 15:02:45 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/digest/rmd160/extconf.rb: have_library appends found library.
+	* variable.c (rb_autoload_id): defining new autoload should be
+	  prohibited for $SAFE > 4.
 
-Wed Jan 21 11:36:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* variable.c (rb_autoload_load): autoload should be possible for
+	  $SAFE > 4.
 
-	* parse.y (block_append): update nd_end for "real" head node.
-	  [ruby-list:39058]
+	* eval.c (call_trace_func): should handle T_ICLASS properly.
 
-Tue Jan 20 14:48:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Mar 17 14:34:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/extconf.rb: should check <openssl/conf_api.h> instead
-	  of OPENSSL_VERSION_NUMBER. [ruby-list:39056]
+	* string.c (str_gsub): forgot to initialize str->orig.
 
-Tue Jan 20 14:43:17 2004  Dave Thomas  <dave@pragprog.com>
+Fri Mar 17 01:24:59 2000  Dave Thomas  <Dave@thomases.com>
 
-	* lib/base64.rb: Add RDoc
+	* string.c (rb_str_clone): forgot to copy str->orig if STR_NO_ORIG
+	  is set by Array#pack.
 
-Tue Jan 20 14:25:51 2004  Dave Thomas  <dave@pragprog.com>
+Wed Mar 15 21:25:04 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/abbrev.rb: Add RDoc
+	* array.c (rb_ary_join): 'result' is always duplicated
+	  before concat string.
 
-Tue Jan 20 13:22:39 2004  Dave Thomas  <dave@pragprog.com>
+Wed Mar 15 17:26:05 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/generators/html_generator.rb: Document aliases at
-	  top-most level.
+	* hash.c (rb_hash_s_create): unexpected recursive call removed.
+	  this bug was found by Satoshi Nojo <nojo@t-samukawa.or.jp>.
 
-	* lib/English.rb: Document English.rb.
+Wed Mar 15 13:12:39 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Jan 20 02:49:22 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (Init_Thread): Thread.join removed finally.
 
-	* ext/openssl/extconf.rb: add check for OpenSSL version.
-	  [ruby-list:39054]
+	* string.c (rb_str_chomp_bang): forgot to call rb_str_modify().
 
-Tue Jan 20 02:38:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Mar 13 16:12:13 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (w_class): should not dump singleton class.
-	  [ruby-dev:22631]
+	* eval.c (block_pass): distinguish real orphan block and still
+	  on-stack block passed by block argument.
 
-Tue Jan 20 01:31:36 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Mon Mar 13 00:20:25 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c (lineno): typo fix(FIX2INT -> INT2FIX).
+	* 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>.
 
-Mon Jan 19 21:53:38 2004  akira yamada  <akira@ruby-lang.org>
+	* eval.c (rb_f_raise): proper error message when the first
+	  argument is not an exception class/object.
 
-	* io.c, re.c, string.c, time.c: fixed up positions of RDocs.
+	* string.c (rb_str_dup): dup now postpone buffer copy as long as
+	  possible.  performance improved by lazy copying.
 
-Mon Jan 19 07:09:20 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Mar 12 13:58:52 2000  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/date.rb: zone was wrong when it was behind UTC.
-	  Thanks Mark J. Reed.
+	* signal.c (rb_f_kill): should treat some symbols as the signal.
 
-	* lib/date/format.rb: %z is now always replaced by four digits
-	  with a leading plus or minus sign.
+Sat Mar 11 22:03:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* sample/cal.rb: added a class, anyway.
+	* string.c (rb_str_gsub): performance tune by avoiding buffer copy.
 
-Sun Jan 18 20:47:35 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (rb_f_missing): check if argv[0] is ID.
 
-	* ruby.c: use translate_char() on Cygwin.
+Sat Mar 11 15:49:41 2000  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Sun Jan 18 02:33:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* struct.c (rb_struct_aref): struct aref by symbol.
 
-	* defines.h (_WIN32): undef _WIN32 on Cygwin before defining DOSISH.
+Sat Mar 11 05:07:11 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Jan 18 00:23:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (proc_setpriority): should return 0, not nil.
 
-	* marshal.c (class2path): check anonymous class/module before
-	  checking referable, and allow singleton classes.
+	* process.c (proc_setpgid): ditto.
 
-Fri Jan 16 14:33:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Mar 10 18:14:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (class2path): get class path and check referable.
-	  [ruby-dev:22588]
+	* file.c (path_check_1): confusing buf and path.  this bug found
+	  by <decoux@moulon.inra.fr>.
 
-Fri Jan 16 09:52:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Mar 10 09:37:49 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* eval.c (proc_eq): Proc with empty body may not be equal.
-	  [ruby-dev:22590]
+	* 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 Jan 15 13:03:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar  9 11:13:32 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c (argf_read): do not append EOF.  (ruby-bugs-ja:PR#585)
+	* regex.c (re_compile_fastmap): fixed embarrassing brace bug.
 
-	* io.c (rb_io_fwrite): ad-hockery hack to get rid of HP-UX stdio
-	  weird behavior.  [ruby-dev:22424]
+Thu Mar  9 01:36:32 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Wed Jan 14 13:31:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* missing/flock.c: emulate missing flock() with fcntl().
 
-	* ext/iconv/extconf.rb: wrapper iconv.rb is dependent on platform.
+Thu Mar  9 00:29:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Jan 13 18:54:28 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* object.c (sym_to_s): returns ":sym".
 
-	* lib/logger.rb(Logger#msg2str): no special treatment for the object
-	  which responds to :to_str.  commited at 2004-01-11T21:46:27 by
-	  gsinclair.
+	* object.c (sym_id2name): separated from to_s; returns "sym".
 
-	* lib/logger.rb(LogDevice#initialize): remove type checking if the
-	  given object is a String.  Kernel.open handles it correctly.
-	  commited at 2004-01-11T21:46:27 by gsinclair.
+Wed Mar  8 19:16:19 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* test/logger/test_logger.rb: follow above change (ArgumentError ->
-	  TypeError.)  follow above commit.
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.7.
 
-Tue Jan 13 14:27:13 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* lib/net/http.rb (connecting): returns header
 
-	* lib/test/unit/ui/testrunnerutilities.rb (TestRunnerUtilities):
-	  moved run method which allows output level.  [ruby-dev:22554]
+Wed Mar  8 02:08:43 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Jan 13 04:29:52 2004  Dave Thomas  <dave@pragprog.com>
+	* parse.y: escape expansion too early.
 
-	* lib/rdoc/ri/ri_driver.rb (RiDriver::report_method_stuff):
-	  Show fully-qualified class names in class list.
+	* string.c (rb_f_scan): Kernel#scan added.
 
-Tue Jan 13 01:04:37 2004  Dave Thomas  <dave@pragprog.com>
+	* regex.c (re_compile_pattern): support \cX et al.
 
-	* lib/rdoc/ri/ri_paths.rb (RI::Paths): First attempt at
-	  incorporating DESTDIR in the rdoc installation.
+Tue Mar  7 01:44:27 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Jan 12 23:27:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (set_stdin): simplified procedure, allows $stdin = DATA;
+	  experimental.
 
-	* parse.y (primary): fix position after FCALL.  [ruby-dev:22574]
+	* io.c (set_outfile): ditto.
 
-Mon Jan 12 12:07:22 2004  Dave Thomas  <dave@pragprog.com>
+	* re.c (Init_Regexp): new method Regexp#last_match added; it's an
+	  alternative for $~.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods):
-	  Someone changed the "// in eval.c" comments to "/*...*/" style,
-	  so the parsing of the source file name broke.
+	* configure.in (DEFAULT_KCODE): KCODE_NONE should be the default.
 
-	* object.c: Remove spurious space in TrueClass documentation.
+	* dir.c (dir_s_rmdir): should return 0 on success.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Fix
-	  bad regexp: if the code before a documented method contained
-	  a comment that wasn't terminated by whitespace, that comment
-	  and all intervening code was included in the following
-	  method's documentation.
+	* signal.c: remove CWGUSI support.
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
-	  HTML formats need explicit line breaks.
+Mon Mar  6 12:28:37 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Jan 12 11:46:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* marshal.c (w_symbol): support symbol object.
 
-	* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
-	  quotes.  [ruby-dev:22564]
+	* util.c: make symbol as separated class.
 
-	* lib/mkmf.rb (libpathflag): do not enclose with quotes always.
+	* error.c (Init_Exception): new exception RangeError.
 
-	* {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
+	* ext/socket/socket.c (ip_addrsetup): should check length of hostname.
 
-Mon Jan 12 02:24:07 2004  Dave Thomas  <dave@pragprog.com>
+	* ext/socket/socket.c (ip_addrsetup): check newline at the end of
+	  hostname.  These fixes suggested by Muvaw Pnazte <bugathlon@yahoo.com>.
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
-	  generation support to ri (Elliot Hughes)
+Sun Mar  5 20:35:45 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Mon Jan 12 02:24:07 2004  Dave Thomas  <dave@pragprog.com>
+	* ext/Win32API/Win32API.c (Win32API_initialize): should call
+	  LoadLibrary() everytime and should assign the hdll to Win32API
+	  object(protect the hdll from GC).
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
-	  generation support to ri (Elliot Hughes)
+Sun Mar  5 18:49:06 2000  Nakada.Nobuyoshi  <nobu.nokada@softhome.net>
 
-Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
+	* misc/ruby-mode.el (ruby-parse-region): not treat method `begin'
+	  and `end' as reserved words.
 
-	* lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
-	  Also accept command line options via the 'RI' environment variable.
+	* misc/ruby-mode.el (ruby-font-lock-docs): ignore after `=begin'
+	  and `=end'.
 
-Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
+	* misc/ruby-mode.el (ruby-font-lock-keywords, hilit-set-mode-patterns):
+	  added `yield' to keywords.
 
-	* lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
-	  Also accept command line options via the 'RI' environment variable.
+	* misc/ruby-mode.el (ruby-font-lock-keywords, hilit-set-mode-patterns):
+	  matches keywords at end of buffer.
 
-Sat Jan 10 21:27:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Mar  5 18:08:53 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* eval.c (eval): need to add message delimiter. [ruby-dev:22561]
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.6.
 
-Sat Jan 10 01:54:50 2004  Eric Sunshine  <sunshine@sunshineco.com>
+	* lib/net/http.rb:  allow to omit 'start'
 
-	* defines.h (__NeXT__): Ensure that all standard S_IRUSR, S_IWGRP,
-	  S_IRWXO, etc. macros are defined since future code might require
-	  them (even though present code only requires a subset).
+Tue Feb 29 01:08:26 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* defines.h (__NeXT__): Bug fix: WORDS_BIGENDIAN was not being set
-	  correctly on Rhapsody when -arch compiler flag was used (via
-	  configure's --enable-fat-binary option).
+	* range.c (range_initialize): initialization done in `initialize';
+	  `initialize' should not be called more than once.
 
-Fri Jan  9 10:05:14 2004  Siena.  <siena@faculty.chiba-u.jp>
+	* object.c (Init_Object): default `initialize' should take zero
+	  argument.
 
-	* lib/mkmf.rb (libpathflag): use single quotes.  [ruby-dev:22440]
+	* time.c (time_s_new): call `initialize' in Time::new.
 
-Thu Jan  8 23:49:21 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Feb 26 22:39:31 2000  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* configure.in (RDOCTARGET): new macro.  if you want to install
-	  rdoc documentation, you need to run configure with
-	  --enable-install-doc.
+	* string.c (rb_str_times): fix String#* with huge string.
 
-Thu Jan  8 21:29:43 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Feb 26 00:14:59 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_pkey.c (ossl_pkey_to_der): removed; it returns
-	  public key only.
+	* dir.c (dir_s_new): call `initialize' in Dir::new.
 
-	* ext/openssl/ossl_pkey_dh.c (ossl_dh_to_der): new function for
-	  OpenSSL::PKey::DH#to_der.
+Fri Feb 25 23:01:49 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_to_der): new function for
-	  OpenSSL::PKey::DSA#to_der.
+	* ruby.h: export ruby_safe_level by EXTERN for mswin32.
+	* win32/ruby.def: regular maintenance.
 
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_to_der): new function for
-	  OpenSSL::PKey::RSA#to_der.
+Fri Feb 25 22:12:46 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Jan  8 16:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* io.c (rb_io_reopen): IO#reopen should accept path as well.
 
-	* test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which
-	  dumps "E" at month-end.
+	* string.c (rb_str_s_new): call `initialize' in String::new.
 
-Thu Jan  8 11:20:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* hash.c (rb_hash_s_new): call `initialize' in Hash::new.
 
-	* eval.c, object.c, process.c, re.c: don't use C++ style comments.
+	* array.c (rb_ary_s_new): call `initialize' in Array::new.
 
-Thu Jan  8 04:36:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Feb 25 12:50:20 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/cgi.rb (WEBrick::CGI#initialize): should create
-	  @config[:Logger] if it was not given.
+	* eval.c (rb_thread_start_timer): interval changed to 10ms from 50ms.
 
-	* sample/webrick/*: new files.
+Fri Feb 25 06:42:26 2000  GOTOU YUUZOU  <gotoyuzo@notwork.org>
 
-	* MANIFEST: add sample/webrick/*
+	* ext/socket/socket.c (ip_addrsetup): hostp should remain NULL if
+	  host is nil.
 
-Wed Jan  7 13:00:18 2004  Dave Thomas  <dave@pragprog.com>
+Thu Feb 24 16:53:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/ri/ri_driver.rb: Fix problem where ri was
-	  being too eager to find matches of ambiguous method
-	  names (such as "ri Thread.join" would return both
-	  Thread.join and ThreadsWait.join)
+	* eval.c (rb_thread_schedule): priority check for sleep expired
+	  threads needed.
 
-Wed Jan  7 12:35:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Feb 23 14:22:32 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/debug.rb: revert command parse regexps.  [ruby-list:39014] by
-	  Shirai,Kaoru.
+	* array.c (rb_ary_join): forgot to initialize a local variable
+	  `taint'.
 
-Wed Jan  7 08:21:04 2004  Dave Thomas  <dave@pragprog.com>
+Tue Feb 22 07:40:55 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/parsers/parserfactory.rb: Check for shebang
-	  line in files that would otherwise be treated as
-	  plain text.
+	* re.c (Init_Regexp): renamed to MatchData, old name MatchingData
+	  remain as alias.
 
-Tue Jan  6 22:13:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Feb 22 00:20:21 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* eval.c (rb_mod_modfunc): should break if m has no super class.
-	  [ruby-dev:22498]
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.5.
 
-Tue Jan  6 21:55:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/session.rb: rename to protocol.rb
 
-	* io.c (fptr_finalize): should save errno just after failure.
-	  [ruby-dev:22492]
+	* lib/net/protocol.rb: ProtocolSocket -> Net::Socket
 
-Tue Jan  6 14:53:14 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/protocol.rb: Net::Socket#write, write_pendstr
+	  can take block
 
-	* bin/ri: split out the display side, making it pluggable. Added
-	  new ri_driver and ri_display files in lib/rdoc/ri.
+	* lib/net/smtp.rb: new methods SMTP#ready SMTPCommand#write_mail
 
-Tue Jan  6 06:37:53 2004  Dave Thomas  <dave@pragprog.com>
+	* lib/net/pop.rb: POPMail#pop can take block
 
-	* bin/rdoc: Add --ri-system switch
+Sat Feb 19 23:58:51 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/.document: Update with list of files that seem to have
-	  documentation
+	* regex.c (re_match): pop_loop should not pop at forward jump.
 
-	* lib/test/unit.rb: Reorder comment to make it RDoc friendly.
+Fri Feb 18 17:15:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* Makefile.in: add install-nodoc target, and make it
-	  generate RDoc on default install.
+	* eval.c (method_clone): method objects are now clonable.
 
-	* lib/rdoc/ri/ri_options.rb (RI::Options::parse): Add
-	  --doc-dir option to ri.
+Fri Feb 18 00:27:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Jan  6 00:04:40 2004  Dave Thomas  <dave@pragprog.com>
+	* variable.c (rb_shared_variable_declare): shared variable (aka
+	  class/module variable) introduced.  prefix `@@'. experimental.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
-	  fix parsing if there are braces in a method parameter list
+	* class.c (rb_scan_args): new format char '&'.
 
-Fri Jan  2 14:54:11 2004  Dave Thomas  <dave@pragprog.com>
+Thu Feb 17 19:09:05 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* bin/ri: Add new --classes option, and arrange for
-	  help messages to be paged too.
+	* 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.
 
-	* bin/rdoc: Add statistics.
+Wed Feb 16 00:32:49 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* process.c: (MG) Added Process documentation
+	* eval.c (method_arity): nd_rest is -1 for no rest argument.
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::AttributeFormatter::wrap):
-	  Fix problem with labels not displaying in RI labeled
-	  lists using BS and ANSI modes.
+	* process.c (proc_waitpid): returns nil when waitpid(2) returns 0.
 
-Fri Jan  2 01:50:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Feb 15 01:47:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c (argf_eof): ARGF.eof? should not have any side effect.
-	  [ruby-dev:22469]
+	* process.c (rb_f_waitpid): pid_t should be signed.
 
-Wed Dec 31 17:25:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Feb 14 13:59:01 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c (argf_each_byte): should return self.  [ruby-dev:22465]
+	* parse.y (yylex): yylex yields wrong tokens for `:foo=~expr'.
 
-Wed Dec 31 11:20:34 2003  Dave Thomas  <dave@pragprog.com>
+	* ruby.c (load_file): exit if reading file is empty.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Make
-	  file referenced in "// in sss.c" relative to current file.
+Mon Feb 14 03:34:52 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Dec 31 11:17:37 2003  Dave Thomas  <dave@pragprog.com>
+	* parse.y (yylex): `foo.bar=1' should be <foo><.><bar><=><1>,
+	  not <foo><.><bar=><1>.
 
-	* lib/rdoc/generators/html_generator.rb: Fix problem when
-	  a public method was aliased, but the alias is then
-	  made private, and hence doesn't appear in RDoc output.
+	* eval.c (rb_thread_restore_context): process according to
+	  RESTORE_* is moved after longjmp().
 
-Wed Dec 31 01:33:05 2003  Dave Thomas  <dave@pragprog.com>
+	* eval.c (thread_switch): new function to process RESTORE_*.
 
-	* array.c, error.c, eval.c, io.c, prec.c, range.c, re.c,
-	  string.c, time.c: Add RDoc for Kernel functions, and tidy.
+Sun Feb 13 16:19:49 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Tue Dec 30 19:39:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.c (require_libraries): don't access freed memory.
 
-	* io.c (rb_f_readline): should raise EOFError at the end of
-	  files.  [ruby-dev:22458]
+	* ruby.c (add_modules): ditto.
 
-	* io.c (argf_read): should concatenate input files when length
-	  argument is nil. [ruby-dev:22450]
+Fri Feb 11 12:06:22 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c (argf_read): should update supplied string buffer (2nd
-	  argument) even when IO#read is called multiple times.
+	* parse.y (parse_quotedwords): %w() need to split not only by mere
+	  spaces, but by all whitespaces.
 
-	* io.c: should initialize lineno by zero. [ruby-dev:22460]
+Thu Feb 10 02:12:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Dec 30 12:30:30 2003  Dave Thomas  <dave@pragprog.com>
+	* string.c (rb_str_index_m): did not support negative offset.
 
-	* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): If a
-	  class and a method have the same name, finding Xxx.abc was trying
-	  to find 'abc' in method 'Xxx', not class 'Xxx'.
+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.
 
-Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
+Wed Feb  9 16:30:41 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
-	  Handle undoing nesting of yield parameters correctly for:
+	* numeric.c (num_coerce): should return [y, x].
 
-	  def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end
+Wed Feb  9 11:07:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
+	* ruby.c (ruby_prog_init): loadpath structure changed.
 
-Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
+Tue Feb  8 02:07:33 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
-	  Handle undoing nesting of yield parameters correctly for:
+	* regex.c (re_search): optimize for \G at top.
 
-	    def each_entry(&block) Dir.foreach(@path) {|f| yield Pathname.new(f) } end
+	* regex.c (re_compile_pattern): \G introduced.
 
-Mon Dec 29 12:51:02 2003  Dave Thomas  <dave@pragprog.com>
+	* regex.c (re_match): ditto.
 
-	* eval.c: Add RDoc for Kernel global functions.
+	* string.c (str_sub_bang): old behavior restored: bang method
+	  returns nil if string not changed.
 
-Mon Dec 29 11:00:16 2003  Dave Thomas  <dave@pragprog.com>
+	* regex.c (re_compile_pattern): support independent subexpression
+	  `(?>pattern)'. 
 
-	* array.c: Tidy up RDoc loose ends.
+	* regex.c (re_match): ditto.
 
-Mon Dec 29 05:05:51 2003  Dave Thomas  <dave@pragprog.com>
+Mon Feb  7 15:51:08 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* struct.c, random: Add RDoc comments
+	* regex.c (re_match): now understands interrupts under Ruby.
 
-Mon Dec 29 02:20:54 2003  Dave Thomas  <dave@pragprog.com>
+Mon Feb  7 07:51:52 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c: Add RDoc for class Proc, Method, UnboundMethod
+	* array.c (rb_ary_uniq_bang): always return an Array.
 
-Mon Dec 29 00:41:44 2003  Dave Thomas  <dave@pragprog.com>
+	* array.c (rb_ary_compact_bang): ditto.
 
-	* math.c: Add RDoc comments
+	* array.c (rb_ary_flatten_bang): ditto.
 
-Sun Dec 28 20:19:11 2003  Tanaka Akira  <akr@m17n.org>
+	* hash.c (rb_hash_reject): returns a Hash, not an Array.
 
-	* ext/stringio/stringio.c (strio_sysread): StringIO.new.sysread didn't
-	  raise EOFError.
+	* hash.c (env_reject): ditto.
 
-	* ext/zlib/zlib.c (gzreader_gets): don't increment lineno when
-	  gzfile_read_all returns "".
+Fri Feb  4 10:20:25 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Dec 28 15:25:08 2003  Dave Thomas  <dave@pragprog.com>
+	* string.c (scan_once): scan now leaves information about the last
+	  successful pattern match in $&.
 
-	* class.c,object.c,parse.y,sprintf.c,variable.c: Document classes
-	  Object, Module, etc...
+	* io.c (rb_io_close): should not check closed IO.
 
-Sun Dec 28 11:55:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Feb  4 05:44:01 2000  Kentaro Inagaki  <inagaki@tg.rim.or.jp>
 
-	* test/csv/test_csv.rb: generate bom.csv and mac.csv files on the fly.
-	  [ruby-talk:88852]
+	* ext/socket/socket.c (s_recv): TRAP_BEG after retry entry.
 
-	* test/csv/{bom.csv,mac.csv}: removed.
+Wed Feb  2 22:33:45 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Sun Dec 28 08:56:51 2003  Dave Thomas  <dave@pragprog.com>
+	* eval.c (rb_thread_start): receives argument from outside, like
+	  `Thread::start(1,2,3){|a,b,c| ... }'.
 
-	* eval.c: Thead[Group] RDoc (thanks to MG)
+Wed Feb  2 22:14:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Dec 28 03:50:05 2003  Dave Thomas  <dave@pragprog.com>
+	* re.c (rb_reg_regsub): should check regs->num_regs.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_override_comment):
-	  Escape method names used in regexp
+	* re.c (rb_reg_search): remove matchcache, use static struct
+	  re_register instead. 
 
-Sun Dec 28 01:46:02 2003  Dave Thomas  <dave@pragprog.com>
+	* re.c (match_getter): avoid cloning match data.
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
-	  Add support for rules in 'ri' output.
+Wed Feb  2 17:12:15 2000  Dave Thomas  <Dave@Thomases.com>
 
-Sun Dec 28 01:35:35 2003  Dave Thomas  <dave@pragprog.com>
+	* samples/eval.rb: Rescue new ScriptError exception
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body):
-	  Sometimes the Ruby source aliases two otherwise
-	  unrelated methods (for example Kernel#object_id and
-	  Kernel#hash are both the same C function). Provide a
-	  facility to allow the methods to be documented
-	  separately.
+Wed Feb  2 02:06:07 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Dec 28 01:05:31 2003  Dave Thomas  <dave@pragprog.com>
+	* string.c (str_gsub_bang): gsub! now leaves information about the
+	  last successful pattern match in $&.
 
-	* marshal.c, signal.c: RDoc collemts added by Elliott Hughes
+Mon Jan 31 15:24:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Dec 28 00:48:47 2003  Dave Thomas  <dave@pragprog.com>
+	* string.c (str_sub_bang): bang method returns string always.
+	  experimental.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_class_comment):
-	  Some source files use lower case class or module names
-	  when naming the Init_XXX function in C.
+Sun Jan 30 17:58:09 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Sat Dec 27 23:41:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c: arrange to use setitimer(2) for BOW, DJGPP
 
-	* configure.in: fix "test: too many arguments" error.
+	* defines.h: ditto. use random(3) on cygwin b20.1.
 
-Sat Dec 27 15:32:19 2003  Dave Thomas  <dave@wireless_3.local.thomases.com>
+Sun Jan 30 17:20:16 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* time.c: RDoc comments added
+	* eval.c: use getrlimit(2) on DJGPP.
 
-Sat Dec 27 15:07:57 2003  Dave Thomas  <dave@pragprog.com>
+Thu Jan 27 01:27:10 2000  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
 
-	* object.c: Add RDoc comments for Symbol class.
+	* dir.c (glob): glob pattern "/*" did not match.
 
-Sat Dec 27 14:42:30 2003  Dave Thomas  <dave@pragprog.com>
+Wed Jan 26 22:30:47 2000  Shigeo Kobayashi  <shigeo@tinyforest.gr.jp>
 
-	* numeric.c: Add RDoc comments.
+	* numeric.c (flo_modulo): wrong result for negative modulo.
 
-Sat Dec 27 00:44:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jan 26 02:01:57 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c (next_argv): warn always for stdin on inplace edit mode.
+	* file.c (test_c): should use S_ISCHR.
 
-	* io.c (read_all): need to check string value.
+	* file.c (rb_stat_c): ditto.
 
-	* io.c (argf_read): allow ARGF.read(nil).  [ruby-dev:22433]
+	* string.c (rb_str_each_line): should propagate tainting.
 
-Fri Dec 26 23:02:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jan 25 04:01:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c (rb_f_backquote): need not to check nil result.
-	  [ruby-core:02078]
+	* object.c (rb_obj_freeze): all objects made freezable.
 
-	* io.c (rb_io_getline): should return nil when read_all gives
-	  empty string, even when nil rs is specified. [ruby-core:02077]
+Tue Jan 25 00:37:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Fri Dec 26 18:50:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: use AC_CHECK_TOOL for cross compiling.
 
-	* configure.in: check if getcontext and setcontext are available.
+Mon Jan 24 19:01:54 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* eval.c: use presence of getcontext/setcontext.
+	* array.c (rb_protect_inspect): should be checked by id of
+	  objects; not by object themselves.
 
-Fri Dec 26 16:40:53 2003  Tanaka Akira  <akr@m17n.org>
+Mon Jan 24 18:48:08 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/pathname.rb (PathnameTest#test_plus): add 2 assertions.
+	* eval.c (rb_eval): too many warnings;  warned on every method
+	  overriding.  should be on method discarding.
 
-Fri Dec 26 09:26:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jan 24 02:56:44 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* pack.c (pack_pack): add sign check for 'i', and 'l'.
-	  [ruby-dev:22427]
+	* parse.y (yylex): -2.abs should be `(-2).abs' to accomplish the
+	  principle of less surprise.  `+2' too.
 
-	* bignum.c (rb_quad_pack): add range check for 'quad int'.
+	* eval.c (rb_eval): when defining class is already there, and
+	  superclass differ, throw away the old class.
 
-Thu Dec 25 22:39:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* variable.c (rb_const_set): gives warning again on constant
+	  redefinition.
 
-	* string.c (rb_str_update): don't return any value.
+	* error.c (Init_Exception): SyntaxError, NameError, LoadError and
+	  NotImplementError are subclasses of ScriptError<Exception, not
+	  StandardError.  experimental.
 
-Thu Dec 25 15:30:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jan 22 00:00:41 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* string.c (rb_str_update): call rb_str_modify().
+	* 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"].
 
-Thu Dec 25 05:08:09 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_slice_bang): new method `slice!'.
 
-	* eval.c (search_required): search actual file name once when no
-	  extension specified.
+Fri Jan 21 21:56:08 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Thu Dec 25 04:00:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.4.
 
-	* stable version 1.8.1 released.
+	* lib/net/http.rb: can receive messages which have
+	  no Content-Length:.
 
-Thu Dec 25 00:17:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jan 21 16:15:59 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* configure.in: check for nanosleep, -lrt if required.
-	  [ruby-core:02059]
+	* eval.c (thgroup_s_new): new class ThreadGroup.
 
-	* eval.c (thread_timer): use select(2) if nanosleep(2) is not
-	  available.
+Tue Jan 18 12:24:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c: check __stub_getcontext for glibc on some platforms.
-	  [ruby-list:38984]
+	* struct.c (Init_Struct): remove Struct's own hash and eql?.
 
-Wed Dec 24 23:48:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Jan 15 22:21:08 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb
-	  test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0"
-	  to express -0.0.  [ruby-talk:88786]
+	* eval.c (search_method): argument klass may be 0.
 
-Wed Dec 24 23:29:30 2003  Tanaka Akira  <akr@m17n.org>
+Sat Jan 15 15:03:46 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/tsort.rb (test_orphaned_break): removed.
+	* enum.c (enum_index): remove this method.
 
-Wed Dec 24 20:53:06 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* enum.c: remove use of pointers to local variables. find,
+	  find_all, min, max, index, member?, each_with_index, 
 
-	* ext/tk/sample/tkmulticolumnlist.rb: new sample
+	* eval.c (massign): multiple assignment does not use to_a anymore.
+	  experimental.
 
-	* ext/tk/sample/tkmultilistframe.rb: bug fix
+Fri Jan 14 12:22:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Dec 24 20:37:37 2003  Eric Sunshine  <sunshine@sunshineco.com>
+	* string.c (rb_str_replace): use memmove instead of memcpy for
+	  overwrapping strings (e.g. a[1] = a).
 
-	* configure.in (LDSHARED): Fixed typographical error in assignment of
-	  LDSHARED for Rhapsody which caused linking of extension modules to
-	  fail.
+Thu Jan 13 11:12:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Dec 24 17:51:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (arg_add): use new node, ARGSPUSH.
 
-	* file.c (rb_thread_flock): enable thread support again.
+Mon Jan 10 18:32:28 2000  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Wed Dec 24 16:46:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c (w_object): forgot an argument to call w_ivar().
 
-	* eval.c (catch_timer): do not call rb_thread_schedule() inside to
-	  avoid pthread_mutex_lock() deadlock.  interrupts to system calls
-	  are detected by TRAP_END via EINTR error.
+Sun Jan  9 18:13:51 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* eval.c (thread_timer): do not post signal unless it is
-	  absolutely necessary.
+	* random.c: first was not defined unless HAVE_RANDOM.
 
-	* rubysig.h (TRAP_END): add CHECK_INTS to switch thread.
+Sat Jan  8 19:02:49 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* regex.c (re_compile_pattern): check if nextp is smaller than
-	  pend.  [ruby-dev:22372]
+	* io.c (rb_io_sysread): raise IOError for buffered IO.
 
-	* eval.c (umethod_bind): remove method overridden check.
-	  [ruby-dev:22366]
+	* ext/socket/socket.c (s_recv): ditto.
 
-Wed Dec 24 16:13:05 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Jan  7 00:59:29 2000  Masahiro Tomita  <tommy@tmtm.org>
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read): should check for error
-	  status by SSL_get_error().
+	* io.c (io_fread): TRAP_BEG/TRAP_END added around getc().
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_write): ditto.
+Thu Jan  6 00:39:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Dec 24 14:23:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* random.c (rb_f_rand): should be initialized unless srand is
+	  called before.
 
-	* ext/stringio/stringio.c (strio_read): clear the buffer argument
-	  when returning nil.  [ruby-dev:22363]
+Wed Jan  5 16:59:34 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* test/ruby/ut_eof.rb (TestEOF::test_eof_0, TestEOF::test_eof_1):
-	  add buffer argument tests.
+	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.3.
 
-Wed Dec 24 14:07:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/session.rb: Session -> Protocol, ...
 
-	* lib/test/unit/assertions.rb: Modules are allowed to rescue.
+	* lib/net/http.rb: HTTPCommand implementation was changed.
 
-	* lib/test/unit/autorunner.rb: show output_level in order.
+Wed Jan  5 02:14:46 2000  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* lib/test/unit/collector/dir.rb: get rid of successive same
-	  directories in load path.
+	* parse.y: Fix SEGV on empty parens with UMINUS or UPLUS.
 
-	* test/testunit/test_assertions.rb (test_assert_nothing_raised,
-	  test_assert_raise): test for modules.
+Tue Jan  4 22:25:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Dec 24 13:43:34 2003  Shugo Maeda  <shugo@ruby-lang.org>
+	* parse.y (stmt): `() while cond' dumped core.
 
-	* lib/net/imap.rb (authenticate): remove "\n" from base64 encoded
-	  strings.
+Tue Jan  4 06:04:14 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Wed Dec 24 11:26:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: modify for cross-compiling.
+	  use target_* instead of host_*. 
+	  use AC_CANONICAL_TARGET.
 
-	* test/fileutils/test_fileutils.rb: should not create any
-	  files or directories in current directory.  [ruby-talk:88724]
+	* Makefile.in: ditto.
 
-Wed Dec 24 10:29:53 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* cygwin/GNUmakefile.in: ditto.
 
-	* ext/stringio/stringio.c (strio_read): never return nil at
-	  unlimited read.  [ruby-dev:22334]
+Sat Jan  1 13:26:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/stringio/stringio.c (strio_read): support second
-	  argument.  [ruby-dev:22350]
+	* eval.c (rb_yield_0): force_recycle ruby_dyna_vars to gain
+	  performance.
 
-Wed Dec 24 09:38:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_delete_at_m): takes same argument pattern with
+	  rb_ary_aref.
 
-	* parse.y (arg): should return 0 after error.  [ruby-dev:22360]
+Sat Jan  1 10:12:26 2000  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
-Wed Dec 24 00:56:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.h,util.c (rb_special_const_p): peep hole optimization.
 
-	* io.c (read_all): do not return nil at the end of file.
-	  [ruby-dev:22334]
+	* ruby.h,util.c (rb_test_false_or_nil): removed.
 
-	* io.c (argf_read): do not depend on nil at eof behavior of
-	  IO#read().
+	* ruby.h (RTEST, SPECIAL_CONST_P): peep hole optimization.
 
-	* eval.c (rb_thread_join): dup exception before re-raising it.
+	* ruby.h (FL_ABLE, FL_SET, FL_UNSET, FL_REVERSE): made expressions
+	  not statements.
 
-	* io.c (rb_io_eof): call clearerr() to prevent side effect.  this
-	  patch is supplied by Masahiro Sakai <sakai@tom.sfc.keio.ac.jp>.
-	  [ruby-dev:22234]
+	* ruby.h (OBJ_INFECT): newly added macro which copies taint from
+	  `s' to `x'.
 
-	* pack.c (OFF16): get offset for big endian machines.
+Sat Jan  1 02:04:18 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* pack.c (pack_pack): use OFF16 instead of OFF16B.
-	  [ruby-dev:22344]
+	* eval.c (rb_thread_safe_level): new method.
 
-	* pack.c (pack_unpack): ditto.
+	* eval.c (rb_yield_0): recycle dyna_var_map to reduce object
+	  allocation. 
 
-Tue Dec 23 22:47:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Dec 31 00:52:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c (rb_io_check_readable): set FMODE_RBUF always, even if
-	  NEED_IO_SEEK_BETWEEN_RW is not defined. [ruby-dev:22340]
+	* eval.c: thread independent trace_func not needed.
 
-	* io.c (rb_io_check_writable): clear FMODE_RBUF before writing
-	  something.
+Thu Dec 30 14:47:31 1999  akira yamada  <akira@ruby-lang.org>
 
-Tue Dec 23 22:25:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* configure.in: specifies -soname in LIBRUBY_DLDFLAGS on linux
+	  platforms.
 
-	* lib/optparse.rb: incomplete RDoc documentation added in place of
-	  existing RD comments.  Tabs converted to spaces.
+Thu Dec 30 10:51:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Dec 23 19:44:47 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* 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()'.
 
-	* test/soap/test_streamhandler.rb (test_basic_auth): removed.
-	  soap4r + basic_auth is not officially supported in ruby/1.8.1 even
-	  though soap4r + basic_auth + http-access2 should run fine.
+Thu Dec 30 02:08:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Dec 23 19:42:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_cstr2inum): non-numeric format check added.
+	  currently it works only with base == 0 (i.e. Integer()).
 
-	* io.c (rb_io_ungetc): raise an exception at unread stream to
-	  avoid unspecified behavior.  [ruby-dev:22330]
+	* bignum.c (rb_str2inum): now takes VALUE to 1st argument.  null
+	  byte check added.
 
-	* test/ruby/test_system.rb (test_syntax): glob relatively from
-	  __FILE__.
+	* array.c (rb_ary_replace): unless replacement is an array,
+	  replacement shall be converted to array by `[replacement]', not
+	  by `replacement.to_a'.
 
-Tue Dec 23 18:09:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_plus): right operand must be an array.
 
-	* pack.c (pack_pack): remove unnecessary negative value check.
-	  [ruby-dev:22329]
+	* array.c (rb_ary_concat): argument must be an array.
 
-Tue Dec 23 17:26:55 2003  KONISHI Hiromasa  <konishih@fd6.so-net.ne.jp>
+Mon Dec 27 12:35:47 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* bcc32/Makefile.sub (config.h): bcc has finite(). [ruby-list:38940]
+	* ext/socket/socket.c (sock_finalize): mswin32: fix socket handle leak.
 
-Tue Dec 23 16:08:16 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* win32/win32.c (myfdclose): ditto.
 
-	* lib/rexml/encodings/US-ASCII.rb: typo.  [ruby-talk:88650]
+Sun Dec 26 23:15:13 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* test/ruby/test_system.rb: num of asserts depended on running dir.
+	* win32/win32.c (mypopen): raise catchable error instead of rb_fatal.
+	* win32/win32.c (mypclose): fix process handle leak.
 
-	* test/xsd/test_noencoding.rb: rexml + without iconv/uconv cannot
-	  handle euc-jp.  install iconv, uconv or xmlscan.
+Sun Dec 26 16:17:11 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Tue Dec 23 14:13:51 2003  akira yamada  <akira@ruby-lang.org>
+	* ext/Win32API/Win32API.c (Win32API_initialize): use UINT2NUM
+	  instead of INT2NUM to set __dll__ and __proc__.
 
-	* lib/uri/generic.rb (URI::Generic::check_userinfo,
-	  URI::Generic::check_user, URI::Generic::check_password): tests
-	  conflicts/depends with other components closely.
+Sat Dec 25 00:08:59 1999  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
 
-	* test/uri/test_generic.rb (TestGeneric::test_set_component):
-	  added tets.
+	* ext/Win32API/Win32API.c (Win32API_Call): remove 'dword ptr'
+	  from _asm.
 
-Tue Dec 23 11:08:34 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Dec 24 10:26:47 1999  Koji Oda  <oda@bsd1.qnes.nec.co.jp>
 
-	* test/xsd/test_noencoding.rb: rescue Errno::EINVAL and do not test.
-	  "euc-jp" might not be in supported encoding name list.
-	  [ruby-talk:88650]
+	* win32/win32.h: use "C++" linkage.
 
-Tue Dec 23 06:10:31 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Dec 24 02:00:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/cgi.rb (CGI): add support for mod_ruby.
+	* eval.c (THREAD_ALLOC): should initialize th->trace.
 
-	* lib/webrick/cgi.rb (CGI::Socket): add check for existence of
-	  OpenSSL module in all HTTPS related methods.
+Fri Dec 24 00:43:39 1999  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
 
-	* lib/webrick/cgi.rb (CGI::Socket#cipher): should create similar
-	  value to OpenSSL::SSLSocket#cipher.
+	* io.c (pipe_open): check for `fptr->f == NULL'.
+	* win32/win32.c (mypopen): STDERR does not work during ` function.
 
-	* lib/webrick/httpresponse.rb (HTTPResponse#setup_header): should
-	  set "connection: close" if @keep_alive is false.
+Wed Dec 22 22:50:40 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* lib/webrick/https.rb (HTTPrequest#meta_vars): add supprt for
-	  SSL_PROTOCOL, SSL_CIPHER_USEKEYSIZE and SSL_CIPHER_ALGKEYSIZE.
+	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.2.
 
-Mon Dec 22 23:00:05 2003  akira yamada  <akira@ruby-lang.org>
+	* lib/net/http.rb: HTTP support is enhanced a little
 
-	* lib/uri/generic.rb (URI::Generic::check_opaque): fixed typo.
+	* lib/net/http.rb: support proxy
 
-Mon Dec 22 21:59:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 21 17:21:28 1999  Koji Oda  <oda@bsd1.qnes.nec.co.jp>
 
-	* ext/iconv/iconv.c (map_charset): always ensure code is a String.
+	* ext/socket/socket.c (sock_finalize): mswin32: fix FILE* leak.
 
-Mon Dec 22 21:15:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 21 05:33:56 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* class.c (rb_mod_init_copy): always copy singleton class.
-	  [ruby-dev:22325]
+	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.1.
 
-Mon Dec 22 20:44:36 2003  akira yamada  <akira@ruby-lang.org>
+	* lib/net/http.rb: support HTTP chunk
 
-	* lib/uri/generic.rb (URI::Generic#route_from): accepts urls which
-	  has no host-part.
+Mon Dec 20 19:08:12 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* test/uri/test_generic.rb (TestGeneric::test_route): added a test.
+	* file.c (rb_file_s_expand_path): handle dir separator correctly.
 
-Mon Dec 22 20:38:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Dec 19 22:56:31 1999  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
 
-	* lib/cgi.rb: reduce eval.
+	* 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.
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): alias path to
-	  local_path.  [ruby-list:38883]
+Sat Dec 18 03:00:01 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Dec 22 20:09:31 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* file.c (path_check_1): check should be done by absolute path. 
 
-	* test/soap/test_property.rb: remove duplicated test method.
+	* marshal.c (r_ivar): should restore generic_ivar too.
 
-Mon Dec 22 18:22:04 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* marshal.c (w_ivar): should dump generic_ivar too.
 
-	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): remove
-	  HAVE_ISINF definition to follow previous commits of missing.h
-	  and win32/win32.h.
+Fri Dec 17 22:46:46 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-Mon Dec 22 17:23:42 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.0.
 
-	* configure.in (ac_cv_func_setitimer): moved from defines.h
+	* lib/net/http.rb: test release
 
-	* defines.h, rubysig.h, signal.c: removed macro handling which
-	  should be done in configure.
+	* lib/net/session.rb: support class swapping
 
-	* configure.in (intrinsics.h): check if present.
+	* lib/net/session.rb: Socket#flush_rbuf
 
-	* ruby.h: include intrinsics.h if available.
+	* lib/net/session.rb: doquote -> Net.quote
 
-	* bignum.c, marshal.c: include ieeefp.h if available.
+Fri Dec 17 19:27:43 1999  IWAMURO Motonori  <iwa@mmp.fujitsu.co.jp>
 
-	* missing.h (isinf): define as a macro if finite() and isnan()
-	  are available.  [ruby-core:02032]
+	* eval.c (rb_load): should initialize ruby_frame->last_class.
 
-Mon Dec 22 17:07:31 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Dec 15 01:35:29 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* configure.in (mingw): set isnan, finite and isinf to yes.
+	* ruby.c (proc_options): option to change directory changed to
+	  `-C' like tar.
 
-Mon Dec 22 13:40:19 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ruby.c (proc_options): argv boundary check for `-X'.
 
-	* lib/soap/property.rb: passing block by reference.
+Mon Dec 13 15:15:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Dec 22 00:32:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (re_adjust_startpos): separate startpos adjustment
+	  because of major performance drawback.
 
-	* eval.c (rb_with_disable_interrupt): use ENABLE_INTS instead of
-	  ALLOW_INTS which may switch context.  [ruby-dev:22319]
+	* class.c (rb_singleton_class): tainted status of the singleton
+	  class must be synchronized with the object.
 
-	* ext/syck/emitter.c (syck_emitter_write): str bigger than
-	  e->bufsize causes buffer overflow.  [ruby-dev:22307]
+	* eval.c (rb_thread_schedule): implement thread priority.
 
-Sun Dec 21 17:29:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Dec 11 03:34:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* class.c (rb_check_inheritable): new function.  [ruby-dev:22316]
+	* gc.c (mark_hashentry): key should be VALUE, not ID.
 
-	* intern.h: add prototype.
+	* io.c (argf_eof): should check next_p too.
 
-	* eval.c (superclass): use rb_check_inheritable().
+Thu Dec  9 18:09:13 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* object.c (rb_class_initialize): check argument validity.
+	* error.c (exc_set_backtrace): forgot to declare a VALUE argument.
 
-Sun Dec 21 16:25:10 2003  Tanaka Akira  <akr@m17n.org>
+Thu Dec  9 14:19:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/pathname.rb (Pathname#+): re-implemented to resolve ".." in
-	  beginning of the argument.
-	  (Pathname#join): concatenate from the last argument.
-	  (Pathname#parent): just use Pathname#+.
+	* object.c (rb_obj_taint): explicit tainting must be prohibited at
+	  level 4 to prevent polluting trusted object by untrusted code.
 
-Sun Dec 21 00:12:37 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* file.c: file operations (stat, lstat, chmod, chown, umask,
+	  truncate, flock) are prohibited in level 2 (was level 4).
 
-	* ext/tk/lib/tk.rb: add new methods (TkScrollbar#assign, assign_list)
+Wed Dec  8 11:48:23 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/sample/tkmultilistframe.rb: use TkScrollbar#assign method
+	* eval.c (rb_f_require): prohibiting require() in the secure mode
+	  cause serious autoloading error.
 
-Sat Dec 20 21:59:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* variable.c (rb_obj_instance_variables): don't need to prohibit
+	  to get list of instance variable names of untainted objects.
 
-	* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): refine regexp.
+	* variable.c (rb_ivar_get): don't need to prohibit to get instance
+	  variables of untainted objects.
 
-	* lib/webrick/cgi.rb (CGI#start): NPH scripts return status line
-	  instead of Status: header field.
+	* variable.c (rb_mod_remove_const): should prohibit constant
+	  removals too. 
 
-	* lib/webrick/cgi.rb (CGI::Socket): refine some coditions.
+Wed Dec  8 09:23:01 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Dec 20 16:07:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): should try autoloading before defining
+	  class/module at the toplevel.
 
-	* lib/optparse.rb (OptionParser::Completion::complete): wrong
-	  Regexp for word boundary.  pointed out by Gavin Sinclair.
+Tue Dec  7 22:15:30 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* lib/optparse.rb (OptionParser::make_switch): [no-] prefix was
-	  missing.
+	* configure.in: Modified rb_cv_rshift_sign detect routine and
+	  more simple/fast RSHIFT() for hpux-10.x.
 
-Sat Dec 20 11:40:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec  7 11:16:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/yaml.rb (YAML::YAML): adjust Marshal version.
+	* eval.c (Init_eval): calculate stack limit from rlimit where
+	  getrlimit(2) is available.
 
-Sat Dec 20 03:56:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Dec  7 09:57:33 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-	* eval.c (rb_with_disable_interrupt): prohibit thread context
-	  switch during proc execution.  [ruby-dev:21899]
+	* file.c (rb_file_ftype): should have removed mode_t.
 
-Sat Dec 20 02:41:02 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Dec  6 15:55:30 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* lib/webrick/cgi.rb: add file. (yet another CGI library)
+	* numeric.c (fix_rshift): Fix -1 >> 32 returned 0 (should be -1).
 
-	* MANIFEST: add lib/webrick/cgi.rb.
+	* numeric.c (fix_rshift): Fix  1 >> -1 returned 0 (should be 2).
 
-Sat Dec 20 02:18:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Dec  6 11:47:23 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* misc/ruby-mode.el (ruby-calculate-indent): proper indentation
-	  inside of parentheses.  [ruby-dev:22308]
+	* sprintf.c (rb_f_sprintf): formatted string must be tainted if
+	  any of parameters is a tainted string.
 
-Fri Dec 19 21:24:22 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* file.c (rb_file_s_expand_path): expanded file path need not to
+	  be tainted always.
 
-	* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): should not set
-	  HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH.
+Sun Dec  5 20:25:29 1999  Katsuhiro Ueno  <unnie@blue.sky.or.jp>
 
-	* lib/webrick/https.rb (HTTPRequest#parse): should check presence
-	  of cert() method to detect SSLSocket.
+	* eval.c (Init_Proc): simple typo.
 
-Fri Dec 19 22:56:46 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* gc.c (add_heap): sizeof(RVALUE*), not sizeof(RVALUE).
 
-	* lib/soap/property.rb (SOAP::Property#load): new method for loading
-	  property value into existing property tree.
+Sat Dec  4 01:40:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/soap/test_property.rb: add test.
+	* regex.c (re_search): adjust startpos for multibyte match unless
+	  the first pattern is forced byte match.
 
-Fri Dec 19 19:21:49 2003  akira yamada  <akira@ruby-lang.org>
+	* bignum.c (rb_big_rand): should not use rand/random where drand48
+	  may be available.  RANDOM_NUMBER should be provided from outside.
 
-	* lib/runit/cui/testrunner.rb (RUNIT::CUI::TestRunner::run):
-	  should use Test::Unit::UI::{PROGRESS_ONLY,VERBOSE}.
+Fri Dec  3 09:54:59 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Dec 19 17:36:49 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ruby.c (moreswitches): there may be trailing garbage at #!
+	  line.
 
-	* ext/tk/sample/tkmultilistbox.rb: bug fix
+	* eval.c (rb_f_require): should check require 'feature.o' too.
 
-	* ext/tk/sample/tkmultilistframe.rb: new sample script
+Thu Dec  2 11:58:15 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Fri Dec 19 03:44:27 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (rb_thread_loading): should maintain loading_tbl.
 
-	* lib/webrick/httputils.rb (parse_form_data): should return an
-	  empty Hash if the body is empty.
+Thu Dec  2 10:21:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Dec 18 21:47:35 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (rb_thread_loading_done): wrong parameter to st_delete().
 
-	* lib/mkmf.rb (create_makefile): should remove deffile if it's
-	  made by miniruby. based on nobu's patch.
+Wed Dec  1 11:24:06 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Thu Dec 18 21:44:21 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ruby.c (process_sflag): process -s properly (should not force `--').
 
-	* eval.c (stack_extend): ignore inline optimization on VC7.
+Wed Dec  1 09:47:33 1999  Kazunori NISHI  <kazunori@swlab.csce.kyushu-u.ac.jp>
 
-	* win32/Makefile.sub (OS, RT): can override.
+	* string.c (rb_str_split_method): should increment end too.
 
-	* win32/Makefile.sub (LDFLAGS): ditto. shouldn't use pdb:none
-	  option. based on Tietew's patch [ruby-dev:22289]
+Tue Nov 30 18:00:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Dec 18 16:38:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* marshal.c: MARSHAL_MINOR incremented; format version is 4.2.
 
-	* dir.c (fnmatch): unlike find_dirsep(), rb_path_next() never
-	  return NULL.
+	* marshal.c (w_object): distinguish class and module.
 
-Thu Dec 18 15:27:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* marshal.c (w_object): save hash's default value.
 
-	* lib/ipaddr.rb (IPSocket::getaddress): merge usa's patch.
-	  [ruby-dev:21678]
+	* marshal.c (r_object): restore hash's default value.
 
-Wed Dec 17 15:15:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov 30 01:46:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/cgi.rb (CGI::QueryExtension::Value::[]): should work like
-	  String#[] if more than one arguments are specified.
+	* re.c (rb_reg_source): generated source string must be tainted if
+	  regex is tainted.
 
-	* lib/delegate.rb: avoid using common instance name as "@obj".
+	* file.c (rb_file_s_basename): basename should not be tainted
+	  unless the original path is tainted.
 
-	* lib/cgi.rb (CGI::QueryExtension::Value): Value is no longer
-	  subclass of String, but DelegateClass(String).
+	* file.c (rb_file_s_dirname): ditto.
 
-	* ext/curses/extconf.rb: restore function check for init_color.
-	  [ruby-list:38905]
+Mon Nov 29 20:42:13 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* Makefile.in: need to specify $(MAINLIBS) for the miniruby
-	  generation rule.
+	* file.c (stat_new): Struct::Stat -> File::Stat; Stat is no longer
+	  a Struct.
 
-	* configure.in: better FreeBSD -lc_r support.
+Mon Nov 29 15:28:52 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Dec 17 00:16:14 2003  Minero Aoki  <aamine@loveruby.net>
+	* variable.c (rb_path2class): evaluated value from path should be
+	  module or class.
 
-	* ext/strscan/strscan.c: new method
-	  StringScanner#beginning_of_line? (alias #bol?)
+Fri Nov 26 18:12:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/strscan/strscan.c: new method StringScanner#concat and #<<.
+	* eval.c (rb_exec_end_proc): should remove only end_procs defined
+	  within load wrapper.
 
-	* ext/strscan/strscan.c: StringScanner#new(str) does not duplicate
-	  nor freeze STR (allow destructive modification).
+	* eval.c (rb_load): save and restore ruby_wrapper around loading.
 
-	* test/strscan/test_stringscanner.rb: test new methods above.
+	* eval.c (rb_mark_end_proc): mark end procs registered by END{} or
+	  at_exit{}. 
 
-	* test/strscan/test_stringscanner.rb: test destructive string
-	  modification.
+	* eval.c (rb_set_end_proc): should not call rb_global_variable()
+	  on heap address;  it crashed mod_ruby.
 
-Tue Dec 16 21:20:47 2003  Tanaka Akira  <akr@m17n.org>
+Mon Nov 22 14:07:24 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/pp.rb: don't use local variable `pp'.
+	* ruby.c (proc_options): variable e_script should be visited by
+	  garbage collector.
 
-	* lib/prettyprint.rb: ditto.
+Sat Nov 20 10:10:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Dec 16 13:20:43 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* hash.c (inspect_i): value may be nil, check revised.
 
-	* ext/tk/lib/tk.rb: condition bug of if statement on
-	  {pack,grid}_propagate methods
+Fri Nov 19 18:06:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Dec 16 03:17:29 2003  why the lucky stiff  <why@ruby-lang.org>
+	* dir.c (glob): recursive wildcard match by `**' ala zsh.
 
-	* lib/yaml/rubytypes.rb: comments in strings. [ruby-talk:88012]
+Fri Nov 19 11:44:26 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* test/yaml/test_yaml.rb: add test.
+	* variable.c: was returning void value.
 
-Tue Dec 16 01:14:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Nov 19 03:57:22 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-	* eval.c (catch_timer): check rb_thread_crtical in main native
-	  thread.
+	* file.c: add methods Stat struct class to reduce stat(2).
 
-	* eval.c (thread_timer): just sends signals periodically, to
-	  prevent main native thread from receiving them in critical
-	  section.  [ruby-core:01959]
+Thu Nov 18 16:18:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Dec 15 13:32:22 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/pstore.rb: mutual lock by flock(2).
 
-	* dir.c (check_dirname): check string safety and remove extraneous
-	  trailing directory separators.  [ruby-dev:22279]
+Thu Nov 18 11:44:13 1999  Masahiro Tomita  <tommy@tmtm.org>
 
-	* file.c: renamed and externalized rb_path_next,
-	  rb_path_skip_prefix, rb_path_last_separator, rb_path_end.
+	* io.c (read_all): should check bytes too.
 
-	* intern.h: prototypes for rb_path_next, rb_path_skip_prefix,
-	  rb_path_last_separator, rb_path_end.
+Wed Nov 17 02:40:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Dec 15 09:27:46 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* io.c (Init_IO): $defout (alias of $>) added.
 
-	* ext/openssl/ossl_pkcs12.c (ossl_pkcs12_initialize): first argument
-	  of rb_protect should take an argument of VALUE.
+Tue Nov 16 09:47:14 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Dec 14 18:46:48 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/pstore.rb: add mutual lock using symlink.
 
-	* ext/socket/socket.c (Init_socket): IPv6 is not supported although
-	  AF_INET6 is defined on MinGW.
+Mon Nov 15 16:50:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/ipaddr.rb (AF_INET6): workaround in the environment which does
-	  not support IPv6.
+	* enum.c (enum_grep): non matching grep returns an empty array, no
+	  longer returns nil.
 
-Sat Dec 13 18:55:16 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enum.c (enum_grep): grep with block returns collection of
+	  evaluated values of block over matched elements.
 
-	* ext/iconv/charset_alias.rb: preserve original order.
+Mon Nov 15 04:50:33 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* ext/iconv/extconf.rb: remove wrapper file at clean.
+	* re.c (rb_reg_source): should not call rb_reg_expr_str()
+	  everytime.
 
-Sat Dec 13 18:09:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Nov 13 07:34:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (thread_timer): use timer by sub-thread and nanosleep.
-	  [ruby-talk:87519]
+	* variable.c (rb_mod_constants): traverse superclasses to collect
+	  constants.
 
-	* gc.c (Init_stack): no stack adjustment for THREAD_SAFE.
+	* eval.c (assign): modified for shared variables.
 
-Sat Dec 13 17:17:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): search nested scope, then superclasses to
+	  assign shared variables within methods.
 
-	* eval.c (proc_alloc): cache the created object at first time.
-	  [ruby-talk:61288], [ruby-dev:22240]
+	* eval.c (rb_eval): remove warnings from constants modification,
+	  because they are no longer constants.
 
-Sat Dec 13 09:01:23 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (node_assign): modified for shared variables.
 
-	* configure.in: check ucontext.h.
+	* parse.y (assignable): allow constant assignment in methods;
+	  constants should be called `shared variable'.
 
-	* eval.c: use getcontext/setcontext() instead of setjmp/longjmp()
-	  on ia64 or with native thread enabled.  [ruby-core:01932]
+Fri Nov 12 23:52:19 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Sat Dec 13 03:09:14 2003  why the lucky stiff  <why@ruby-lang.org>
+	* process.c (rb_f_system): argument check for NT, __EMX__, DJGPP.
 
-	* lib/yaml/rubytypes.rb: anonymous struct fix. [ruby-core:01946]
+Wed Nov 10 21:54:11 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* test/yaml/test_yaml.rb: add test.
+	* hash.c (rb_any_cmp): Fixed return without value.
 
-Fri Dec 12 22:36:44 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Nov 10 17:57:06 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/csv.rb: add Cell#to_str and Cell#to_s for /.../ =~ aCell,
-	  "#{aCell}" and so on.
+	* sprintf.c: incorporate <yasuf@big.or.jp>'s sprintf patch at
+	  [ruby-dev:7754]. 
 
-	* test/csv/test_csv.rb: add tests.
+Wed Nov 10 08:28:53 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Dec 12 19:33:06 2003  Minero Aoki  <aamine@loveruby.net>
+	* eval.c (rb_call0): supply class parameter for each invocation.
 
-	* lib/fileutils.rb (mkdir): remove trailing `/' from pathes.
+Tue Nov  9 13:21:04 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* lib/fileutils.rb (rmdir): ditto. [ruby-dev:22238]
+	* configure.in: AC_MINIX move to before AC_EXEEXT and AC_OBJEXT.
 
-	* lib/fileutils.rb (rmdir_r): ditto.
+Mon Nov  8 19:52:29 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* lib/fileutils.rb (fu_copy_dir): check if it is a directory after
-	  mkdir(2).
+	* configure.in: Renamed AC_CHAR_UNSIGNED to AC_C_CHAR_UNSIGNED.
 
-Fri Dec 12 06:06:09 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: Added default to AC_CHECK_SIZEOF().
 
-	* eval.c (proc_invoke): fix class name in warning message for
-	  define_method.  [ruby-dev:22235]
+Mon Nov  8 14:28:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Dec 11 21:24:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (stmt): rescue modifier added to the syntax.
 
-	* ext/openssl/ossl_pkcs12.[ch]: new files. add OpenSSL::PKCS12.
+	* keywords: kRESCUE_MOD added.
 
-	* ext/openssl/ossl.[ch]: ditto.
+	* eval.c (rb_f_eval): fake outer scope when eval() called without
+	  bindings.
 
-	* ext/openssl/MANIFEST: add ossl_pkcs12.[ch].
+	* eval.c (rb_f_binding): should copy last_class in the outer frame too.
 
-Thu Dec 11 20:54:28 2003  Minero Aoki  <aamine@loveruby.net>
+Sun Nov  7 18:31:04 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
-	* lib/fileutils.rb (mkdir_p): remove trailing `/' befere mkdir(2).
-	  mkdir("nonexistdir/") does not work on NetBSD/Alpha 1.6.1.
+	* eval.c (is_defined): last_class may be 0.
 
-	* lib/fileutils.rb (fu_list): call to_str for all arguments.
+Sat Nov  6 19:26:55 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-Thu Dec 11 20:07:01 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* Makefile.in: Added depend entry make parse.@OBJEXT@ from parse.c
+	  for UCB make
 
-	* lib/ftools.rb (makedirs): sync with fileutils.
+Thu Nov  4 17:41:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Dec 11 19:53:03 2003  Minero Aoki  <aamine@loveruby.net>
+	* regex.c (re_compile_pattern): \< (wordbeg), \> (wordend) disabled.
 
-	* lib/fileutils.rb (mkdir_p): catch all SystemCallErrors.
-	  (mkdir("C:\") causes EACCESS on Windows 2000/NTFS)
+Wed Nov  3 08:52:57 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
 
-Thu Dec 11 19:08:02 2003  Minero Aoki  <aamine@loveruby.net>
+	* io.c (Init_IO): forgot to use INT2FIX() around SEEK_SET, etc. 
 
-	* lib/fileutils.rb (mkdir_p): check if it is a directory after
-	  mkdir(2) instead of before mkdir(2), to avoid race condition.
-	  [ruby-talk:87730]
-	  Refer: mkinstalldirs sh script, GNU mkdir(1) (coreutils 5.0)
+Wed Nov  3 00:25:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Dec 11 18:49:30 2003  Minero Aoki  <aamine@loveruby.net>
+	* string.c (rb_str_split_method): use mbclen2() to handle kcode
+	  option of regexp objects.
 
-	* lib/fileutils.rb: def m( arg ) -> def m(arg).
+Mon Nov  1 14:22:15 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-Thu Dec 11 11:39:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): reduce recursive calls to rb_eval()
+	  case of ||= and &&= .
 
-	* configure.in (ieeefp.h), numeric.c: needed for finite() on
-	  Solaris.  [ruby-core:01921]
+Sun Oct 31 13:12:42 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* file.c (rb_stat_inspect): adjust format specifier.
+	* regex.c (re_compile_pattern): wrong [\W] match.
 
-	* parse.c (arg_prepend): nodetype() is for debug use.
+Fri Oct 29 16:57:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ruby.h (ISASCII, etc): cast to int to get rid of warning.
+	* ext/nkf/lib/kconv.rb: new String methods (kconv, tojis, toeuc,
+	  tosjis).
 
-	* ruby.h (alloca.h): include even in GCC.  [ruby-core:01925]
+	* time.c (time_s_at): now accepts optional second argument to
+	  specify micro second.
 
-	* ext/bigdecimal/bigdecimal.c (GetVpValue): adjust format
-	  specifier.
+Thu Oct 28 13:35:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_prec, BigDecimal_coerce,
-	  BigDecimal_divmod): use rb_assoc_new() to suppress memory usage.
+	* string.c (rb_str_split_method): should be mbchar aware with
+	  single char separators.
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_split): ditto.
+Wed Oct 27 12:57:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/dl/sym.c (rb_dlsym_guardcall): guard itself should be
-	  volatile.
+	* random.c (rb_f_srand): random seed should be unsigned.
 
-	* ext/iconv/iconv.c (iconv_convert): ensure actual parameter with
-	  format specifier.
+Tue Oct 26 23:58:15 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): do not
-	  define unless used.
+	* array.c (rb_ary_collect): collect for better performance.
 
-	* ext/pty/pty.c (getDevice): get rid of warning.
+Tue Oct 26 19:20:54 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* ext/socket/socket.c (port_str, sock_s_getaddrinfo,
-	  sock_s_getnameinfo): FIX2INT() now returns long.
+	* marshal.c (r_object): should register class/module objects.
 
-	* ext/socket/socket.c (init_inetsock_internal): uninitialized
-	  variable.
+Sat Oct 23 15:59:39 1999  Takaaki Tateishi  <ttate@jaist.ac.jp>
 
-	* ext/syck/rubyext.c (syck_parser_assign_io): add prototype.
+	* process.c (rb_f_system): should require at least one argument.
 
-	* ext/syck/rubyext.c (rb_syck_mktime, yaml_org_handler): use
-	  ISDIGIT() instead of isdigit() to avoid warnings and for
-	  platforms which don't support non-ascii charater.
+Sat Oct 23 12:42:44 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
-Wed Dec 10 19:28:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enum.c (enum_collect): collect without block will collect
+	  elements in enumerable.
 
-	* ext/stringio/stringio.c (strio_read): set EOF flag at short read.
-	  [ruby-dev:22223], [ruby-dev:22224]
+Thu Oct 21 16:14:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Dec 10 18:07:25 2003  Minero Aoki  <aamine@loveruby.net>
+	* ruby.c (moreswitches): function to process string option;
+	  the name is stolen from perl (not implementation).
 
-	* lib/erb.rb: new method ERB#filename(=). [ruby-dev:22208]
+	* ruby.c (proc_options): use RUBYOPT environment variable to
+	  retrieve the default options.
 
-Wed Dec 10 17:54:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c (fnmatch): use eban's fnmatch; do not depend on system's
+	  fnmatch (which may have portability problem) anymore.
 
-	* ext/stringio/stringio.c (strio_read): do not set EOF flag when
-	  requested length is zero.  [ruby-dev:22214]
+Wed Oct 20 15:14:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Dec 10 17:17:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c (marshal_load): should protect the generated object
+	  table (arg->data) from GC.
 
-	* io.c (read_all): should return given string even if data read is
-	  empty.  [ruby-dev:22207]
+Mon Oct 18 16:15:52 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Dec 10 17:16:06 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/nkf/nkf.c (rb_nkf_kconv): output should be NUL terminated.
 
-	* ext/stringio/stringio.c (strio_read): adjust behavior at reading
-	  beyond EOF to IO.  [ruby-dev:22205]
+Mon Oct 18 09:03:01 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
 
-	* test/ruby/ut_eof.rb (TestEOF::Seek): test behaviors at reading
-	  beyond EOF.
+	* lib/net/session.rb, smtp.rb, pop.rb: 1.0.3
 
-	* test/ruby/test_file.rb, test/stringio/test_stringio.rb: include
-	  TestEOF::Seek test case.
+	* lib/net/pop.rb: new methods POP3Command#uidl, POPMail#uidl.
 
-Wed Dec 10 15:01:19 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Sun Oct 17 03:35:33 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
 
-	* test/monitor/test_monitor.rb (test_cond): use Queue#deq
-	  instead of sleep.
+	* array.c (rb_ary_pop): forgot some freeze checks.
 
-Wed Dec 10 14:45:39 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Oct 16 12:57:53 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* ext/pty/pty.c (HAVE_SYS_IOCTL_H): need to include <sys/ioctl.h>
-	  for TIOCSCTTY on *BSD.  based on gotoyuzo's patch.
-	  (ruby-bugs:PR#1211)
+	* array.c (rb_ary_sort): always returns the copied array.
 
-	* ext/pty/pty.c (establishShell): should close descriptors if fork
-	  failed.
+Fri Oct 15 22:50:41 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Wed Dec 10 12:53:05 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* error.c (sys_nerr): on CYGWIN, it is _sys_nerr.
 
-	* win32/win32.h: define execv() using do_aspawn().
+Fri Oct 15 01:32:31 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* process.c (proc_exec_v): remove #ifdef's which stopped needing.
+	* io.c (rb_io_ctl) :need to use NUM2ULONG, not NUM2INT.
 
-Tue Dec  9 23:32:23 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/Win32API/Win32API.c (Win32API_Call): need to use NUM2ULONG,
+	  not NUM2INT.
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tkcanvas.rb, ext/tk/lib/tkdialog.rb,
-	  ext/tk/lib/tkentry.rb, ext/tk/lib/tkscrollbox.rb, ext/tk/lib/tktext.rb,
-	  ext/tk/sample/tkalignbox.rb, ext/tk/sample/tkcombobox.rb,
-	  ext/tk/sample/tkmultilistbox.rb, ext/tk/sample/tkoptdb.rb, ext/tk/sample/tktextframe.rb,
-	  ext/tk/sample/demos-en/dialog1.rb, ext/tk/sample/demos-en/dialog2.rb,
-	  ext/tk/sample/demos-jp/dialog1.rb, ext/tk/sample/demos-jp/dialog2.rb:
-	  overrided instance methods, which are private methods on the super
-	  class, are changed to 'private'
+Fri Oct 15 00:22:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Dec  9 19:53:02 2003  akira yamada  <akira@ruby-lang.org>
+	* re.c (Init_Regexp): super class of the MatchingData, which was
+	  Data, to be Object.
 
-	* lib/uri/generic.rb (URI::Generic#route_from0): make case insensitive
-	  for host-part.
+	* eval.c (ruby_run): evaluate required libraries before load &
+	  compiling the script.
 
-	* test/uri/test_generic.rb (test_route): added tests for the above
-	  change.
+	* 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>
 
-Tue Dec  9 14:10:48 2003  Tanaka Akira  <akr@m17n.org>
+	* bignum.c (rb_dbl2big): typo.
 
-	* io.c (rb_io_check_readable): don't call io_seek if EOF flag is set,
-	  to avoid clearing EOF flag.
-	  (rb_io_check_writable): ditto.
+	* file.c (rb_f_test): ditto.
 
-Tue Dec  9 02:53:55 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* string.c (rb_str_crypt): wrong message.
 
-	* ext/tk/sample/tkalignbox.rb: new sample script
+Sun Jun 27 19:50:11 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Tue Dec  9 00:45:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* eval.c (rb_f_exit): should have treat signed integer status, not
+	  VALUE.
 
-	* lib/test/unit/assertions.rb: renamed #assert_raises to #assert_raise
-	  and made the former call the latter. [ruby-core:01890]
+	* process.c (rb_f_exit_bang): should work like exit().
 
-	* test/testunit/test_assertions.rb: ditto.
+Sun Jun 27 16:21:32 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-Tue Dec  9 00:07:35 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* string.c (rb_str_rindex): wrong position to search.
 
-	* lib/soap/rpc/standaloneServer.rb: add 'shutdown' and 'status'
-	  methods as delegates to WEBrick.
+Sat Jun 26 04:05:30 1999  Takaaki Tateishi  <ttate@jaist.ac.jp>
 
-	* test/soap/calc/{test_calc.rb,test_calc2.rb},
-	  test/soap/helloworld/test_helloworld.rb,
-	  test/wsdl/datetime/test_datetime.rb, test/wsdl/raa/test_raa.rb:
-	  follow the change.
+	* configure.in (configure_args): --with-search-path to specify
+	  additional ruby search path.
 
-Mon Dec  8 22:48:03 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.c (ruby_prog_init): additional search path.
 
-	* lib/test/unit/autorunner.rb: remove dependency to a particular
-	  runner.  [ruby-core:01901], [ruby-list:38869]
+Fri Jun 25 13:09:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/ui/testrunnerutilities.rb: moved output level
-	  constants from Console.
+	* pack.c (pack_unpack): needed to initialize natint.
 
-	* lib/test/unit/ui/console/testrunner.rb: ditto.
+	* regex.c (re_compile_pattern): add start_paren to avoid too much
+	  finalization on maybe_finalize_jump.
 
-	* lib/test/unit/ui/{fox,gtk,gtk2,tk}/testrunner.rb (initialize):
-	  accept output_level.
+Fri Jun 25 13:07:20 1999  Koji Oda  <oda@bsd1.qnes.nec.co.jp>
 
-Mon Dec  8 15:03:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* missing/isinf.c: include "config.h" added.
 
-	* ext/syck/syck.c (syck_io_str_read): get rid of buffer overflow.
+Fri Jun 25 07:25:05 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Mon Dec  8 13:02:11 2003  Minero Aoki  <aamine@loveruby.net>
+	* lib/mkmf.rb: initialize $(topdir).
 
-	* lib/uri/common.rb: new method URI.regexp. [ruby-dev:22121]
+	* ext/extmk.rb.in (install_rb): install lib/*.rb properly.
 
-	* test/uri/test_common.rb: add test for URI.regexp.
+	* configure.in (linux): specifies -rpath on --enable-shared.
 
-Mon Dec  8 12:44:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in (aix): ruby.imp must reside in $(topdir).
 
-	* pack.c: define swap16 and swap32 only if they are not
-	  defined. OpenBSD defines these macros. [ruby-dev:22181]
+Thu Jun 24 19:11:29 1999  Yoshida Masato  <yoshidam@yoshidam.net>
 
-Sun Dec  7 20:54:17 2003  Tanaka Akira  <akr@m17n.org>
+	* parse.y (rb_str_extend): multi-byte identifier in expression
+	  interpolation in strings.
 
-	* ext/iconv/iconv.c (map_charset): make case sensitive.
-	  ext/iconv/charset_alias.rb (charset_alias): don't ignore
-	  config.charset's information.  sort aliases.
+	* parse.y (yylex): support multi-byte char identifiers.
 
-Sat Dec  6 22:58:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jun 24 15:27:13 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl): new function to wrap
-	  SSL_connect and SSL_accept; if SSL_connect (or SSL_accept) returned
-	  but not finished the handshake process, we should retry it.
+	* parse.y (f_arg): check duplicate argument names.
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_connect): call ossl_start_ssl.
+	* gc.c (rb_gc_mark): marking wrong member for NODE_ARGS.
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_accept): ditto.
+	* string.c (rb_str_rindex): POSITION specifies start point, not
+	  end point.
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read): allow signal traps.
+Thu Jun 24 13:00:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Dec  6 21:45:10 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* regex.c (print_mbc): wrong boundary.
 
-	* io.c (flush_before_seek): flush before seek on any platform.
+	* 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.
 
-Sat Dec  6 17:23:00 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* sprintf.c (rb_f_sprintf): should allocate proper sized buffer
+	  for float numbers.
 
-	* lib/soap/soap.rb(SOAP::Env.getenv): allow upcase environment variable
-	  as well as downcase one.
+Sat Apr 24 00:00:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/netHttpClient.rb(SOAP::NetHttpClient#proxy=): check URI.
+	* parse.y (operation): syntax like `a.[]=(1,2)' is allowed.
 
-Fri Dec  5 23:22:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 23 23:54:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises,
-	  Test::Unit::Assertions::assert_nothing_raised): use the last
-	  argument as message unless class object.
+	* io.c (argf_binmode): binmode method added to ARGF.
 
-	* test/testunit/test_assertions.rb (test_assert_raises): test for
-	  multiple exception list.  [ruby-core:01891]
+Fri Apr 23 13:55:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/testunit/test_assertions.rb (test_assert_nothing_raised): test
-	  for non-exception classes.
+	* string.c (rb_f_chomp): should assign the result to $_.  or maybe
+	  sub/gsub/chop/chomp should NOT assign $_ altogether.
 
-Fri Dec  5 22:23:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Apr 22 16:50:54 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/netHttpClient.rb: proxy support did not work.  fixed.
+	* eval.c (rb_callcc): call scope_dup() for all scopes in
+	  the interpreter stack.
 
-	* lib/soap/property.rb: add class methods for loading property from
-	  stream/file/propertyfile.  propertyfile is a file which is located at
-	  somedir in $:.
+Tue Apr 20 11:24:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/soap.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb,
-	  lib/wsdl/importer.rb: load property from propertyfile 'soap/property'
-	  e.g. /usr/local/lib/ruby/site_ruby/1.8/soap/property.
+	* string.c (rb_str_dump): `#' should be escaped.
 
-	* test/soap/test_property.rb, test/soap/test_streamhandler.rb: new file.
+Tue Apr 20 02:32:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Dec  5 17:26:23 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (parse_regx): option /p for posix match added.
 
-	* eval.c (rb_exec_end_proc): maintain tmp_end_procs.
-	  [ruby-dev:22154]
+	* re.c (rb_reg_desc): did not print options properly.
 
-Fri Dec  5 13:36:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_file_s_open): initialize was called twice.
 
-	* eval.c (rb_exec_end_proc): should not clear end_procs and
-	  ephemeral_end_procs before execution. [ruby-dev:22144]
+Mon Apr 19 18:56:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_obj_extend): call Module#extended hook after
-	  extended_object.  [ruby-list:38866]
+	* configure.in (DEFAULT_KCODE): can specify default code for
+	  $KCODE by --with-default-kcode=(euc|sjis|utf8|none).
 
-	* object.c (Init_Object): Module#extended defined.
+	* regex.c (IS_A_LETTER): a byte sequence shorter than mbc should
+	  not match with \w etc.
 
-Fri Dec  5 13:17:30 2003  Tanaka Akira  <akr@m17n.org>
+Mon Apr 19 13:49:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_pipe.rb: use IO.pipe instead of IO.popen.
+	* eval.c (eval): should restore ruby_dyna_vars.
 
-Fri Dec  5 11:54:45 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 16 21:40:43 1999  Nobuyoshi Nakada  <gea02117@nifty.ne.jp>
 
-	* ext/stringio/stringio.c (strio_read): follow IO#read.
+	* io.c (f_backquote): pipe_open may return nil.
 
-	* test/ruby/ut_eof.rb, test/ruby/test_file.rb, test/ruby/test_pipe.rb,
-	  test/stringio/test_stringio.rb: add EOF test.
+	* io.c (f_open): rb_io_open may return nil.
 
-Fri Dec  5 02:49:35 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (io_s_foreach): ditto.
 
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises):
-	  allow multiple exception list.  [ruby-core:01884]
+	* io.c (io_s_readlines): ditto.
 
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):
-	  check whether arguments are subclass of Exception.
+	* io.c (io_defset): wrong message.
 
-Thu Dec  4 23:54:00 2003  Rick Ohnemus  <rick.ohnemus@systemware.com>
+Fri Apr 16 15:09:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* dln.c (aix_loaderror): should not use member named 'errno' which
-	  might be a macro (e.g. on AIX).
+	* bignum.c (rb_str2inum): strtoul() returns long, not int.
 
-Thu Dec  4 23:32:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_load): size of VALUE and ID may be different.
 
-	* io.c (read_all): do not depend on lseek position.
-	  [ruby-dev:22026]
+	* util.c (mmprepare): int is too small to cast from pointers.
 
-Thu Dec  4 22:37:26 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* config.guess: avoid 'linux-gnu' for alpha-unknown-linux.
 
-	* eval.c (rb_eval): preserve $! value when retry happens in the
-	  rescue clause.  [ruby-talk:86697]
+Thu Apr 15 23:46:20 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Thu Dec  4 21:50:07 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.c (rubylib_mangle): mangle path by RUBYLIB_PREFIX.
 
-	* lib/drb/drb.rb (DRb::DRbMessage::send_request, send_reply):
-	  should rescue errors and re-raise DRbConnError on write too.
-	  [ruby-dev:22132]
+Wed Apr 14 23:52:51 1999  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
 
-Thu Dec  4 16:41:17 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* node.h (NODE_LMASK): should be long to avoid overflow.
 
-	* parse.y (exc_list): allow expanding list.  [ruby-dev:22134]
+Wed Apr 14 13:14:35 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
 
-Thu Dec  4 14:09:24 2003  Minero Aoki  <aamine@loveruby.net>
+	* dln.c: AIX dynamic link.
 
-	* test/fileutils/test_fileutils.rb (test_cp): test if the error is
-	  kind of SystemCallError.  It is needless details that which errno
-	  is set on each systems.
+	* ext/aix_ld.rb: ditto.
 
-Thu Dec  4 13:24:13 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Apr 14 12:19:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/monitor.rb: use Object#__send__ instead of Object#send.
+	* lib/thread.rb: Queue#{enq,deq} added.
 
-Thu Dec  4 13:17:45 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Apr 13 17:43:56 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/streamHandler.rb: support latest released version of
-	  http-access2.
+	* hash.c (rb_hash_s_create): Hash::[] acts more like casting.
 
-Thu Dec  4 13:04:44 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Apr 13 00:33:52 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/soap.rb: add SOAP::Env module for environment repository
-	  such as HTTP_PROXY.
+	* io.c (rb_io_stdio_set): warning for assignment to the variables
+	  $std{in,out,err}.
 
-	* lib/soap/property.rb: property implementation.
+Mon Apr 12 23:12:32 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/streamHandler.rb, lib/soap/wsdlDriver.rb,
-	  lib/soap/rpc/driver.rb: use soap/property.rb.
+	* io.c (rb_io_reopen): check for reopening same IO.
 
-	* lib/wsdl/importer.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb:
-	  use SOAP::Env.
+Fri Apr  9 17:45:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/netHttpClient.rb: add basic_auth, ssl_config, and cookie
-	  management interface, but ignored for now.
+	* parse.y (rb_compile_string): bug for nested eval().
 
-	* lib/xsd/charset.rb: add XSD::Charset.encoding= interface to set
-	  wiredump charset explicitly.  it was fixed to 'utf-8' when iconv or
-	  uconv module was found.
+	* regex.c (re_match): should pop non-greedy stack items on
+	  failure, after best_regs are fixed.
 
-Thu Dec  4 10:43:58 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Apr  8 17:30:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/dl/sym.c (rb_dlsym_guardcall): __declspec(noinline) is VC7
-	  feature.
+	* pack.c (PACK_LENGTH_ADJUST): need to adjust for `*' length.
 
-Thu Dec  4 10:27:12 2003  Minero Aoki  <aamine@loveruby.net>
+Tue Apr  6 23:28:44 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/net/http.rb: update hyperlink to the Japanese document.
+	* parse.y (void_check): add void context checks.
 
-Thu Dec  4 09:12:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Apr  5 12:23:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_asn1.c (asn1time_to_time): should check that
-	  the underlying value of ASN1_TIME isn't NULL. [ruby-core:01881]
+	* time.c (time_s_at): should copy gmt-mode.
 
-Thu Dec  4 08:29:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (eval_node): preserve ruby_eval_tree.
 
-	* lib/webrick/server.rb (GenericServer#start): should rescue
-	  Exception to avoid unexpected aborting. [ruby-core:01853]
+Fri Apr  2 14:00:34 1999  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
-	* lib/webrick/server.rb (GenericServer#start_thread): should check
-	  that peeraddr isn't nil before printing.
+	* lib/debug.rb: wrong command interpreting.
 
-	* lib/webrick/httpresponse.rb (HTTPResponse#start_thread): should
-	  rescue Exception to avoid unexpected aborting of thread.
+Fri Apr  2 11:46:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Dec  4 03:48:59 2003  Tanaka Akira  <akr@m17n.org>
+	* version 1.3.2
 
-	* lib/pathname.rb (Pathname#link, Pathname#symlink): obsoleted.
-	  (Pathname#make_link, Pathname#make_symlink): new method.
+Fri Apr  2 10:40:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Dec  4 01:45:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_io_s_pipe): forgot to define IO::pipe.
 
-	* io.c (argf_read): should not terminate on empty string; wait
-	  until real EOF.  [ruby-dev:21969]
+Thu Apr  1 14:40:46 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* io.c (argf_read): should adjust length to read, when length is
-	  specified and read spans command line argument files.
+	* eval.c (assign): modified for rhs change.
 
-Wed Dec  3 19:38:36 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* parse.y (stmt): unparenthesisized method calls can be right hand
+	  side expression of the assignment.
 
-	* lib/drb/drb.rb: correct fcntl parameter. [ruby-dev:22120]
+Sat Mar 27 22:42:47 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Wed Dec  3 13:49:07 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/nkf/nkf.c (rb_nkf_kconv): check size output_ctr before
+	  decrement.
 
-	* ext/tk/lib/tk.rb: 'format'==>'Kernel.format' (avoid override trouble)
+Thu Mar 25 09:11:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tkafter.rb: ditto.
+	* time.c (time_s_at): preserve gmt-mode for result.
 
-	* ext/tk/lib/tkcanvas.rb: ditto.
+	* parse.y (rb_compile_string): do not use cur_mid, use
+	  compile_for_eval instead.
 
-	* ext/tk/lib/tkdialog.rb: ditto.
+	* st.c (PTR_NOT_EQUAL): wrong logical condition.
 
-	* ext/tk/lib/tktext.rb: ditto.
+Wed Mar 24 13:06:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Dec  3 13:28:13 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (yycompile): should clear cur_mid after compilation.
 
-	* Makefile.in (lex.c): try gperf first, and copy from the source
-	  directory if failed.  [ruby-dev:22123]
+	* io.c (next_argv): need to check type for ARGV.shift.
 
-	* ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb.
+	* eval.c (blk_copy_prev): need to preserve outer scope as well as
+	  outer frames.
 
-	* lib/mkmf.rb (configuration): DLDFLAGS was duplicated.
+	* parse.y (rb_compile_string): return can appear within eval().
 
-Tue Dec  2 23:18:12 2003  Minero Aoki  <aamine@loveruby.net>
+Tue Mar 23 10:15:07 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* lib/net/http.rb: wrote the warning about HTTP_PROXY environment
-	  variable.
+	* configure.in: AC_C_CONST check added.
 
-Tue Dec  2 21:31:42 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 23 02:07:35 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* bin/testrb: new test runner.  [ruby-core:01845]
+	* time.c (time_plus): preserve gmt-mode for result.
 
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner.run,
-	  Test::Unit::AutoRunner#process_args): take test list to run and
-	  options.
+Mon Mar 22 01:32:37 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::RUNNERS,
-	  Test::Unit::AutoRunner#run): should not exit inside a library,
-	  just return the result instead.
+	* eval.c (rb_eval): adjust line numbers before expression
+	  interpolation within strings.
 
-	* lib/test/unit.rb: ditto.
+	* eval.c (rb_eval): defined? returns nil for false condition.
 
-	* test/runner.rb: exit with the test result.
+	* numeric.c (num_nonzero_p): returns nil for false condition.
 
-Tue Dec  2 20:18:48 2003  Eric Sunshine  <sunshine@sunshineco.com>
+Sat Mar 20 13:07:43 1999  Keiju Ishitsuka  <keiju@rational.com>
 
-	* configure.in (AC_PROG_YACC): AC_DEFINE(OLD_YACC) if Yacc is found
-	  instead of Bison or byacc.
+	* lib/weakref.rb: avoid leak for two weakrefs for one object.
 
-	* parse.y: If OLD_YACC is defined, ensure that YYMAXDEPTH is at least
-	  10000 (Bison's default) since some old versions of Yacc define it as
-	  low as 150 by default, which is too low for Ruby to parse some files,
-	  such as date/format.rb.  Among other issues, the parse problem causes
-	  "make test" to fail.
+Fri Mar 19 11:26:45 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Tue Dec  2 20:03:20 2003  Minero Aoki  <aamine@loveruby.net>
+	* eval.c (ruby_run): needed to eval END{} on exit.
 
-	* test/fileutils/test_fileutils.rb: check if Pathnames are usable
-	  for arguments.
+	* eval.c (rb_exit): ditto.
 
-Tue Dec  2 04:22:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Fri Mar 19 02:17:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/assertions.rb: fixed #assert_no_match message.
+	* signal.c (Init_signal): handles terminating signals HUP, TERM,
+	  QUIT, PIPE, etc.
 
-	* test/testunit/test_assertions.rb: ditto.
+Thu Mar 18 15:47:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Dec  2 00:43:00 2003  why the lucky stiff  <why@ruby-lang.org>
+	* bignum.c (rb_big_and): bug in sign calculation.
 
-	* ext/syck/syck.c: string buffering bug.  decrementing by full
-	  max_size now. [ruby-core:01834]
+	* bignum.c (rb_big_or): ditto.
 
-Mon Dec  1 21:33:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_f_select): forgot to use to_io to retrieve IO, after
+	  calling select(2).
 
-	* numeric.c (num_sadded): prohibit singleton method definition for
-	  Numerics.  fill yet another gap between Fixnum and Bignum.
+Tue Mar 16 19:54:31 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Mon Dec  1 17:33:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/extmk.rb.in: static linking cause infinite make loop.
 
-	* pack.c (htov16): converts endian using swap16. htov32(), hton16,
-	  hton32 as well. [ruby-talk:85377]
+Tue Mar 16 18:50:04 1999  Yoshida Masato  <yoshidam@yoshidam.net>
 
-	* pack.c (swap16): swap 2 bytes no matter how big short is on the
-	  platform.  swap32() is also prepared.
+	* ext/socket/socket.c (tcp_s_gethostbyname): typo, not NUM2INT(),
+	  but INT2NUM().
 
-	* numeric.c (rb_num2int): returns long to preserve information.
-	  rb_fix2int(), rb_num2uint(), rb_fix2uint() as well.
-	  [ruby-talk:85377]
+	* ext/socket/socket.c (mkhostent): ditto.
 
-	* numeric.c (rb_num2uint): should not check for value range if the
-	  source value is negative.
+Tue Mar 16 12:31:44 1999  Ryo HAYASAKA  <hayasaka@cheer.u-aizu.ac.jp>
 
-Mon Dec  1 17:14:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c (utime_internal): suppress warning by const.
 
-	* sample/optparse/opttest.rb: added.
+	* time.c (time_gmtime): ditto.
 
-Mon Dec  1 16:10:52 2003  Dave Thomas  <dave@pragprog.com>
+Tue Mar 16 10:23:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rdoc/rdoc.rb: (etc) initial merge into main tree.
+	* time.c (time_clone): Time object can be cloned.
 
-Mon Dec  1 14:17:49 2003  Minero Aoki  <aamine@loveruby.net>
+Tue Mar 16 03:13:10 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/fileutils.rb (fu_each_src_dest0): call #to_str to allow
-	  Pathname for arguments. [ruby-core:01795]
+	* ruby.c (load_file): argv[argc] should be NULL.
 
-	* test/fileutils/test_fileutils.rb: does much strict test on
-	  "same" files detecting.
+Mon Mar 15 22:12:08 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Mon Dec  1 09:28:14 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* sprintf.c (rb_f_sprintf): typo in arg_num check at exit.
 
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (XCFLAGS): re-export $(XCFLAGS).
+Mon Mar 15 16:42:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (ARCH_FLAG): export $(ARCH_FLAG) (perhaps empty value).
+	* array.c (rb_ary_dup): dup2 should copy class too.
 
-Mon Dec  1 01:03:27 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Mon Mar 15 15:12:53 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
-	* lib/mkmf.rb (TRY_LINK, link_command): added support for DLDFLAGS
-	  and ARCH_FLAG.  [ruby-dev:22085]
+	* lib/mkmf.rb: install program relative path check.
 
-Sun Nov 30 20:18:07 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Mon Mar 15 14:05:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* configure.in: keep ARCH_FLAG separate. export ARCH_FLAG.
-	  [ruby-core:01819]
+	* re.c (rb_reg_s_new): 2nd argument is now option.
+	  Regexp::EXTENDED can be specified.
 
-	* Makefile.in: add ARCH_FLAG to CFLAGS.
+Fri Mar 12 10:47:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* Makefile.in: add @CPPFLAGS@ to CPPFLAGS.
+	* string.c (rb_str_index): str.index("") should always match at
+	  offset point.
 
-	* lib/mkmf.rb (link_command, cc_command): use ARCH_FLAG.
+	* string.c (rb_str_upto): can specify end point exclusion.
 
-	* lib/mkmf.rb (configuration): add ARCH_FLAG to DLDFLAGS.
+	* string.c (rb_str_index): negative offset.
 
-	* Makefile.in: add ARCH_FLAG to DLDFLAGS.
+	* regex.c (re_match): begline should not match at the point
+	  between a newline and end-of-string.  endline neither.
 
-	* configure.in: should put getcwd in AC_CHECK_FUNCS, not
-	  AC_REPLACE_FUNCS.  [ruby-core:01826]
+	* regex.c (re_compile_pattern): context_indep_anchors .
 
-Sun Nov 30 18:22:48 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* parse.y (parse_regx): need not to push backslashes before
+	  escaped characters.
 
-	* configure.in: do not override CCDLDFLAGS, LDFLAGS, XLDFLAGS,
-	  DLDFLAGS and LDSHARED.
+	* eval.c (rb_thread_join): re-raises exception within target.
 
-	* configure.in: XCFLAGS for compiling ruby itself.  ARCH_FLAG is
-	  reflected in CFLAGS.
+Fri Mar 12 01:09:36 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/mkmf.rb: ditto.  do not import XCFLAGS from config.status.
+	* ext/readline/readline.c (readline_s_vi_editing_mode): wrong
+	  number of arguments.
 
-Sun Nov 30 17:37:36 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Mar 12 02:12:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tk.rb: bug fix [ruby-talk:86746]
+	* pack.c (PACK_ITEM_ADJUST): "a".unpack("C3") => [97, nil, nil]
 
-Sun Nov 30 13:02:00 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Mar 11 18:23:50 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* lib/soap/encodingstyle/soapHandler.rb: refactoring - Simplifying
-	  Conditional Expressions.
+	* ext/socket/socket.c (Init_socket): UDPsocket was omitted.
 
-	* lib/wsdl/soap/definitions.rb: refactoring - Move Method.
+Thu Mar 11 16:43:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/xsd/{test_noencoding.rb,noencoding.xml}: new files.  test for
-	  encoding unspecified XML file parsing.
+	* pack.c (PACK_LENGTH_ADJUST): push fixed number of items per
+	  template to result array.
 
-	* test/wsdl/{test_fault.rb,map,datetime}: new files.  test of
-	  SOAPFault, dateTime and Apache's Map.
+	* pack.c (pack_unpack): I/N/C etc. push nil in the array for "".
 
-Sun Nov 30 09:35:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar  9 00:19:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* string.c (rb_str_update): get rid of SEGV at just allocated String.
-	  [ruby-core:01812]
+	* hash.c (ruby_unsetenv): use ruby_setenv(name, 0).
 
-Fri Nov 28 23:19:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* hash.c (env_delete): ditto.
 
-	* gc.c (gc_mark): explicitly check mark recursion levels, instead
-	  of unreliable stack length.
+	* string.c (rb_str_upto): do not check `beg<end' to generate
+	  strings for the pattern like "a".upto("#a").
 
-Fri Nov 28 22:49:56 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* range.c (range_each): treat strings as special case.
 
-	* lib/rinda/rinda.rb: fix TupleSpaceProxy#read, read_all.
+	* range.c (range_each): no longer use upto for generic cases.
 
-Fri Nov 28 21:44:40 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sun Mar  7 14:21:32 1999  IKARASHI Akira  <ikarashi@itlb.te.noda.sut.ac.jp>
 
-	* test/fileutils/test_fileutils.rb (test_ln_s): should be a file, not
-	  a directory for FreeBSD.
+	* string.c (rb_str_index): wrong end point calculation.
 
-Fri Nov 28 19:37:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Mar  6 02:19:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* hash.c (env_has_value, env_index): must match exactly.
+	* re.c (match_index): MatchingData#index(n) added.
 
-	* test/ruby/test_env.rb (test_has_value, test_index): condition for
-	  aboves.
+	* array.c (rb_ary_subseq): ary[n..-1] returns an sub-array unless
+	  n is too small negative index.
 
-Fri Nov 28 17:59:20 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* re.c (rb_reg_match_method): Regexp#match(str) added.
 
-	* test/ruby/test_env.rb: add tests for ENV.
+	* array.c (rb_ary_indexes): understands ranges as indexes.
 
-Fri Nov 28 17:47:46 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* re.c (match_size): MatchingData#size added.
 
-	* lib/drb/drb.rb (DRbMessage#load): rescue Errno::* and raise
-	  DRbConnError.
+Fri Mar  5 01:04:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Nov 28 15:41:15 2003  Tanaka Akira  <akr@m17n.org>
+	* array.c (rb_ary_fill): modified for range.
 
-	* lib/pathname.rb (Pathname#realpath): obsolete the force_absolute
-	  argument.
+	* array.c (rb_ary_aset): a[n..m] revisited.
 
-Fri Nov 28 14:41:52 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Mar  4 14:23:29 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/streamHandler.rb: drop unused http parameters.
+	* string.c (rb_str_subseq): a[n..m] revisited.
 
-	* lib/soap/encodingstyle/soapHandler.rb, lib/soap/mapping/factory.rb,
-	  lib/soap/mapping/mapping.rb, lib/soap/mapping/registry.rb,
-	  lib/wsdl/soap/complexType.rb: ApacheSOAP's map support was broken
-	  under WSDL dynanic client environment.  fixed.
+	* parse.y (method_call): allow Const::method{}.
 
-	* test/wsdl/raa/*: add tests.
+	* array.c (rb_ary_replace_method): should replace original array.
 
-	* lib/xsd/datatypes.rb: dateTime precision bug fix (at least, I hope.)
-	  bug of soap4r.  XSDDateTimeImple.to_time passed a Float to
-	  Time.local/Time.gm as an usec, and NUM2LONG(rb_num2long for Float)
-	  causes rounding error.
+Thu Mar  4 02:30:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: add tests.
+	* configure.in: remove --disable-thread, thread feature is no
+	  longer optional.
 
-Fri Nov 28 04:15:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar  4 00:32:17 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
-	* eval.c (method_arity): used wrong Proc object.  [ruby-talk:86504]
+	* parse.y (read_escape): wrong arguments for scan_oct,scan_hex.
 
-Fri Nov 28 00:47:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar  3 11:51:53 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_f_exit), process.c (rb_f_exit_bang): treat true as
-	  success, false as failure.  [ruby-dev:22067]
+	* ext/socket/socket.c (Init_socket): rename class names as
+	  TCPsocket -> TCPSocket etc.
 
-	* eval.c (rb_f_abort, rb_thread_switch), process.c (rb_f_system): use
-	  ANSI macro instead of hard coded value.
+Tue Mar  2 19:46:42 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* eval.c (rb_f_exit), process.c (rb_f_exit_bang): use VALUEs not but
-	  TYPEs.
+	* configure.in (LDSHARED): use gcc -Wl,-G for solaris with gcc.
 
-Thu Nov 27 22:05:48 2003  Akinori MUSHA  <knu@iDaemons.org>
+Tue Mar  2 17:04:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c, gc.c: FreeBSD/ia64 currently does not have a way for a
-	  process to get the base address for the RSE backing store, so
-	  hardcode it for the moment.
-	  [submitted by: Marcel Moolenaar <marcel@FreeBSD.org>]
+	* parse.y (yylex): backslashes do not concatenate comment lines
+	  anymore.
 
-Thu Nov 27 17:36:42 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Mar  1 14:05:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tkafter.rb: bug fix on TkTimer#cancel_on_exception=(mode).
-	  TkTimer#wait recieves the exception of the callback.
-	  The exception is kept on @return_value.
+	* eval.c (rb_call0): adjust argv for optional arguments.  super
+	  without arguments emit superclass method with the value from
+	  optional arguments.  enabled as experiment.
 
-Thu Nov 27 16:58:48 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sun Feb 28 14:04:07 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* win32/win32.c (rb_w32_stat): remove _fullpath() for NUL: device.
+	* parse.y (nextc): backslash at the eof cause infinite loop
 
-Wed Nov 26 15:38:47 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sun Feb 28 11:01:26 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* test/fileutils/test_fileutils.rb (test_ln_s): should take the
-	  existing symbolic link for OpenBSD.
+	* time.c (make_time_t): month range check added.
 
-Wed Nov 26 04:48:42 2003  why the lucky stiff  <why@ruby-lang.org>
+Sat Feb 27 02:36:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/token.c: removed YYTOKTMP references which
-	  were causing buffer overflows on large block scalars,
-	  comments, quoted scalars and plain scalars.
+	* re.c (Init_Regexp): add escape as alias of quote.
 
-	* ext/syck/rubyext.c: dynamic changing of buffer size.
+	* re.c (rb_reg_s_quote): char-code can be specified now.
 
-	* ext/syck/syck.h: default buffer size of 4k.
+Fri Feb 26 18:45:36 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
-Wed Nov 26 00:55:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (error_print): bug for error message with newlines.
 
-	* lib/webrick/httpresponse.rb: add HTTPResponse#keep_alive=.
+Fri Feb 26 12:00:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/httpserver.rb (HTTPServer#run): should pass the
-	  request's keep_alive flag to the response.
+	* time.c (make_time_t): future check modified to allow 1969-12-31
+	  at certain timezone.
 
-Tue Nov 25 21:41:35 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* time.c (time_arg): year >= 1000 should be past.
 
-	* defines.h (ENV_IGNORECASE): should define when DOSISH without
-	  human68k. [ruby-dev:22047]
+	* version.c (Init_version): constant RELEASE_DATE added.
 
-	* hash.c (env_has_value, env_index): don't ignore case of value.
-	  [ruby-dev:22048]
+Fri Feb 26 01:08:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Nov 25 21:39:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_substr): returns nil for out-of-range access.
 
-	* file.c (path_check_1): honor sticky bits always.
-	  [ruby-talk:86273]
+	* array.c (rb_ary_subseq): returns nil for out-of-range access.
 
-Tue Nov 25 20:02:14 2003  Minero Aoki  <aamine@loveruby.net>
+	* array.c (rb_ary_store): negative index message has changed.
 
-	* test/fileutils/test_fileutils.rb: do test in more deep
-	  directory.
+	* string.c (rb_str_aset): reallocation needed.
 
-	* test/fileutils/test_nowrite.rb: ditto.
+	* string.c (rb_str_aset): allow char append to the string.
 
-Tue Nov 25 19:04:23 2003  Tanaka Akira  <akr@m17n.org>
+Thu Feb 25 23:30:17 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* lib/open-uri.rb (URI::Generic#find_proxy): ENV case sensitivity test
-	  refined.
+	* time.c (time_load): tm_year should be packed in 17 bits, not 18.
 
-Tue Nov 25 18:13:30 2003  Minero Aoki  <aamine@loveruby.net>
+Thu Feb 25 12:50:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/fileutils/test_fileutils.rb: chdir Dir.tmpdir before each
-	  test. [ruby-dev:22045]
+	* missing/dup2.c: replaced by public domain version.
 
-	* test/fileutils/test_nowrite.rb: ditto.
+	* time.c (make_time_t): add `future check' in loops.
 
-Tue Nov 25 17:52:11 2003  Tanaka Akira  <akr@m17n.org>
+	* object.c (rb_num2dbl): forbid implicit conversion from nil, or
+	  strings.  thus `Time.now + str' should raise error.
 
-	* lib/open-uri.rb (URI::Generic#find_proxy): use http_proxy under CGI
-	  if the environment variable is case sensitive.
+	* object.c (rb_Float): convert nil into 0.0.
 
-Tue Nov 25 16:41:33 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* object.c (rb_Integer): conversion method improved.
 
-	* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb:
-	  removed.  this test requires extra libraries in soap4r/1.5.*.
+Thu Feb 25 03:27:50 1999  Shugo Maeda  <shugo@netlab.co.jp>
 
-Tue Nov 25 16:24:42 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* eval.c (rb_call): should handle T_ICLASS properly.
 
-	* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license;
-	  GPL2 -> Ruby's.
+Thu Feb 25 00:04:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb,
-	  lib/soap/streamHandler.rb: add interface to streamhandler.
+	* error.c (Init_Exception): global function Exception() removed.
 
-	* lib/soap/marshal.rb: raise error if parse fails.
+	* variable.c (rb_class2name): returns "nil"/"true"/"false" for them.
 
-	* lib/soap/netHttpClient.rb: add https support.  Patched by
-	  Oliver M. Bolzer.
+	* time.c (time_dump): time marshaling format compressed size from
+	  11 bytes to 8 bytes.  thanx to tadf@kt.rim.or.jp.
 
-	* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
+	* eval.c (rb_obj_call_init): should specify arguments explicitly.
 
-	* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb,
-	  lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce
-	  using charset for parsing response from buggy server.
+Wed Feb 24 15:43:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half
-	  typed multi-ref array.
+	* parse.y (yylex): comment concatenation requires preceding space
+	  before backslash at the end of line.
 
-	* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map
-	  SOAPStruct which has multi-accessors which name are the same, to an
-	  array.
+	* io.c (rb_f_pipe): global pipe is obsolete now.
 
-	* lib/soap/rpc/element.rb: fixed illegal parameter order.
+	* object.c (Init_Object): remove true.to_i, false.to_i.
 
-	* lib/soap/rpc/element.rb: element name of response message could have
-	  the name other than 'return'.
+Tue Feb 23 14:21:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb,
-	  lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb,
-	  lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural
-	  fault definition in a operation. [ruby-talk:84948]
+	* parse.y (yylex): warn if identifier! immediately followed by `='.
 
-	* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add
-	  test for above fix.
+Tue Feb 23 12:32:41 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/wsdl/soap/complexType.rb: support WSDL array definition with
-	  maxOccures="unbound".
+	* eval.c (rb_load): tilde expansion moved to find_file.
 
-	* lib/xsd/charset.rb: use cp932 under emx.  Patched by
-	  Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
+	* eval.c (find_file): tilde expansion added.
 
-	* lib/xsd/xmlparser/parser.rb: set @charset nil by default.  Nil means
-	  'follow encoding declaration in XML'.
+Tue Feb 23 10:50:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb,
-	  sample/wsdl/googleSearch/sampleClient.rb,
-	  sample/wsdl/googleSearch/wsdlDriver.rb,
-	  test/wsdl/test_emptycomplextype.rb,
-	  test/wsdl/marshal/test_wsdlmarshal.rb,
-	  test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read }
-	  instead of File.open(...).read. [ruby-dev:21964]
+	* eval.c (require_method): require can handle multiple fnames.
 
-	* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb:
-	  simplify the test case.
+	* hash.c (rb_hash_foreach_iter): hash key may be nil.
 
-	* test/wsdl/axisArray/*: add tests for axis's array encoding.
+Mon Feb 22 17:44:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Nov 25 16:15:29 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* regex.c (re_match): should not pop failure point on success for
+	  non-greedy matches.
 
-	* ruby.h: don't treat Cygwin as Windows.
+	* io.c (Init_IO): remove global_functions getc, readchar, ungetc,
+	  seek, tell, rewind.
 
-Tue Nov 25 15:18:28 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Feb 20 22:54:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* configure.in: change default value of --enable-pthread (default: no)
+	* numeric.c (rb_num2long): no implicit conversion from boolean.
 
-Tue Nov 25 07:31:16 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb 20 09:58:42 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* parse.y (primary): allow newlines just before right argument
-	  parenthesis.  (ruby-bugs:PR#1221)
+	* numeric.c (flo_to_s): portable Infinity and NaN support.
 
-Mon Nov 24 23:32:06 2003  Tanaka Akira  <akr@m17n.org>
+Sat Feb 20 07:13:31 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* lib/open-uri.rb (OpenURI.open_loop, URI::HTTP#proxy_open): use
-	  catch/throw for redirection instead of exception.
-	  (OpenURI.open_loop, OpenURI.redirectable?): restrict redirection.
+	* io.c (rb_file_sysopen): forgot to initialize a local variable.
 
-Mon Nov 24 19:59:48 2003  Tanaka Akira  <akr@m17n.org>
+Fri Feb 19 23:05:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/open-uri.rb (URI::Generic#find_proxy): use CGI_HTTP_PROXY
-	  instead of HTTP_PROXY in the CGI environment.
+	* string.c (rb_str_subseq): range check changed.
 
-Mon Nov 24 19:32:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* marshal.c: increment MARSHAL_MINOR for Time format change.
 
-	* ext/etc/extconf.rb: check for pw_passwd in struct passwd and
-	  gr_passwd in struct group for DJGPP.
+	* time.c (time_old_load): support old marshal format.
 
-	* ext/etc/etc.c: ditto.
+	* time.c (time_load): changed for new format Y/M/D/h/m/s/usec.
 
-	* ext/Setup.dj: support for curses, etc, zlib.
+	* time.c (time_dump): marshal dump format has changed.
 
-Mon Nov 24 17:00:00 2003  Tanaka Akira  <akr@m17n.org>
+Fri Feb 19 00:25:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/open-uri.rb: validate option names.
-	  :content_length_proc and :progress_proc option implemented.
+	* time.c (time_arg): should reject "sep\0" and such.
 
-Mon Nov 24 14:53:10 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* time.c (time_plus): Time#+ should not receive Time object
+	  operand.
 
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (XCFLAGS): output empty value instead of `-DRUBY_EXPORT'.
+	* string.c (rb_str_substr): negative length raises exception now.
 
-Sat Nov 22 23:09:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* array.c (beg_len): if end == -1, it points end of the array.
 
-	* configure.in: set enable_pthread to no on MinGW.
+	* array.c (rb_ary_subseq): negative length raises exception now.
 
-Sat Nov 22 22:56:20 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Feb 18 20:57:04 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* configure.in: add --enable-pthread option (default: yes)
+	* time.c (rb_strftime): strftime() may return 0 on success too.
 
-Sat Nov 22 22:48:46 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* time.c (time_strftime): `\0' within format string should not be
+	  omitted in the result.
 
-	* ext/tk/lib/tk.rb: add Tk.grab_release and fix bug of TkComposite
+	* time.c (rb_strftime): zero length format.
 
-	* ext/tk/lib/tkafter.rb: bug fix of TkAfter#start
+	* time.c (time_to_a): yday start with 1 now.
 
-	* ext/tk/sample/tkcombobox.rb: new sample script
+	* time.c (time_zone): support for long timezone name.
 
-	* ext/tcltklib/tcltklib.c: add native thread check
+	* time.c (time_yday): yday start with 1 now.
 
-Sat Nov 22 18:49:47 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* time.c (time_minus): minus calculation was wrong.
 
-	* ext/curses/curses.c (window_nodelay): nodelay() of NetBSD's
-	  libcruses returns no value, just like keypad().
+	* time.c (time_minus): sec, usec should be at least `long', maybe
+	  they should be `time_t'.
 
-Sat Nov 22 17:36:36 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* time.c (time_plus): addition with float was wrong.
 
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (HAVE_GETCWD): output to config.h.
+	* time.c (time_to_s): support for long timezone name.
 
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (XCFLAGS): output to config.status.
+	* time.c (time_gm_or_local): too far future check moved.
 
-Sat Nov 22 13:10:10 2003  Minero Aoki  <aamine@loveruby.net>
+	* time.c (time_arg): treat 2 digit year as 69-99 => 1969-1999,
+	  00-68 => 2000-2068
 
-	* lib/fileutils.rb (have_st_ino?): djgpp has valid st_ino.
+Thu Feb 18 03:56:47 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Nov 22 11:28:48 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* missing/fnmatch.c: moved to missing directory.
 
-	* gc.c (Init_stack): stack region is far smaller than usual if
-	  pthread is used.
+Wed Feb 17 16:22:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Nov 22 07:30:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* struct.c (rb_struct_alloc): actual initialization now be done in
+	  `initialize'.
 
-	* lib/test/unit/util/backtracefilter.rb: fixed a bug that occurred
-	  when an exception had no backtrace.
+Wed Feb 17 09:47:15 1999  okabe katsuyuki  <hgc02147@nifty.ne.jp>
 
-	* test/testunit/util/test_backtracefilter.rb: ditto.
+	* regex.c (re_search): use mbclen() instead of ismbchar().
 
-Fri Nov 21 16:44:18 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* re.c (rb_reg_s_quote): should handle mbchars properly.
 
-	* ext/tk/lib/tkentry.rb: fix the encoding trouble of percent
-	  substitutions on validatecommand option of TkEntry widget
+Wed Feb 17 01:25:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tk.rb: fix bug on {pack|grid}_propagate() method
+	* parse.y (yylex): stop comment concatenation by backslash follows
+	  after >= 0x80 char.  may cause problem with Latin chars.
 
-Fri Nov 21 16:12:11 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* eval.c (error_print): exception in rb_obj_as_string() caused
+	  SEGV. protect it by PUSH_TAG/POP_TAG.
 
-	* ruby.1: Fix markups and grammar.
+	* error.c (exc_exception): `Exception#exception' should return self.
 
-Fri Nov 21 14:49:42 2003  Minero Aoki  <aamine@loveruby.net>
+Wed Feb 17 01:12:22 1999  Hirotaka Ichikawa  <hirotaka.ichikawa@tosmec.toshiba.co.jp>
 
-	* ruby.1: wrote about ruby related environment variables.
+	* configure.in: BeOS patch.
 
-Fri Nov 21 12:28:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Feb 16 14:25:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (w_extended): singleton methods should not be checked
-	  when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
+	* regex.c (re_compile_pattern): should reallocate mbc space for
+	  character class unless current_mbctype is ASCII.
 
-Fri Nov 21 01:40:00 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Feb 15 15:48:30 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* configure.in: check <pthread.h>
+	* configure.in: specify `-Wl,-E' only for GNU ld.
 
-	* ruby.h: include pthread.h if existence.
-	  define is_ruby_native() macro when not HAVE_NATIVETHREAD
+Mon Feb 15 11:43:22 1999  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
 
-	* eval.c: undef is_ruby_native() function when not HAVE_NATIVETHREAD
+	* array.c (rb_inspecting_p): should return Qfalse.
 
-Fri Nov 21 00:43:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Sun Feb 14 22:36:40 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* lib/test/unit/assertions.rb: use #__send__ instead of #send.
+	* sprintf.c (rb_f_sprintf): `%G' was omitted.
 
-	* lib/test/unit/testcase.rb: ditto.
+Sun Feb 14 12:47:48 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-Thu Nov 20 19:19:22 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* numeric.c (Init_Numeric): allow divide by zero on FreeBSD.
 
-	* configure.in: don't find the Cygwin's pthread library on MinGW.
+	* numeric.c (Init_Numeric): FloatDomainError added.
 
-Thu Nov 20 19:15:50 2003  Minero Aoki  <aamine@loveruby.net>
+	* configure.in (AC_REPLACE_FUNCS): add checks for functions
+	  isinf, isnan, and finite.
 
-	* lib/fileutils.rb (have_st_ino?): emx (OS/2 with EMX) does not
-	  have st_ino (always 0). [ruby-dev:21972]
+Sat Feb 13 01:24:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/fileutils.rb (rename_cannot_overwrite_file?): emx does not
-	  allow overwriting files by rename(2).
+	* eval.c (rb_thread_create_0): should protect th->thread.
 
-	* test/fileutils/test_fileutils.rb: windows? ->
-	  have_drive_letter?, have_file_perm?
+Fri Feb 12 16:16:47 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
-Thu Nov 20 17:50:58 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* string.c (rb_str_inspect): wrong mbc position.
 
-	* ext/tk/sample/tkballoonhelp.rb: new sample script
+Fri Feb 12 16:21:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/sample/tkmultilistbox.rb: ditto
+	* eval.c (rb_thread_fd_close): 
 
-	* ext/tk/sample/tktextframe.rb: ditto
+	* io.c (rb_io_fptr_close): tell scheduler that fd is closed.
 
-Thu Nov 20 13:37:34 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* io.c (rb_io_reopen): ditto.
 
-	* ruby.h: define is_ruby_native_thread() for no native thread
-	  environment
+	* io.c (READ_CHECK): check if closed after thread context switch.
 
-	* eval.c: ditto
+	* ext/socket/socket.c (bsock_close_read): do not check
+	  the return value from shutdown(2).
 
-Thu Nov 20 12:42:47 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/socket/socket.c (bsock_close_write): ditto.
 
-	* configure.in: always check existence of the pthread library
+	* ext/socket/socket.c (sock_new): need to dup(fd) for close_read
+	  and close_write.
 
-	* ruby.h: define macros for ruby's native thread check
+	* parse.y (here_document): handle newlines within #{}.
 
-	* eval.c: add ruby's native thread check
+	* regex.h: should replace symbols for ruby.
 
-	* gc.c: ditto
+Fri Feb 12 00:46:28 1999  Shugo Maeda  <shugo@netlab.co.jp>
 
-Wed Nov 19 14:45:18 2003  Minero Aoki  <aamine@loveruby.net>
+	* marshal.c (r_object): should update the method name in message.
 
-	* lib/net/http.rb (to_ary): print more friendly warning message.
+	* marshal.c (w_object): limit should be converted into Fixnum.
 
-Wed Nov 19 14:32:08 2003  Minero Aoki  <aamine@loveruby.net>
+Wed Feb 10 15:20:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/fileutils.rb (fu_same?): add djgpp and wince.
+	* regex.c (re_match): empty pattern should not cause infinite
+	  pattern match loop.
 
-	* lib/fileutils.rb (cannot_overwrite_file?): add wince.
+	* regex.c (re_compile_pattern): RE_OPTIMIZE_ANCHOR for /.*/, not
+	  for /(.|\n)/.
 
-Wed Nov 19 11:04:47 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* numeric.c (fix_pow): `fixnum**nil' should raise TypeError.
 
-	* lib/fileutils.rb (cannot_overwrite_file?, have_st_ino?): bccwin32
-	  is same as mswin32.
+	* bignum.c (rb_big_pow): need to normalize results.
 
-Wed Nov 19 07:54:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Wed Feb 10 01:42:41 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* lib/test/unit.rb: do not run tests if $! is set.
+	* numeric.c (fix_pow): `(5**1).type' should be Integer.
 
-	* lib/test/unit/assertionfailederror.rb: extend StandardError instead
-	  Exception (irb catches the former but not the latter).
+Tue Feb  9 01:22:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Nov 18 23:31:36 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* parse.y (yylex): do not ignore newlines in mbchars.
 
-	* missing/memmove.c (memmove): take void *, not char *.
+	* io.c (rb_file_s_open): mode can be specified by flags like
+	  open(2), e.g. File::open(path, File::CREAT|File::WRONLY).
 
-	* missing.h (memmove): ditto.
+	* io.c (rb_f_open): bit-wise mode flags for pipes
 
-	* missing.h (strchr, strrchr): return char *, not int.
+	* io.c (Init_IO): bit flags for open.
 
-Tue Nov 18 22:20:10 2003  Minero Aoki  <aamine@loveruby.net>
+Sat Feb  6 22:56:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/fileutils.rb (fu_same?): temporal fix for windows.
+	* string.c (rb_str_sub_bang): should not overwrite match data by
+	  regexp match within the block.
 
-Tue Nov 18 19:05:04 2003  Minero Aoki  <aamine@loveruby.net>
+	* string.c (rb_str_gsub_bang): ditto.
 
-	* lib/fileutils.rb (fu_same?): check by inode instead of path
-	  name, to detect two hard links pointing to the same content.
+Sat Feb  6 03:06:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/fileutils.rb: did not create correctly looped symlinks.
+	* re.c (match_getter): accessing $~ without matching caused SEGV.
 
-Tue Nov 18 18:23:05 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Feb  5 22:11:08 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* ext/stringio/stringio.c (strio_read): behave as IO at empty string.
-	  [ruby-dev:21939], [ruby-dev:21941]
+	* parse.y (yylex): binary literal support, like 0b01001.
 
-	* ext/stringio/stringio.c (strio_getc, strio_getline): set EOF flag.
+	* parse.y (yylex): octal numbers can contain `_'s.
 
-	* ext/stringio/stringio.c (strio_rewind, strio_seek, strio_ungetc):
-	  clear EOF flag.
+	* parse.y (yylex): warns if non-octal number follows immediately
+	  after octal literal.
 
-	* test/stringio/test_stringio.rb: imported from [ruby-dev:21941].
+	* parse.y (yylex): now need at least one digit after prefix such
+	  as 0x, or 0b.
 
-Tue Nov 18 14:06:35 2003  Minero Aoki  <aamine@loveruby.net>
+	* bignum.c (rb_str2inum): recognize binary numbers like 0b0101.
 
-	* lib/fileutils.rb (fu_each_src_dest): raise if src==dest.
-	  [ruby-talk:85344] [ruby-core:01699]
+Fri Feb  5 03:26:56 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
-	* lib/fileutils.rb: use Object#is_a? instead of Class#=== to allow
-	  e.g. remote objects for receivers.
+	* ruby.c (proc_options): -e without program prints error.
 
-	* lib/fileutils.rb: FileTest -> File.
+Fri Feb  5 00:01:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/fileutils.rb: put parentheses for arguments of File.xxxx?
+	* parse.y (terms): needed to clear heredoc_end.
 
-	* test/fileutils/test_fileutils.rb (test_cp): test "cp a a".
+	* numeric.c (flo_div): allow float division by zero.
 
-	* test/fileutils/test_fileutils.rb (test_mv): test "mv a a".
+Thu Feb  4 11:56:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/fileutils/test_fileutils.rb (test_ln): test "ln a a".
+	* missing/strtod.c: for compatibility.
 
-	* test/fileutils/test_fileutils.rb (test_ln_s): test "ln_s a a".
+	* configure.in (strtod): add strtod compatible check.
 
-	* test/fileutils/test_fileutils.rb (test_install): test "install a a".
+	* numeric.c (rb_num2long): missing/vsnprintf.c does not support
+	  floating points.
 
-	* test/fileutils/fileasserts.rb: new method assert_symlink.
+	* numeric.c (flo_to_s): ditto.
 
-	* test/fileutils/fileasserts.rb: assert_is_directory -> assert_directory.
+Wed Feb  3 23:02:12 1999  Yoshida Masato  <yoshidam@yoshidam.net>
 
-Mon Nov 17 19:38:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (re_compile_pattern): use ismbchar() to get next char.
 
-	* file.c (getcwdofdrv): avoid using getcwd() directly, use
-	  my_getcwd() instead.
+	* regex.c (re_search): wrong mbchar shift.
 
-	* merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
-	  <sunshine@sunshineco.com>.  [ruby-core:01596]
+	* re.c (rb_reg_search): needed to reset $KCODE after match.
 
-Mon Nov 17 10:50:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (re_compile_fastmap): mbchars should match with \w.
 
-	* lib/optparse.rb (OptionParser::Completion::complete): allow least
-	  common completion for three or more candidates.
+Wed Feb  3 22:35:12 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-Mon Nov 17 09:41:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (yylex): too big float raise warning, not error.
 
-	* lib/test/unit/ui/tk/testrunner.rb,
-	  lib/test/unit/ui/gtk/testrunner.rb:
-	  run GUI main loop in sub thread.
+Tue Feb  2 23:41:42 1999  Yoshida Masato  <yoshidam@yoshidam.net>
 
-	* lib/test/unit/ui/gtk2/testrunner.rb: imported from rough.
+	* regex.c (re_match): wrong boundary.
 
-	* lib/test/unit/autorunner.rb (keyword_display): sort keywords.
+	* regex.c (IS_A_LETTER): re_mbctab[c] may not be 1 for mbc.
 
-Sun Nov 16 18:10:57 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (re_search): mbchar support for shifting ranges.
 
-	* eval.c (rb_eval): iterator should return value from next inside
-	  begin/rescue/end.  (ruby-bugs:PR#1218)
+	* regex.c (MBC2WC): wrong conversion.
 
-Sun Nov 16 13:26:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Feb  3 15:03:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (w_object): LINK check earlier than anything else,
-	  i.e. do not dump TYPE_IVAR for already dumped objects.
-	  (ruby-bugs:PR#1220)
+	* parse.y (parse_regx): need to escape parens if terminators are
+	  not any kind of parenthesis.
 
-	* eval.c (rb_eval): call "inherited" only when a new class is
-	  generated; not on reopening.
+	* parse.y (parse_qstring): ditto.
 
-	* eval.c (eval): prepend error position in evaluating string to
-	  "mesg" attribute string only when it's available and is a
-	  string.
+	* parse.y (parse_string): ditto.
 
-Sun Nov 16 12:16:10 2003  Minero Aoki  <aamine@loveruby.net>
+Tue Feb  2 17:11:26 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* lib/net/protocol.rb: logging response body. [experimental]
-	  [ruby-list:38800]
+	* string.c (rb_str_gsub_bang): too small realloc condition.
 
-Sun Nov 16 10:49:38 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Mon Feb  1 10:01:17 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* lib/thread.rb (Thread.exclusive): wrap method definition in
-	  class Thread to enable rdoc to process.
+	* parse.y (yylex): range check for the float literal.
 
-Sun Nov 16 09:45:23 2003  Minero Aoki  <aamine@loveruby.net>
+Sat Jan 30 18:34:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/net/http.rb (set_debug_output): warn if method is called
-	  after #start.  [ruby-dev:38798]
+	* ruby.c (usage): -h option to show brief command description.
 
-Sun Nov 16 04:41:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jan 30 08:45:16 1999  IKARASHI Akira  <ikarashi@itlb.te.noda.sut.ac.jp>
 
-	* eval.c (eval): do not re-raise exception to avoid unnecessary
-	  exception copying, instead modify exception and internal
-	  information to adjust eval().
+	* lib/cgi-lib.rb: cookie support added.
 
-	* eval.c (backtrace): can return the current frame information
-	  only if lev < -1.
+Sat Jan 30 13:38:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Nov 15 22:16:42 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* regex.c (re_compile_pattern): mbchars should match with \w
+	  within character class.  Was matching with \W.
 
-	* /ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext):
-	  refine error message.
+	* regex.c (re_match): \w should match with multi byte characters,
+	  not its first byte.
 
-Sat Nov 15 10:05:40 2003  Tanaka Akira  <akr@m17n.org>
+Sat Jan 30 10:06:41 1999  Yoshida Masato  <yoshidam@yoshidam.net>
 
-	* lib/open-uri.rb (OpenURI.open_loop, OpenURI::HTTP#proxy_open):
-	  refactored to support options.
-	  (Buffer): maintain size by this class.
+	* re.c (rb_reg_s_new): UTF-8 flag handle (/u, /U).
 
-Sat Nov 15 07:40:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* re.c (rb_kcode): $KCODE handle for UTF-8.
 
-	* eval.c (rb_method_node): new API to retrieve method body.
+Sat Jan 30 01:51:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Nov 14 13:21:30 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* array.c (rb_ary_delete_if): RTEST() missing.
 
-	* ext/tcltklib/tcltklib.c: fix (en-bugged at 2003/11/07)
+	* hash.c (delete_if_i): ditto.
 
-	* ext/tk/lib/tkdialog.rb: TkDialog.new accepts a parent widget
-	  argument [ruby-talk:85066]
+	* enum.c (Init_Enumerable): select (=find_all), detect (=find)
+	  added as aliases.
 
-Thu Nov 13 20:53:35 2003  Tanaka Akira  <akr@m17n.org>
+Fri Jan 29 21:32:19 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* lib/open-uri.rb (Kernel[#.]open): hard coded URI schemes removed.
-	  [ruby-ext:02251]
+	* hash.c (rb_f_setenv): SEGV caused by small typo.
 
-Thu Nov 13 19:17:00 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Jan 29 00:15:58 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/ui/tk/testrunner.rb: use grid and panedwindow
-	  (if available)
+	* lib/parsedate.rb (parsedate): support date format like
+	  23-Feb-93, which is required by HTTP/1.1.
 
-Thu Nov 13 17:56:41 2003  Tanaka Akira  <akr@m17n.org>
+	* variable.c (find_class_path): avoid calling rb_iv_set().
 
-	* lib/open-uri.rb (OpenURI.open_uri): use File::RDONLY.
-	  reported by Take_tk <ggb03124@nifty.ne.jp>.
-	  [ruby-ext:02245]
+	* eval.c (backtrace): do not need to modify $SAFE internally.
 
-Thu Nov 13 16:45:53 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* variable.c (classname): inline __classid__ access.
 
-	* ext/openssl/ossl_x509req.c (ossl_x509req_to_der): add function for
-	  X509::Request#to_der.
+	* eval.c (THREAD_ALLOC): needed to initialize wrapper.
 
-Thu Nov 13 11:31:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/ftools.rb (makedirs): allows slash at the end of the path.
 
-	* lib/optparse.rb (OptionParser::Completion#complete): prior shorter
-	  name to containing longer name.
+	* numeric.c (rb_fix_induced_from): ensure result to be Fixnum.
 
-Thu Nov 13 06:08:54 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Jan 28 17:31:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tk.rb: stop freezing some classes
+	* numeric.c (flo_to_s): float format changed to "%16.10g".
 
-	* ext/tk/lib/multi-tk.rb: ditto.
+Thu Jan 28 02:13:11 1999  Yoshinori Toki  <toki@freedom.ne.jp>
 
-Wed Nov 12 17:32:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_store): expand allocated buffer by 3/2.
 
-	* lib/test/unit/assertions.rb (assert_throws, assert_nothing_thrown):
-	  uncaught throw in sub thread raises ThreadError.
+Wed Jan 27 17:50:02 1999  Kazuhiro HIWADA  <hiwada@kuee.kyoto-u.ac.jp>
 
-	* lib/test/unit/ui/tk/testrunner.rb (setup_ui): "expand" is not
-	  necessary.
+	* bignum.c (dbl2big): raised error if double is too big to cast
+	  into long.  check added.
 
-Wed Nov 12 14:09:43 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Jan 27 03:16:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/monitor/test_monitor.rb: fix the timing problem by Queue.
+	* variable.c (rb_mod_const_at): can't list constants of the
+	  untainted objects in safe mode.
 
-Wed Nov 12 12:59:44 2003  Shugo Maeda  <shugo@ruby-lang.org>
+	* class.c (method_list): can't list methods of untainted objects
+	  in safe mode.
 
-	* test/monitor/test_monitor.rb: added.
+Tue Jan 26 02:40:41 1999  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
 
-Wed Nov 12 10:14:28 2003  Shugo Maeda  <shugo@ruby-lang.org>
+	* prec.c: Precision support for numbers.
 
-	* lib/monitor.rb: refactored. Thanks, Gennady Bystritsky.
+Thu Jan 21 19:08:14 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Nov 12 06:11:39 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (rb_f_raise): calls `exception' method, not `new'.
 
-	* ext/openssl/ossl.c (ossl_x509_sk2ary, ossl_x509crl_sk2ary):
-	  add functions to convert STACK into Array.
+	* error.c (exc_exception): renamed from `new'.
 
-	* ext/openssl/ossl.h: add prototypes.
+Wed Jan 20 03:39:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_set_certificates,
-	  ossl_pkcs7_get_certificates, ossl_pkcs7_get_crls,
-	  ossl_pkcs7_set_crls): add functions for PKCS7#certificates=
-	  PKCS7#certificates, PKCS7#crls= and PKCS7#crls.
+	* parse.y (yycompile): rb_in_compile renamed to ruby_in_compile.
 
-Wed Nov 12 00:47:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* ruby.c (load_file): define DATA if __END__ appeared in script.
 
-	* lib/test/unit/ui/testrunnermediator.rb: should require 'test/unit'.
+Tue Jan 19 14:57:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Nov 11 23:54:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* parse.y (here_document): need to protect lex_lastline.
 
-	* lib/test/unit/ui/gtk/testrunner.rb: added a rescue clause to handle
-	  the case when the requested font is not available.
+	* parse.y (yylex): disable %//, %'', %``.
 
-Tue Nov 11 22:44:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jan 19 05:01:16 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* io.c (appendline): file may not end with newline.  a bug if
-	  READ_DATA_PENDING_PTR is defined. [ruby-talk:84925]
+	* array.c (beg_len): round range value too much.
 
-Tue Nov 11 10:42:41 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Jan 18 13:02:27 1999  Kuroda Jun  <jkuro@dwe.co.jp>
 
-	* ext/tk/lib/tk.rb: raise an exception when creating TkWindow
-	  object, because TkWindow class is an abstract class.
+	* hash.c (env_keys): strchr() may return NULL.
 
-Tue Nov 11 03:30:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Jan 18 17:51:47 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/ext/openssl/ossl_conf.c (ossl_config_get_value): return nil
-	  if the specified value doesn't exist.
+	* instruby.rb (wdir): install libruby.a in archdir.
 
-	* lib/ext/openssl/ossl_conf.c (ossl_config_get_section): return
-	  a empty hash if the specified section doesn't exist.
+	* lib/ftools.rb (install): removes file before installing.
 
-Mon Nov 10 11:40:29 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Mon Jan 18 16:55:31 1999  MAEDA shugo  <shugo@aianet.ne.jp>
 
-	* lib/monitor.rb (wait): return true on signal/broadcastfalse and
-	  false on timeout. Thanks Gennady Bystritsky.
+	* eval.c (rb_callcc): experimental continuation support.
 
-Mon Nov 10 00:07:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jan 17 19:45:37 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* parse.y (primary): primary_value may be 0 when syntax error.
-	  [ruby-talk:84893]
+	* pack.c (pack_pack): nil packing caused SEGV.
 
-Sun Nov  9 02:05:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Sat Jan 16 13:18:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/assertions.rb: un-deprecated #assert_not_nil to
-	  maintain symmetry with #assert_nil. Also added better output for
-	  #assert_kind_of.
+	* string.c (rb_str_concat): character (fixnum) can be append to
+	  strings
 
-	* test/testunit/tc_assertions.rb: ditto.
+	* array.c (rb_ary_unshift): unshift returns array.
 
-Sat Nov  8 18:50:20 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Jan 16 01:39:19 1999  Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp>
 
-	* test/wsdl/raa/*: add new testcase for WSDL loading, parsing and
-	  reading.
+	* string.c (rb_str_split_method): UTF-8 support.
 
-	* test/soap/marshal/*: backport from soap4r/1.5.1.  all differences are
-	  for ruby/1.6.
+	* regex.c: UTF-8 support.
 
-	* lib/soap/*: backport from soap4r/1.5.1.  all differences are for
-	  ruby/1.6.
+Thu Jan 14 00:42:55 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/wsdl/data.rb, lib/wsdl/xmlSchema/data.rb: move definition of
-	  ArrayTypeAttrName from ::WSDL::XMLSchema::* to ::WSDL::*.
-	  [ruby-talk:84813]
+	* string.c (rb_str_gsub_bang): forget to add offset for null match.
 
-	* lib/wsdl/soap/definitions.rb: element name typo in custom exception
-	  struct definition which is needed for wsdlDriver; camelCase ->
-	  underscore_name.
+	* eval.c (rb_thread_local_aset): can't modify in tainted mode.
 
-Sat Nov  8 13:49:50 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* hash.c (env_each_key): avoid generating temporary array.
 
-	* configure.in: improvement of pthread check
+Wed Jan 13 23:58:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Nov  8 13:28:46 2003  Takaaki Tateishi  <ttate@ttsky.net>
-	* ext/dl/sym.c: Add DL.win32_last_error and DL.last_error.
-	  Thanks, Kaoru Shirai.
+	* hash.c (rb_f_setenv): name and value can be tainted.
 
-Sat Nov  8 06:19:38 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Jan  6 02:42:08 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tcltklib/tcltklib.c: To fix 'pthread-enabled Tcl/Tk' problem,
-	  TclTkIp#_eval calls Tcl_Eval() on the mainloop thread only
-	  (queueing a handler to the EventQueue).
+	* bignum.c (Init_Bignum): forgot to define Bignum#===.
 
-	* ext/tcltklib/README.1st: edit the description of '--with-pthread-ext'
+	* gc.c (gc_sweep): if add_heap() is called during GC, objects on
+	  allocated heap page(s) are not marked, should not be recycled.
 
-Fri Nov  7 23:23:04 2003  Tanaka Akira  <akr@m17n.org>
+	* gc.c (gc_sweep): should refer latest freelist.
 
-	* lib/pathname.rb (Pathname#+): if self or the argument is `.', return
-	  another.
-	  (Pathname#parent): if self is `.', return `..'.
-	  (Pathname#children): if self is `.', don't prepend self for a
-	  pathname in a result.
-	  (Pathname#join): re-implemented using Pathname#+.
-	  (Pathname#find): if self is `.', remove `./' prefix of yielding
-	  pathname.
+	* gc.c (id2ref): modified to support performance patch.
 
-Fri Nov  7 10:23:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (rb_obj_id): performance patch (no bignum for id).
 
-	* ext/socket/socket.c (make_hostent): get rid of SEGV on aliases
-	  lookup failure.  (ruby-bugs:PR#1215)
+Tue Jan  5 01:56:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Nov  7 04:08:05 2003  UENO Katsuhiro  <katsu@blue.sky.or.jp>
+	* config.guess: merge up-to-date from autoconf 2.12.
 
-	* ext/zlib/zlib.c (Init_zlib): define Zlib::GzipReader#each_line as
-	  an alias of Zlib::GzipReader#each.
+	* array.c (rb_ary_join): avoid calling rb_protect_inspect() till
+	  it is really needed.
 
-Fri Nov  7 01:03:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* object.c (rb_obj_inspect): show detailed information for the
+	  instance variables (infinite loop can avoid now).
 
-	* eval.c (rb_load): save and restore rb_prohibit_interrupt.
-	  [ruby-dev:21857]
+	* struct.c (rb_struct_inspect): avoid infinite loop.
 
-Thu Nov  6 18:05:07 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jan  3 01:37:58 1999  Takao KAWAMURA  <kawamura@ike.tottori-u.ac.jp>
 
-	* io.c (rb_io_inspect): show the path also at a closed file.
-	  [ruby-dev:21851]
+	* misc/ruby-mode.el (ruby-end-of-defun): moved too much.
 
-Thu Nov  6 11:42:07 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* misc/ruby-mode.el (ruby-mode-variables): set paragraph-separator
+	  for the mode.
 
-	* ext/stringio/stringio.c (strio_set_string, strio_reopen): check
-	  tainted.
+	* misc/ruby-mode.el: proper font-lock for `def' and `nil' etc.
 
-	* ext/stringio/stringio.c (strio_copy, strio_ungetc, strio_write,
-	  strio_putc): add infection.
+Sat Jan  2 17:09:06 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/stringio/stringio.c (strio_path): just nil.  [ruby-dev:21846]
+	* eval.c (rb_jump_tag): new api to invoke JUMP_TAG.  tag values
+	  can obtained from rb_eval_string_protect()/rb_load_protect().
 
-	* ruby.c (proc_options): reserve searched script path in the
-	  source file name table.  [ruby-list:38765]
+	* eval.c (rb_rescue): now catches all exceptions but SystemExit.
 
-	* lib/optparse.rb (OptionParser::Completion#complete): default not to
-	  ignore case on completion.  [ruby-talk:84726]
+	* eval.c (rb_eval_string_protect): eval string with protection.
 
-	* win32/win32.c (make_cmdvector): process backslashes even if a quote
-	  is not enclosed.
+	* eval.c (rb_load_protect): load file with protection.
 
-Wed Nov  5 23:49:45 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* io.c (rb_io_puts): avoid infinite loop for cyclic arrays.
 
-	* sample/openssl/gen_csr.rb: there (at least) is a CA which does not
-	  accept DN in UTF8STRING format.  it's a sample.
+	* eval.c (rb_thread_local_aref): thread local hash tables.
 
-Wed Nov  5 22:55:16 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* object.c (rb_equal): check exact equal before calling `=='.
 
-	* configure.in, eval.c, signal.c: : add '--with-pthread-ext'
-	  option to fix the pthread trouble on 'tcltklib'
+Thu Dec 31 22:28:53 1998  MAEDA shugo  <shugo@aianet.ne.jp>
 
-	* ext/tcltklib/README.1st: add the description of '--with-pthread-ext'
+	* eval.c (rb_f_require): feature names should be provided with
+	  DLEXT extension.
 
-	* ext/tk/lib/tktext.rb : add TkText#text_copy, text_cut, text_paste
-	  to support Tcl/Tk8.4's tk_textCopy, tk_textCut, tk_textPaste
+	* marshal.c (Init_marshal): need to provide `marshal.so'.
 
-	* ext/tk/lib/tk.rb : add TkMenu#set_focus support Tcl/Tk's
-	  tk_menuSetFocus
+Wed Dec 30 02:29:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Nov  5 17:33:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* variable.c (classname): do not call rb_ivar_set().
 
-	* eval.c (rb_load): allow interrupt during loaded program
-	  evaluation.  [ruby-dev:21834]
+	* eval.c (ruby_run): finalizers were called too early.
 
-	* hash.c (rb_hash_fetch): always warn if default argument and a
-	  block are supplied at the same time. [ruby-dev:21842]
+Fri Dec 25 12:19:30 1998  Fukuda Masaki  <fukuda@wni.co.jp>
 
-	* hash.c (env_fetch): ditto.
+	* gc.c (rb_gc_mark): should not return on FL_EXIVAR.
 
-	* array.c (rb_ary_fetch): ditto.
+Fri Dec 25 11:56:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Nov  5 19:08:47 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_mark): proper scanning for temporary region.
 
-	* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
-	  do not remove next argument if empty value is placed.
+	* eval.c (TMP_ALLOC): protection for C_ALLOCA was broken.
 
-	* test/optparse: added.
+Thu Dec 24 18:26:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Nov  5 17:05:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* development version 1.3 released.
 
-	* lib/test/unit/ui/gtk/testrunner.rb: typo.
+Thu Dec 24 00:17:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Nov  5 11:13:32 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (rb_load): top self should be set properly.
 
-	* string.c: add #include "version.h". this file still depends on it.
+	* variable.c (classname): check __classpath__ if it is defined.
 
-	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
-	  wince/Makefile.sub: add version.h dependency to string.c.
+	* variable.c (classname): invalid warning at -v with static linked
+	  ruby interpreter.
 
-Wed Nov  5 09:14:23 2003  Shugo Maeda  <shugo@ruby-lang.org>
+	* eval.c (is_defined): modified for expr::Const support.
 
-	* lib/monitor.rb: revert to the previous revision.
+	* eval.c (rb_eval): invoke method expr::Const if expr is not class
+	  nor module.
 
-Wed Nov  5 08:39:51 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (primary): enable expr::identifier as method
+	  invocation.
 
-	* lib/webrick/https.rb (HTTPRequest#parse): set @client_cert_chain.
+Wed Dec 23 03:04:36 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/https.rb (HTTPRequest#meta_vars): create
-	  SSL_CLIENT_CERT_CHAIN_n from @client_cert_chain.
+	* regex.c (re_match): avoid too many loop pops for (?:..).
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_get_peer_cert_chain): return nil
-	  if no cert-chain was given.
+Tue Dec 22 18:01:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Nov  4 23:44:48 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* experimental version 1.1d1 released.
 
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
-	  remove needless version.h dependency.
+Mon Dec 21 01:33:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Nov  4 23:38:43 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (TMP_PROTECT): add volatile to ensure GC protection.
 
-	* class.c, hash.c, string.c: remove #include "version.h".
+	* string.c (rb_str_gsub_bang): calculate buffer size properly.
 
-	* Makefile.in: remove needless version.h dependency.
+	* parse.y (lex_get_str): needed to return Qnil at EOS.
 
-Tue Nov  4 06:54:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (find_file): check policy modified, raise exception
+	  immediately for tainted load_path.
 
-	* io.c (read_all): fptr->f may be NULL, if IO is closed in the
-	  signal handler.
+	* hash.c (rb_f_setenv): do not depend on setenv() nor putenv().
 
-	* io.c (io_read): ditto.
+Thu Dec 17 06:29:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* string.c (get_pat): remove 1.8.0 warning code.
+	* ext/tk/tkutil.c (tk_s_new): use rb_obj_instance_eval(), instead
+	  of rb_yield_0().
 
-	* string.c (rb_str_match): extend warning until 1.8.2.
+	* eval.c (rb_f_require): forgot to call find_file in some cases.
 
-	* string.c (rb_str_match2): ditto.
+	* eval.c (rb_f_require): `require "feature.so"' to load dynamic
+	  libraries.  old `require "feature.o"' is still OK.
 
-	* class.c (class_instance_method_list): remove 1.8.0 warnings.
-	  method_list now recurs.  [ruby-dev:21816]
+	* eval.c (rb_eval): yield without value dumped core.
 
-	* class.c (rb_obj_singleton_methods): ditto.
+Wed Dec 16 16:28:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* array.c (rb_ary_select): remove select with block.
-	  [ruby-dev:21824]
+	* experimental version 1.1d0 (pre1.2) released.
 
-	* hash.c (rb_hash_select): ditto.
+Wed Dec 16 10:43:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* hash.c (env_select): ditto.
+	* regex.c (re_search): bound check before calling re_match().
 
-	* re.c (match_select): ditto.
+Tue Dec 15 13:59:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* struct.c (rb_struct_select): ditto.
+	* error.c (exc_to_s): returns class name for unset mesg.
 
-Mon Nov  3 22:53:21 2003  Minero Aoki  <aamine@loveruby.net>
+	* error.c (exc_initialize): do not initialize @mesg by "".
 
-	* lib/racc/parser.rb: synchronize with Racc 1.4.4.
+	* parse.y (nextc): __END__ should handle CR+LF newlines.
 
-	* ext/racc/cparse/cparse.c: ditto.
+Wed Dec  9 13:37:12 1998  MAEDA shugo  <shugo@aianet.ne.jp>
 
-	* ext/racc/cparse/cparse.c (parse_main): should abort when
-	  the length of LR state stack <=1, not ==0.
+	* pack.c (encodes): use buffering for B-encoding.
 
-Mon Nov  3 08:50:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* pack.c (pack_pack): Q-encoding by 'M'.
 
-	* process.c (check_uid_switch): remove duplicated error messages.
+Tue Dec  8 14:10:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* process.c (check_gid_switch): ditto.
+	* variable.c (generic_ivar_get): any object can have instance
+	  variables now.  great improvement.
 
-Sun Nov  2 02:28:33 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* variable.c (rb_name_class): do not set __classpath__ by default,
+	  use __classid__ instead.
 
-	* lib/webrick/ssl.rb: new option :SSLExtraChainCert.
+Mon Dec  7 22:08:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Nov  2 01:02:04 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* ruby.h (struct RFile): IO objects can have instance variables now.
 
-	* string.c (rb_str_hash): Update the HASH_PERL alternative hash
-	  algorithm in sync with Perl 5.8.
+	* parse.y (primary): allows `def obj::foo; .. end'.
 
-	* st.c (strhash): Ditto.
+Mon Dec  7 18:24:50 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-Sat Nov  1 18:21:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ruby.c (set_arg0): $0 support for HP-UX.
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_peer_cert_chain): add new method
-	  SSLSocket#peer_cert_chain.
+Mon Dec  7 01:30:28 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/openssl/ossl_x509req.c (GetX509ReqPtr): new function
-	  which returns underlying X509_REQ.
+	* dln.c (dln_strerror): better error messages on win32.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_issuer_cert,
-	  ossl_x509extfactory_set_subject_cert, ossl_x509extfactory_set_crl,
-	  ossl_x509extfactory_set_subject_req, ossl_x509extfactory_set_config):
-	  use underlying C struct without duplication not to leak momory.
+Sat Dec  5 23:27:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Nov  1 01:49:03 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* parse.y (here_document): indentable here-doc delimiter by
+	  `<<-'.  Proposed by Clemens <c.hintze@gmx.net>.  Thanks.
 
-	* lib/soap/mapping/factory.rb: mark marshalled basetype objects when
-	  @allow_original_mapping is true.  multi-referencing basetype node is
-	  prohibited in SOAP/1.1 encoding but soap4r's original ruby object
-	  mapping requires basetype to be marked to detect self referencing
-	  loop.  e.g. o = 1; o.instance_eval { @iv = o }  soap4r's original
-	  mapping is only used through soap/marshal API.
+Thu Dec  3 16:50:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/soap/marshal/test_marshal.rb: add tests for self referencing
-	  immutable objects.
+	* ext/extmk.rb.in (realclean): trouble on install.
 
-	* test/soap/calc/test_calc_cgi.rb: fix test name.
+Sun Nov 29 22:25:39 1998  Takaaki Tateishi  <ttate@jaist.ac.jp>
 
-Fri Oct 31 22:26:29 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+	* process.c (f_exec): check number of argument.
 
-	* wince/string_wce.c (strrchr): should decrement pointer.
+Thu Nov 26 17:27:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* wince/Makefile.sub: correct a range of isdigit().
+	* version 1.1c9 released.
 
-Fri Oct 31 12:55:24 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Nov 25 13:07:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* configure.in, lib/mkmf.rb: add RPATHFLAG for NetBSD.
-	  [ruby-dev:21791]
+	* string.c (rb_str_dup): do not copy additional data (STR_NO_ORIG).
 
-	* bcc32/Makefile.sub, win32/Makefile.sub, win32/Makefile.sub: ditto.
+	* parse.y (yycompile): reduce known memory leak (hard to remove).
 
-Fri Oct 31 01:38:14 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Nov 25 03:41:21 1998  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)
+	* st.c (st_init_table_with_size): round size up to prime number.
 
-Fri Oct 31 01:02:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Nov 21 23:27:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* compar.c (cmp_equal): protect exceptions from <=> comparison
-	  again.  returns nil if any exception or error happened during
-	  comparison.
+	* hash.c (rb_hash_aset): reduce copying key strings.
 
-	* eval.c (search_required): should update *featurep when DLEXT2 is
-	  defined. (ruby-bugs-ja:PR#581)
+	* gc.c (looks_pointerp): declare as inline function if possible.
 
-Thu Oct 30 23:41:04 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* st.c (PTR_NOT_EQUAL): compare hash values first before calling
+	  comparing function.
 
-	* lib/drb/drb.rb: add DRbArray
+	* st.c (ADD_DIRECT): save hash value in entries to reduce hash
+	  calculation.
 
-	* lib/drb/invokemethod.rb: fix Hash#each problem. [ruby-dev:21773]
+	* string.c (rb_str_gsub_bang): avoid rb_scan_args() to speed-up.
 
-	* lib/drb/unix.rb: add LoadError. [ruby-dev:21743]
+	* string.c (rb_str_sub_bang): ditto.
 
-Thu Oct 30 23:19:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Nov 21 18:44:06 1998  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
 
-	* lib/soap/generator.rb: better XML pretty printing.
+	* time.c (time_s_now): had memory leak.
 
-	* lib/soap/encodingstyle/soapHandler.rb: remove unnecessary namespace
-	  assignment in the element which has "encodingStyle" attribute, and
-	  add necessary namespace assignment for "arrayType" attribute.
+	* ext/md5/md5init.c (md5_new): had memory leak.
 
-	* test/soap/calc/test_calc_cgi.rb: take over $DEBUG to ruby process
-	  through CGI.
+	* ext/md5/md5init.c (md5_clone): ditto.
 
-Thu Oct 30 22:59:39 2003  why the lucky stiff  <why@ruby-lang.org>
+Fri Nov 20 23:23:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/yaml2byte.c: HASH const too long.  Thanks, matz.
+	* lib/delegate.rb: do not propagate hash and eql?.
 
-Thu Oct 30 19:13:53 2003  Akinori MUSHA  <knu@iDaemons.org>
+Thu Nov 19 01:40:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/MANIFEST: Add yamlbyte.h.
+	* sample/ruby-mode.el (ruby-expr-beg): failed to find reserved
+	  word boundary.
 
-Thu Oct 30 14:25:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_eval): avoid calling `concat' method.  calls
+	  rb_ary_concat() directly for efficiency.
 
-	* io.c (READ_DATA_BUFFERED): new macro to detect whether stdio
-	  buffer filled.
+	* eval.c (rb_eval): actual rest arguments extended arrays too much.
 
-	* io.c (rb_io_fptr_cleanup): move path deallocation to
-	  rb_io_fptr_finalize (finalizer called by GC).
+Wed Nov 18 14:30:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct 30 13:23:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* class.c (rb_define_global_function): global functions now be
+	  module function of the Kernel.
 
-	* parse.y (logop): left may be NULL. [ruby-talk:84539]
+Wed Nov 18 10:48:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_eval): NODE_CASE nd_head may be NULL.
+	* io.c (read_all): SEGV on large files.
 
-Thu Oct 30 10:14:51 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Nov 17 18:11:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/autorunner.rb: make fox runner work.
+	* version 1.1c8 released.
 
-Thu Oct 30 09:32:26 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov 17 16:58:47 1998  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]
+	* parse.y (arg): assignment to attribute name start with capital
+	  should be allowed.
 
-Thu Oct 30 02:46:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (thread_alloc): needed to mark terminated threads too.
 
-	* 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]
+Tue Nov 17 12:33:48 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
 
-Thu Oct 30 02:25:48 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/extmk.rb.in (create_makefile): Set `libdir' to `@libdir@',
+	  Set `pkglibdir' to `$libdir/$(RUBY_INSTALL_NAME)'.
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
-	  add new method to inherit @sync from @io.sync.
+Tue Nov 17 10:30:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): no need to
-	  set sync flag explicitly.
+	* sprintf.c (f_sprintf): %l%%c -> %%l%c
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): call super.
+Tue Nov 17 01:08:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): set extra chain
-	  certificates in @extra_chain_cert.
+	* parse.y (ret_args): distinguish `a' and `*a' for the arguments
+	  of yield and return.
 
-Wed Oct 29 22:02:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* eval.c (rb_eval): flip3 should work like sed.
 
-	* test/drb/drbtest.rb: use rbconfig.rb to make the path of ruby
-	  interpreter to exec, instead of test/ruby/envutil.rb,
+	* eval.c (rb_eval): flip{2,3} now have independent state for each
+	  scope to work fine with thread.
 
-Wed Oct 29 19:58:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Nov 16 23:26:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tcltklib/tcltklib.c (CONST84): define CONST84 when it is not
-	  defined and TCL_MAJOR_VERSION >= 8.
+	* parse.y (primary): exec else clause if no exception raised.
 
-	* ext/tcltklib/tcltklib.c (VwaitVarProc, WaitVariableProc,
-	  rb_threadVwaitProc): use CONST84 instead of CONST.
+Sun Nov 15 15:44:07 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_rbTkWaitCommand,
-	  ip_rb_threadTkWaitCommand): use CONST84 always.
+	* ext/extmk.rb.in (install): bug in target.
 
-Wed Oct 29 17:27:05 2003  Tanaka Akira  <akr@m17n.org>
+Sat Nov 14 11:02:05 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
 
-	* re.c (rb_reg_s_union, Init_Regexp): new method `Regexp.union'.
+	* Makefile.in (install): Give the argument `$(DESTDIR)' to
+	  `instruby.rb'.
 
-	* lib/pathname.rb (realpath): examine Dir.pwd because it may have
-	  symlinks.
+	* instruby.rb: Recognize ARG[0] as `destdir'.
 
-Wed Oct 29 17:16:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* instruby.rb: Give the argument `destdir' to `extmk.rb'.
 
-	* eval.c (rb_longjmp): must not disturb original jump.
-	  [ruby-dev:21733]
+	* ext/extmk.rb.in: Recognize ARG[1] as `$destdir'.
 
-Wed Oct 29 15:28:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* instruby.rb: Create the installation directories (bindir, libdir,
+	  archdir, pkglibdir, archdir, and mandir) under `destdir', and
+	  install all files under there.
 
-	* eval.c (Init_Proc): taint preallocated exception object
-	  sysstack_error. [ruby-talk:84534]
+	* ext/extmk.rb.in: Likewise.
 
-Wed Oct 29 11:27:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Nov 14 10:56:55 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
 
-	* parse.y (ret_args): node may be NULL. [ruby-talk:84530]
+	* instruby.rb: Add the variable `pkglibdir'.
 
-Tue Oct 28 15:20:12 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* instruby.rb: Set the variable `libdir' to `$(libdir)', not
+	  `$(libdir)/$(ruby_install_name)'. `libruby.so' and `libruby.so.LIB'
+	  are installed at `libdir'.
 
-	* 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.
+	* instruby.rb: Set the variable `archdir' to `$(pkglibdir)/$(arch)'.
 
-Mon Oct 27 19:19:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Nov 13 19:43:29 1998  KIMURA Koichi  <kbk@kt.rim.or.jp>
 
-	* eval.c (rb_longjmp): ignore reentering error while warning.
-	  [ruby-dev:21730]
+	* missing/nt.c (SafeFree): wrong free offset.
 
-Mon Oct 27 00:23:50 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Nov 12 20:11:53 1998  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_ruby): bug fix on Win : hang-up when
-	  calling 'exit' in the Tk callback procedure. [ruby-list:38656]
+	* sample/ruby-mode.el: wrong highlight.
 
-Sat Oct 25 09:18:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (parse_regx): newline in regexp was ignored.
 
-	* eval.c (rb_method_missing): protect exception from within
-	  "inspect".  (ruby-bugs:PR#1204)
+Wed Nov 11 10:54:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Oct 24 23:26:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (here_document): <<'FOO' should not escape anything.
 
-	* hash.c (rb_hash_each): Hash#each should yield single value.
-	  [ruby-talk:84420]
+	* parse.y (here_document): bare << here-doc available, even though
+	  it's deprecated.
 
-	* hash.c (env_each): ditto for ENV.each.
+	* file.c (rb_file_s_readlink): return value should be tainted.
 
-Thu Oct 23 20:25:32 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/etc/etc.c (setup_passwd): information (eg. GCOS name) should
+	  be tainted (modified at Perl Conference).
 
-	* lib/webrick/server.rb (GenericServer#start): should rescue
-	  IOError from IO::accept. [ruby-dev:21692]
+Tue Nov 10 00:22:11 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-Thu Oct 23 17:59:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: elf support for FreeBSD 3.x
 
-	* eval.c (ruby_cleanup): initialize stack bottom for embedding.
-	  [ruby-dev:21686]
+Tue Nov 10 00:05:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/dl/extconf.rb: move list of files to clean from DEPEND file,
-	  to get rid of macro redefinitions.
+	* parse.y (yylex): here document available in eval.
 
-Thu Oct 23 13:44:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Nov  9 17:55:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* parse.y: integrate operations for stack_type.  [ruby-dev:21681]
+	* version 1.1c7 released.
 
-Thu Oct 23 00:41:45 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Nov  6 19:25:27 1998  Takao KAWAMURA  <kawamura@ike.tottori-u.ac.jp>
 
-	* test/soap/calc/*, test/soap/helloworld/*: set logging threshold
-	  to ERROR.
+	* sample/ruby-mode.el: font-lock patch.
 
-Wed Oct 22 12:53:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Nov  5 15:42:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
-	  ignore tests which raised LoadError.
+	* sample/README, lib/README: simple description for each file.
 
-	* test/drb/drbtest.rb, test/ruby/test_beginendblock.rb,
-	  test/ruby/test_system.rb: avoid requiring same file twice.
+Wed Nov  4 18:14:19 1998  Yukihiro Matsumoto  <matz@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.
+	* eval.c (assign): attribute assignment should be called as public.
 
-Wed Oct 22 02:31:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov  3 23:36:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (ruby_cleanup): should not ignore exit_value in END
-	  execution. [ruby-dev:21670]
+	* string.c (rb_str_dump): dumps core for negative char value.
 
-Tue Oct 21 23:16:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (re_compile_pattern): out of boundary access for empty
+	  regexp.
 
-	* eval.c (ruby_cleanup): call finalizers and exit procs before
-	  terminating threads.
+Mon Nov  2 22:54:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (ruby_cleanup): preserve ruby_errinfo before ruby_finalize_0().
+	* string.c (rb_str_aset): `str[str]' replaces first match.
 
-Tue Oct 21 15:57:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Nov  2 18:24:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
-	  prepend the directory of target file to the load path.
+	* eval.c (thread_create): was accessing modified status.
 
-Tue Oct 21 15:08:53 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Nov  1 01:18:52 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* win32/win32.c (do_spawn, do_aspawn): should wait child process even
-	  if callded with P_OVERLAY.
+	* gc.c (xrealloc): size 0 needs round up to 1.
 
-	* win32/win32.c (do_spawn, do_aspawn): should return child's exit
-	  status to parent.
+Sat Oct 31 23:18:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Oct 21 00:35:02 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* string.c (rb_str_split_method): negative LIMIT means number of
+	  split fields are unlimited, as in perl.
 
-	* test/soap/calc/*, test/soap/helloworld/*: catch the exception from
-	  test server thread and recover.
+	* string.c (rb_str_split_method): if LIMIT is unspecified,
+	  trailing null fields are stripped.
 
-Tue Oct 21 00:22:57 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Oct 31 04:16:14 1998  Inaba Hiroto  <inaba@st.rim.or.jp>
 
-	* test/drb/*: import drb/runit.
+	* string.c (str_aref): regexp index SEGVed.
 
-Mon Oct 20 23:55:47 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Oct 30 14:33:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_eval): set current node after arguments evaluation.
-	  [ruby-dev:21632]
+	* re.c (reg_match): returns nil for unmatch.
 
-	* eval.c (rb_yield_0): set current node and keep it at local jump.
+	* dir.c (dir_entries): new method.
 
-Mon Oct 20 22:01:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (block_pass): do not push block, substitute it.
 
-	* eval.c (rb_thread_cleanup): keep thread group for main thread.
-	  [ruby-dev:21644]
+Fri Oct 30 01:28:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Oct 20 18:28:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* range.c (range_check): avoid <=> check for Fixnums.
 
-	* eval.c (rb_catch): backout.
+	* array.c (rb_ary_aset): accept negative index.
 
-Mon Oct 20 17:31:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Oct 28 22:00:54 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (PUSH_FRAME): generate unique number to be TAG_JUMP()
-	  destination.
+	* regex.c (re_match): access out of boundary fixed.
 
-	* eval.c (localjump_destination): use unique number in ruby_frame
-	  for localjump destination.
+Wed Oct 28 11:37:42 1998  TAMITO  <tommy@valley.ne.jp>
 
-Mon Oct 20 11:31:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (f_select): fd number comparison bug.
 
-	* test/ruby/test_signal.rb (test_signal): restore old trap.
+Tue Oct 27 23:07:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Oct 20 11:00:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* sample/ruby-mode.el (ruby-parse-region): forgot to support %w()
+	  style array literal.
 
-	* gc.c (gc_sweep): loosen page free condition to avoid add_heap()
-	  race condition. [ruby-dev:21633]
+	* eval.c (rb_eval): unused block raises warning.
 
-	* gc.c (gc_sweep): do not update malloc_limit when malloc_increase
-	  is smaller than malloc_limit.
+Mon Oct 26 09:37:53 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Oct 20 09:45:12 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (dvar_asgn_push): dvar pushed too many times if
+	  variable-in-block first appear in loops.
 
-	* lib/debug.rb (debug_command): remove debug print.
+Sun Oct 25 22:59:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct 20 00:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (set_list_bits): was using wrong offset.
 
-	* eval.c (search_required): required name must not be changed before
-	  loading.  [ruby-dev:24492]
+Thu Oct 22 00:07:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct 19 13:12:30 2003  Tanaka Akira  <akr@m17n.org>
+	* eval.c (rb_obj_method): method retrieved from tainted object
+	  should be tainted too.
 
-	* lib/pathname.rb (foreachline, dir_foreach): add obsolete warning.
+	* eval.c (method_call): safe_level should be restored during
+	  Method#call.
 
-Sun Oct 19 00:14:22 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Oct 21 14:21:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/soap/calc/*, test/soap/helloworkd/*: changed port# of test
-	  server. (17171)
+	* io.c (Init_IO): new constants IO::SEEK_{SET,CUR,END}.
 
-Sat Oct 18 23:01:32 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* io.c (rb_f_ungetc): ungetc pushes a char back into STDIN.
 
-	* missing/acosh.c (DBL_MANT_DIG): typo fix(ifdef -> ifndef).
+Mon Oct 19 11:50:00 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
 
-Sat Oct 18 05:48:59 2003  why the lucky stiff  <why@ruby-lang.org>
+	* ext/extmk.rb: Load '@top_srcdir@/lib/find.rb', not
+	  '../lib/find.rb'.
 
-	* ext/syck/rubyext.c: YAML::Syck::compile method.
+	* ext/extmk.rb: Distinguish between `top_srcdir' and `topdir'.
 
-	* ext/syck/syck.c: Buffer edge bug.
+	* Makefile.in (CFLAGS): Add `-I.'.
 
-	* ext/syck/yaml2byte.c: YAML to bytecode converter.
+	* Makefile.in (lex.c): Give `@srcdir@/keywords' to gperf, not
+	  `keywords'.
 
-	* ext/syck/yamlbyte.h: Ditto.
+	* instruby.rb: Use `CONFIG["bindir"]', instead of `prefix + "/bin"'.
 
-	* ext/syck/bytecode.c: Bytecode parser fixes to empty collections
-	  and empty strings.
+	* instruby.rb: Use `CONFIG["libdir"]', instead of `prefix + "/lib"'.
 
-	* ext/syck/token.c: Ditto.
+	* instruby.rb Use `CONFIG["mandir"]', instead of `prefix + "/man"'.
 
-Fri Oct 17 23:07:38 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* instruby.rb (wdir): Add the variable to preserve the current
+	  working directory.
 
-	* 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.
+	* instruby.rb: Chdir to wdir before install `config.h' and
+	  `rbconfig.rb'.
 
-Fri Oct 17 23:00:30 2003  Akinori MUSHA  <knu@iDaemons.org>
+Mon Oct 19 10:07:01 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* lib/generator.rb: Add rdoc documentation.
+	* eval.c (rb_eval): reduce recursive calls to rb_eval().
 
-Fri Oct 17 22:16:42 2003  Akinori MUSHA  <knu@iDaemons.org>
+Fri Oct 16 15:31:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/set.rb: Reword and fix Overview.
+	* time.c (time_new_internal): timeval must be positive.
 
-	* lib/set.rb: It is not necessary to require
-	  'test/unit/ui/console/testrunner'.
+Thu Oct 15 13:54:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Oct 17 11:15:22 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (arg): local variables can be accessed within right side
+ 	  expression in assignment, notably in blocks.
 
-	* test/ruby/test_range.rb: added.
+Wed Oct 14 00:18:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* MANIFEST: add test/ruby/test_range.rb.
+	* array.c (Init_Array): Array#=== is now for equal check, not
+	  inclusion check.
 
-Fri Oct 17 03:21:23 2003  William Sobel  <will.sobel@barra.com>
+	* parse.y (when_args): `when a, *b' style new syntax for array
+	  expansion in `case'.
 
-	* ext/socket/socket.c (make_hostent): h_aliases may be NULL.
-	  (ruby-bugs:PR#1195)
+Tue Oct 13 14:30:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/socket/socket.c (sock_s_gethostbyaddr): ditto.
+	* object.c (rb_obj_untaint): taint marks can be unset.
 
-Fri Oct 17 00:12:41 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_eval): taint propagation for embedded strings.
 
-	* ext/tk/lib/tk.rb: (bug fix) instance variable @frame was used
-	  without initializing on TkComposite module.
+Mon Oct 12 13:27:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct 16 23:51:04 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (rb_call0): check stack depth more frequently.
 
-	* 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.
+Mon Oct 12 08:08:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct 16 17:09:19 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_p): can print even in secure mode.
 
-	* lib/debug.rb (DEBUGGER__::Context::debug_command): do not call
-	  debug_silent_eval() when $1 is not set. (ruby-bugs:PR#1194)
+Sun Oct 11 22:50:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct 16 16:54:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* variable.c (rb_const_set): taint check for modification.
 
-	* string.c (rb_str_upto): ("a"..."a").to_a should return [].
-	  [ruby-core:01634]
+	* variable.c (rb_ivar_set): taint check for modification.
 
-Thu Oct 16 16:40:51 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* string.c (rb_str_modify): taint check for modification.
 
-	* ext/tk/lib/tk.rb:
-	  Add Tk::EncodedString and Tk::UTF8_String class to support
-	  characters using the \uXXXX escape to the UNICODE string.
+	* hash.c (rb_hash_modify): taint check for modification.
 
-	* ext/tk/sample/{demos-en,demos-jp}/unicodeout.rb
-	  new demo-scripts (samples of Tk::UTF8_String)
+	* array.c (rb_ary_modify): taint check for modification.
 
-	* ext/tk/sample/{demos-en,demos-jp}/widget
-	  add entries for 'unicodeout.rb'
+	* ruby.h (FL_TAINT): taint for all objects, not only strings.
 
-Thu Oct 16 08:38:06 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Oct  9 17:01:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/digest/test_digest.rb (test_eq): show failed class.
+	* io.c (read_all): read() returns "" at immediate EOF.
 
-	* test/ruby/test_iterator.rb (test_break, test_return_trace_func):
-	  test localjump destination.
+	* io.c (io_read): read(nil) read all until EOF.
 
-Wed Oct 15 20:22:31 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Oct  8 13:32:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/netHttpClient.rb: use URI::HTTP#request_uri instead of
-	  instance_eval('path_query').  [ruby-list:38575]
+	* time.c (time_dump): marshal can dump Time object now.
 
-Wed Oct 15 17:24:45 2003  URABE Shyouhei  <root@mput.dip.jp>
+	* marshal.c (Init_marshal): rename marshal methods `_dump_to' to
+ 	  `_dump', `_load_from' to `_load'.
 
-	* lib/cgi.rb (CGI::Cookie): tiny typo fix.
+	* parse.y (rb_intern): "+=".intern generates proper symbol.
 
-Wed Oct 15 15:00:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct  5 18:31:53 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (ruby_run): just return FAILURE instead of parse error
-	  count.  [ruby-list:38569]
+	* version 1.1c6 released.
 
-Wed Oct 15 13:17:02 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Oct  2 14:22:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/digest/digest.c (rb_digest_base_alloc): need to initialize
-	  buffer. [ruby-dev:21622]
+	* regex.c (re_search): `/\s*(--)$/ =~ "- --"' did not match,
+	  because of wrong optimize condition.
 
-Wed Oct 15 11:23:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Oct  1 01:55:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (w_object): dump extended modules as well.
+	* parse.y (rb_intern): should not raise exceptions.
 
-	* 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 (yylex): symbol like `:foo?=' should not be allowed.
 
-Wed Oct 15 09:30:34 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/extmk.rb.in: makes *.a for static link modules.
 
-	* ext/enumerator/enumerator.c (enumerator_each): avoid VC++ warning.
+Wed Sep 30 14:13:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/syck.h: include stdio.h for definition of FILE.
+	* eval.c (rb_thread_start): supports making a subclass of the
+	  Thread class.
 
-Wed Oct 15 08:09:07 2003  why the lucky stiff  <why@ruby-lang.org>
+Tue Sep 29 17:46:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/bytecode.c: Checkin of YAML bytecode support.
+	* eval.c (rb_thread_join): join is now an instance method.
 
-	* ext/syck/gram.c: Ditto.
+Fri Sep 25 12:01:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/syck.c: Ditto.
+	* parse.y (yylex): `@foo!' should be an error.
 
-	* ext/syck/token.c: Ditto.
+Thu Sep 24 14:55:06 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* ext/syck/handler.c: Ditto.
+	* ext/etc/etc.c (Init_etc): wrong field definition.
 
-	* ext/syck/handler.c: Now using 'tag' rather than 'taguri' in type URIs.
+Thu Sep 17 17:09:05 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/rubyext.c: Ditto (on both counts).
+	* io.c (io_reopen): was creating FILE* for wrong fd.
 
-Wed Oct 15 05:05:53 2003  Akinori MUSHA  <knu@iDaemons.org>
+Tue Sep 15 05:28:11 1998  Koji Arai  <JCA02266@nifty.ne.jp>
 
-	* lib/generator.rb: A new library which converts an internal
-	  iterator to an external iterator.
+	* regex.c (re_compile_pattern): forgot to fixup for the pattern
+ 	  like (?=(A)|(B)).
 
-	* lib/abbrev.rb: A new library which creates an abbreviation table
-	  from a list.
+Tue Sep 15 01:06:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct 15 04:31:51 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* io.c (rb_io_gets_internal): do not set $_ by default, only
+	  gets/readline set the variable.
 
-	* ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb :
-	  new demo-scripts
+	* eval.c (rb_f_load): load toplevel class is set to anonymous
+	  module if safe_level >= 5, to encapsulate modification.
 
-	* ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget :
-	  add entries for 'entry3.rb'
+	* eval.c (rb_f_load): set frame properly.
 
-Wed Oct 15 04:31:47 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* string.c (rb_str_each_line): do not set $_.
 
-	* test/digest/test_digest.rb: Moved from ext/digest/test.rb.
+Mon Sep 14 14:42:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct 15 03:53:20 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* regex.c (re_match): beginning and end of the string, do not
+	  automatically match `\b'.
 
-	* ext/tk/lib/tk.rb: fixed trouble on auto-load Tcl commands (enbug
-	  on the last commit).
+	* string.c (scan_once): consume at least on character.
 
-Wed Oct 15 00:25:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (re_search): wrong behavior for negative range.
 
-	* parse.y (yylex): argument parentheses preceded by spaces should
-	  be warned; not error.  [ruby-talk:84103]
+Sat Sep 12 21:21:26 1998  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Wed Oct 15 00:20:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* regex.c (re_search): range value should be maintained.
 
-	* ext/tcltklib/tcltklib.c: replace Tcl/Tk's vwait and tkwait to
-	  switch on threads smoothly and avoid seg-fault.
+Thu Sep 10 10:55:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* 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.)
+	* parse.y (backref_error): yyerror does not understand formats.
 
-	* ext/tk/lib/multi-tk.rb: support TclTkIp._thread_vwait and
-	  _thread_tkwait.
+Tue Sep  8 18:05:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* 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).
+	* version 1.1c5 released.
 
-	* 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.
+Tue Sep  8 10:03:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tk.rb: improve of accessing Tcl/Tk's special variables.
+	* string.c (str_each_line): wrong line splitting with newline at
+ 	  top of the string.
 
-	* ext/tk/lib/tkafter.rb: support 'wait on a thread' and 'wait on
-	  an eventloop'.
+	* string.c: non bang methods return copied string.
 
-Wed Oct 15 00:10:24 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* eval.c (f_END): needed to initialize frame->argc;
 
-	* lib/soap/baseData.rb: Introduce SOAPType as the common ancestor of
-	  SOAPBasetype and SOAPCompoundtype.
+Fri Sep  4 11:27:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/generator.rb, lib/soap/element.rb, lib/soap/encodingstyle/*:
-	  Encoding methods signature change.  Pass SOAPGenerator as a parameter.
+	* bignum.c (bigadd): proper sign combination.
 
-	* 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.  :-)
+	* regex.c (re_search): wrong return value for \A.
 
-	* lib/soap/rpc/standaloneServer.rb: Set severity threshould to INFO.
-	  DEBUG is too noisy.
+Thu Sep  3 14:08:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/xsd/datatypes.rb: DateTime#of is obsoleted.  Use DateTime#offset.
+	* version 1.1c4 released.
 
-	* test/wsdl/emptycomplextype.wsdl, test/xsd/xmlschema.xml: Avoid
-	  useless warning.
+Tue Sep  1 10:47:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Oct 14 19:09:35 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (slow_search): do not compare llen and blen.  llen may
+	  be longer than blen, if little contains 0xff.
 
-	* eval.c (ruby_finalize_0): return the given exit status unless
-	  SystemExit got raised.
+	* regex.c (mbctab_euc): set 0x8e as multibyte character.
 
-Tue Oct 14 11:53:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (str_inspect): mask character for octal output.
 
-	* intern.h (ruby_stop): never return.
+Mon Aug 31 15:32:41 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ruby.h (ruby_run): ditto.
+	* regex.c (re_search): use calculated offset if exactn is the
+	  first opcode in the compiled regexp.
 
-Tue Oct 14 04:43:55 2003  Tanaka Akira  <akr@m17n.org>
+	* regex.c (bm_search): use Boyer-Moore search for simple search.
 
-	* lib/pathname.rb (realpath): make ELOOP check bit more robust.
-	  (children): prepend self by default.
-	  (chroot): obsoleted.
+	* regex.c (must_instr): wrong length check if pattern includes
+	  byte escape by 0xff.
 
-Tue Oct 14 02:29:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (re_compile_pattern): need not to check current_mbctype.
 
-	* eval.c (rb_require_safe): segfault after loading .so.
+Sat Aug 29 16:31:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Oct 14 02:05:23 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* eval.c (rb_check_safe_str): avoid calling rb_id2name() in normal 
+	  cases to speed-up.
 
-	* ext/Setup*, ext/enumerator/*: Add ext/enumerator, a helper
-	  module for the Enumerable interface.
+	* eval.c (thread_raise): do not save context of terminated thread.
 
-Mon Oct 13 23:55:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* regex.c (re_compile_pattern): mask \nnn over 256.
 
-	* test/ruby/envutil.rb: use Config::CONFIG["ruby_install_name"],
-	  not "ruby".
+Sat Aug 29 02:09:46 1998  Koji Arai  <JCA02266@nifty.ne.jp>
 
-Mon Oct 13 23:57:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* sprintf.c (f_sprintf): wrong buffer size check.
 
-	* eval.c (rb_feature_p): match by classified suffix.
+Fri Aug 28 01:57:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_require_safe): require library in the specified safe
-	  level.
+	* regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
 
-	* variable.c (rb_autoload, rb_autoload_load): restore safe level
-	  when autoload was called.  [ruby-dev:21338]
+Fri Aug 28 12:25:33 1998  Hiroshi Igarashi  <igarashi@ueda.info.waseda.ac.jp>
 
-	* intern.h: prototypes; rb_require_safe.
+	* ruby.c (ruby_require_modules): load modules in appearing order.
 
-	* test/runner.rb: accept non-option arguments.
+Fri Aug 28 01:57:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Oct 13 20:49:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
 
-	* string.c (str_new4): should not preserve FL_TAINT status in the
-	  internal shared string. [ruby-dev:21601]
+Thu Aug 27 12:54:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* string.c (rb_str_new4): ditto.
+	* version 1.1c3 released.
 
-	* eval.c: use EXIT_SUCCESS and EXIT_FAILURE for exit values.
+Wed Aug 26 14:40:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* process.c: ditto. [ruby-list:38521]
+	* eval.c (rb_eval): check whether ruby_class is properly set,
+	  before accessing it.
 
-Mon Oct 13 19:51:02 2003  Koji Arai  <jca02266@nifty.ne.jp>
+	* eval.c (rb_obj_instance_eval): ruby_class should be Qnil for
+	  special objects like Fixnums.
 
-	* lib/debug.rb (debug_command): should enter emacs mode when
-	  assigned any value to the environment variable "EMACS".
-	  On Meadow, (getenv "EMACS") is "meadow".
+	* ext/tkutil/tkutil.c (Init_tkutil): removes calls to
+	  rb_yield_0().  used instance_eval() instead in the tk.rb.
 
-Sun Oct 12 14:45:03 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Aug 26 11:47:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/win32ole/extconf.rb: check "windows.h", not "windows".
-	  [ruby-talk:84051]
+	* regex.c (re_match): pop non-greedy stack elements on success.
 
-Sat Oct 11 20:41:03 2003  Corinna Vinschen  <corinna@vinschen.de>
+Wed Aug 26 09:25:35 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* file.c (eaccess): Use access(2) on Cygwin.
+	* ruby.h: add #define environ for cygwin32.
 
-Sat Oct 11 17:09:21 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Tue Aug 25 08:57:41 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/rexml/quickpath.rb (REXML::QuickPath::match):
-	  escape '[' to avoid warning.
+	* array.c (rb_ary_sort_bang): temporarily freeze sorting array.
 
-Sat Oct 11 16:08:41 2003  Tanaka Akira  <akr@m17n.org>
+Mon Aug 24 18:46:44 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/pathname.rb (realpath): check existence of the file.
+	* dln.c (dln_find_1): path check was too strict.
 
-	* lib/pathname.rb (realpath): re-implemented.
-	  (realpath_root?, realpath_rec): removed
+Mon Aug 24 15:28:11 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Sat Oct 11 10:19:39 2003  Shugo Maeda  <shugo@ruby-lang.org>
+	* parse.y (f_arglist): opt_nl added after f_args.
 
-	* lib/monitor.rb: handle exceptions correctly. Thanks, Gennady
-	  Bystritsky.
+Fri Aug 21 01:06:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Oct 10 07:50:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/socket.c: grand renaming on socket.c.
 
-	* eval.c (is_defined): inheritance line adjustment as like as
-	  rb_call_super().
+	* ext/socket/socket.c (inet_aton): supply inet_aton for those
+	  systems that do not have it.
 
-Fri Oct 10 01:19:00 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/socket/socket.c (setipaddr): use inet_aton instead of
+	  inet_addr.
 
-	* 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 (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/openssl/lib/openssl/x509.rb (X509::Name::parse): ditto.
+	* ext/socket/socket.c (mkhostent): return format changed to
+	  [host, aliases, type, ipaddr..]  as documented.
 
-Thu Oct  9 23:50:21 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Aug 19 00:31:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_thread_start_0): prevent thread from GC.
-	  [ruby-dev:21572]
+	* io.c (io_ctl): forgot to place TRAP_END at right position.
 
-Thu Oct  9 19:11:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug 14 11:01:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_thread_start_0): non-volatile should be restored from
-	  volatile.
+	* eval.c (call_trace_func): save __FILE__, __LINE__ before
+ 	  executing trace_func, since trace function should not corrupt
+ 	  line number information.
 
-Thu Oct  9 17:43:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Aug 13 15:09:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (proc_save_safe_level, proc_get_safe_level,
-	  proc_set_safe_level): save/restore safe level 1..4.
+	* array.c (ary_s_new): was marking unallocated region on GC.
 
-Thu Oct  9 16:33:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Aug 11 11:57:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (r_object0): remove unnecessary iv restoration for
-	  USRMARSHAL. [ruby-dev:21582]
+	* version 1.1c2 released.
 
-	* marshal.c (w_object): dump generic instance variables from
-	  a string from '_dump'.
+Mon Aug 10 14:05:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* variable.c (rb_generic_ivar_table): return 0 if obj's FL_EXIVAR
-	  is not set.
+	* process.c (f_system): removed fflush(stdin).
 
-	* time.c (time_dump): copy instance variables to dumped string, to
-	  be included in the marshaled data.
+Fri Aug  7 17:44:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* bignum.c (rb_big2ulong): add range check to ensure round trip.
+	* 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.
 
-Thu Oct  9 15:45:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Aug  5 00:47:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* pack.c (uv_to_utf8): change message to "out of range", since
-	  negative values are not "too big". [ruby-dev:21567]
+	* re.c (rb_reg_search): recycle match object.
 
-Thu Oct  9 14:05:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Aug  3 09:17:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_set_end_proc, rb_exec_end_proc): restore safe level.
-	  [ruby-dev:21557]
+	* string.c (rb_str_gsub_bang): do not allocate temporary string.
 
-Thu Oct  9 10:51:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_sub_bang): use inline replace.
 
-	* eval.c (rb_yield_0): no error if block is empty.
+Wed Jul 29 00:36:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct  9 06:43:33 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* hash.c (hash_s_new): the default value can be specified.
 
-	* eval.c (localjump_error): id should be ID.
+	* hash.c (hash_default): method to set the default value.
 
-	* eval.c (rb_eval): nd_rval is set in copy_node_scope().
+	* hash.c (hash_aref): now returns the default value.
 
-	* eval.c (rb_yield_0): unused variable.
+Tue Jul 28 13:03:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_yield_0): nothing to do for empty node.
+	* array.c (ary_s_new): argument to specify initial value is added.
 
-	* eval.c (call_end_proc, proc_invoke): adjust backtrace in END.
-	  [ruby-dev:21551]
+	* array.c (ary_s_new): specifies size, not capacity.
 
-	* eval.c (rb_thread_start_0): set the value by break as the result.
-	  [ruby-dev:21552]
+Mon Jul 27 12:39:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_thread_start_0, rb_thread_raise, rb_callcc): save
-	  variables across THREAD_SAVE_CONTEXT.
+	* string.c (str_replace): zero fill for expansion gap.
 
-Thu Oct  9 12:05:46 2003  Eric Sunshine  <sunshine@sunshineco.com>
+	* regex.c (mbctab_euc): set flags on for 0xA1-0xFE.  suggested by
+	  <inaba@st.rim.or.jp>.
 
-	* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
-	  had become unbuildable; enhanced --enable-fat-binary option so that
-	  it accepts a list of desired architectures (rather than assuming a
-	  fixed list), or defaults to a platform-appropriate list if user does
-	  not provide an explicit list; made the default list of architectures
-	  for MAB (fat binary) more comprehensive; now uses -fno-common even
-	  when building the interpreter (in addition to using it for
-	  extensions), thus allowing the interpreter to be embedded into a
-	  plugin module of an external project (in addition to allowing
-	  embedding directly into an application); added checks for
-	  <netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
-	  ensures that -I/usr/local/include is employed when extensions'
-	  extconf.rb scripts invoke have_header() since extension checks on
-	  NextStep and OpenStep will fail without it if the desired resource
-	  resides in the /usr/local tree; fixed formatting of --help message.
+	* string.c (str_inspect): consider current_mbctype.
 
-	* Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
-	  invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
-	  (see configure's --enable-fat-binary option); added rule for new
-	  missing/getcwd.c.
+Sun Jul 26 15:37:11 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* defines.h: fixed endian handling during MAB build (see configure's
-	  --enable-fat-binary option) to ensure that all portions of the
-	  project see the correct WORDS_BIGENDIAN value (some extension modules
-	  were getting the wrong endian setting); added missing constants
-	  GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
-	  and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
-	  define in NeXT section.
+	* array.c (ary_s_new): Array.new(1<<30) dumps core.
 
-	* dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
-	  NextStep since, on some installations, this value always resolves
-	  uselessly to zero.
+Fri Jul 24 13:40:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* dln.c: added error reporting to NextStep extension loader since the
-	  previous behavior of failing silently was not useful; now ensures
-	  that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
-	  for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
-	  on Rhapsody since this header lacks multiple-include protection,
-	  which resulted in "redefinition" compilation errors.
+	* version 1.1c1 released.
 
-	* main.c: also create hard reference to objc_msgSend() on NeXT
-	  platforms (in addition to Apple platforms).
+Fri Jul 24 02:10:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/mkmf.rb: now exports XCFLAGS from configure script to extension
-	  makefiles so that extensions can be built MAB (see configure's
-	  --enable-fat-binary option); also utilize XCFLAGS in cc_command()
-	  (but not cpp_command() because MAB flags are incompatible with
-	  direct invocation of `cpp').
+	* marshal.c (r_bytes2): allocated buffer size was too short.
 
-	* ext/curses/extconf.rb: now additionally checks for presence of these
-	  curses functions which are not present on NextStep or Openstep:
-	  bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
-	  setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
-	  wscrl(), wsetscrreg()
+	* marshal.c (w_object): saves all options, not only casefold flag.
 
-	* ext/curses/curses.c: added appropriate #ifdef's for additional set of
-	  curses functions now checked by extconf.rb; fixed curses_bkgd() and
-	  window_bkgd() to correctly return boolean result rather than numeric
-	  result; fixed window_getbkgd() to correctly signal an error by
-	  returning nil rather than -1.
+	* re.c (reg_clone): now copies options properly.
 
-	* ext/etc/etc.c: setup_passwd() and setup_group() now check for null
-	  pointers before invoking rb_tainted_str_new2() upon fields extracted
-	  from `struct passwd' and `struct group' since null pointers in some
-	  fields are common on NextStep/OpenStep (especially so for the
-	  `pw_comment' field) and rb_tainted_str_new2() throws an exception
-	  when it receives a null pointer.
+	* re.c (reg_get_kcode): code number was wrong.
 
-	* ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
-	  platforms such as NextStep and OpenStep which lack strdup().
+Thu Jul 23 13:11:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
-	  gethostbyaddr(), and gethostbyname() from (const char*) to non-const
-	  (char*) for older platforms such as NextStep and OpenStep.
+	* eval.c (rb_attr): argument should be symbol or string.
 
-	* ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
-	  platforms such as NextStep and OpenStep which lack strdup(); include
-	  <netinet/in_systm.h> if present for NextStep and OpenStep; cast first
-	  argument of gethostbyaddr() and getservbyname() from (const char*) to
-	  non-const (char*) for older platforms.
+Wed Jul 22 11:59:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
-	  platforms such as NextStep and OpenStep which lack strdup().
+	* regex.c (calculate_must_string): wrong offset added.
 
-Wed Oct  8 22:19:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Wed Jul 22 11:59:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit.rb: removed installation instructions.
+	* st.c (rehash): still had a GC problem.  fixed.
 
-	* lib/test/unit/ui/testrunnermediator.rb: moved the run flag to a more
-	  central location.
+Tue Jul 21 13:19:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit.rb: ditto.
+	* eval.c (gc_mark_threads): crashed on GC before thread allocation.
 
-	* lib/test/unit.rb: extracted the running code in to AutoRunner.
+	* st.c (rehash): GC during rehash caused SEGV.
 
-	* lib/test/unit/autorunner.rb: added.
+Tue Jul 21 01:25:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/collector/objectspace.rb: extracted common test
-	  collection functionality in to a module.
+	* sprintf.c (f_sprintf): integer formatter totally re-written.
 
-	* lib/test/unit/collector.rb: ditto; added.
+	* sprintf.c (remove_sign_bits): support uppercase hexadecimal.
 
-	* test/testunit/collector/test_objectspace.rb: ditto.
+Sat Jul 18 00:14:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/collector/dir.rb: added. Supports collecting tests out
-	  of a directory structure.
+	* sprintf.c (f_sprintf): proper sign position for %X and %O.
 
-	* test/testunit/collector/test_dir.rb: added.
+Fri Jul 17 14:10:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/runner.rb: simplified to use the new capabilities.
+	* version 1.1c0 released.
 
-Tue Oct  7 15:23:09 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Jul 17 08:01:49 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* test/ruby/test_beginendblock.rb: add tests for nested BEGIN/END.
+	* process.c (f_exec): Check_SafeStr() added.
 
-	* test/ruby/beginmainend.rb: add tests for nested BEGIN/END.
+	* process.c (f_system): Check_SafeStr() moved before fork().
 
-	* test/ruby/endblockwarn.rb: new file added to test of END-in-method
-	  warning.
+Thu Jul 16 22:58:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Oct  7 12:23:47 2003  Tanaka Akira  <akr@m17n.org>
+	* string.c (scan_once): substrings to the block should not be
+ 	  tainted.  use reg_nth_match(), not str_substr().
 
-	* ext/fcntl/fcntl.c (Init_fcntl): define Fcntl::O_ACCMODE.
+	* string.c (str_substr): needed to transfer taint.
 
-	* ext/socket/extconf.rb: useless assignment removed.
+Thu Jul 16 16:15:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Oct  7 09:13:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (xmalloc): object allocation count added to GC trigger.
 
-	* test/ruby/test_beginendblock.rb (test_endinmethod): END{} is now
-	  allowed in eval.
+	* eval.c (thread_save_context): avoid marking uninitialized stack
+	  in thread_mark.  GC may be triggered by REALLOC_N().
 
-Tue Oct  7 04:15:25 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 15 15:11:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* parse.y (stmt): should not expand mrhs if lhs is solely starred.
+	* experimental release 1.1b9_31.
 
-Tue Oct  7 02:57:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jul 15 15:05:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* parse.y (stmt): rhs of multiple assignment should not be
-	  expanded using "to_a". [ruby-dev:21527]
+	* eval.c (thread_create): exit() and abort() in threads now
+ 	  forwarded to main_thread.
 
-Tue Oct  7 01:42:34 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Jul 14 14:03:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): use appropriate
-	  free function for ASN1_OBJECT.
+	* variable.c (obj_instance_variables): list names that is not
+	  instance variables.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_sn): add new function for
-	  ASN1::ObjectId#sn; it returns short name text representation of OID.
+	* gc.c (GC_MALLOC_LIMIT): choose smaller limit value.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_ln): add new function for
-	  ASN1::ObjectId#ln; it returns long name text representation of OID.
+Mon Jul 13 12:39:38 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_oid): add new function for
-	  ASN1::ObjectId#oid; it returns numerical representation of OID.
+	* object.c (str2cstr): should not return NULL.
 
-Mon Oct  6 22:59:46 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Jul 10 11:51:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* 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.
+	* parse.y (gettable): needed to add dyna_in_block() check.
 
-	* test/csv/test_csv.rb: add tests for above change.
+Thu Jul  9 17:38:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 23:27:09 2003  Tanaka Akira  <akr@m17n.org>
+	* experimental release 1.1b9_30.
 
-	* ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.
+Thu Jul  9 16:01:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/socket/socket.c (thread_read_select): restored.
+	* sprintf.c (fmt_setup): format specifier for long needed.
 
-Mon Oct  6 16:23:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* sprintf.c (f_sprintf): ditto.
 
-	* marshal.c (w_object): wrong method name in the message.
+	* numeric.c (fix2str): ditto.
 
-Mon Oct  6 16:02:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (thread_create): no more ITIMER_REAL.
 
-	* parse.y (stmt): END in method should cause warning.
-	  [ruby-dev:21519]
+	* eval.c (thread_create): thread finalization needed before
+	  aborting thread if thread_abort is set.
 
-Mon Oct  6 15:17:23 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Jul  8 18:17:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_iterator.rb (test_block_argument_without_paren):
-	  added. (follows sample/test.rb)
+	* bignum.c (big_pow): abandon power by bignum (too big).
 
-Mon Oct  6 11:57:06 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Jul  7 13:58:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: added
-	  test for eval-ed BEGIN END order.
+	* eval.c (rb_catch): add C level catch/throw feature.
 
-Mon Oct  6 09:19:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul  6 15:18:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* marshal.c (w_object): should pass "weak" value to next level.
-	  [ruby-dev:21496]
+	* parse.y (arg): proper return values for `||=' and `&&='.
 
-	* eval.c (proc_alloc): should not use cached object if klass is
-	  different. [ruby-talk:83685]
+Fri Jul  3 16:05:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 23:27:09 2003  Tanaka Akira  <akr@m17n.org>
+	* experimental release 1.1b9_29.
 
-	* lib/pathname.rb: version information is added in document.
+Fri Jul  3 11:20:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 23:07:03 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* marshal.c (r_byte): byte should not extend sign bit.
 
-	* eval.c (rb_f_END): block should be given.  [ruby-dev:21497]
+	* numeric.c (fix_mul): use FIX2LONG() instead of FIX2INT() for
+	  64bit architectures.
 
-Sun Oct  5 22:51:23 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* marshal.c (r_bytes): remove weird casting between pointer and int.
 
-	* lib/ext/openssl/extconf.rb: add check for some engine functions
-	  unavailable in OpenSSL-0.9.6.
+	* process.c (proc_setsid): new method Process#setsid().
 
-	* lib/ext/openssl/ossl_engine.c: ditto.
+Thu Jul  2 12:49:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 17:56:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* marshal.c (w_object): remove `write_bignum' label for 64bit
+ 	  architectures.
 
-	* eval.c (rb_eval): fix evaluation order.  [ruby-list:38431]
+	* marshal.c (r_bytes): needs int, not long.
 
-Sun Oct  5 15:05:06 2003  akira yamada  <akira@ruby-lang.org>
+Wed Jul  1 14:21:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/uri/*: translated RUNIT to Test::Unit.
+	* numeric.c (flo_plus): should not allow addition with strings.
 
-Sun Oct  5 14:37:39 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Jul  1 13:09:01 1998  Keiju ISHITSUKA  <keiju@rational.com>
 
-	* lib/xsd/datatypes.rb: Rational -> Decimal string bug fix.
+	* numeric.c (num_uminus): wrong coerce direction.
 
-	* test/soap/marshal/test_marshal.rb: ditto.
+Tue Jun 30 10:13:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/soap/calc/test_calc_cgi.rb: add Config::CONFIG["EXEEXT"] to
-	  RUBYBIN.
+	* io.c (f_p): accepts arbitrary number of arguments.
 
-Sun Oct  5 13:47:22 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* eval.c (rb_yield_0): there's some case that iterator_p() returns 
+	  true even if the_block was not set.  check added.
 
-	* test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: add tests
-	  about scope, order and allowed syntax.
+Tue Jun 30 01:05:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 11:54:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* eval.c (BEGIN_CALLARGS): adjust the_block before evaluating the
+	  receiver's value and the arguments.
 
-	* test/ruby/envutil.rb: added.  split "rubybin" from test_system.rb.
+Fri Jun 26 18:02:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_system.rb: use envutil.rb
+	* experimental release 1.1b9_28.
 
-	* test/ruby/test_beginendblock.rb: added.
+Fri Jun 26 11:01:26 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* test/ruby/beginmainend.rb: added.  used in test_beginendblock.rb.
+	* string.c (str_aset_method): needed to convert to string.
 
-Sun Oct  5 11:23:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Thu Jun 25 02:05:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/testunit/runit/test_testresult.rb: removed some unnecessary
-	  cruft.
+	* regex.c (re_search): optimize for `.*' at beginning of the
+	  pattern.
 
-Sun Oct  5 11:14:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* regex.c (re_search): optimize for character class repeat at
+	  beginning of the pattern.
 
-	* lib/rubyunit.rb: aliasing TestCase into the top level is
-	  problematic.
+	* regex.c (re_compile_pattern): detect optimization potential for
+	  the compiled patterns.
 
-	* lib/runit/assert.rb: fixed a couple of bugs caused by recent
-	  refactoring in Test::Unit.
+Thu Jun 25 00:02:26 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* test/testunit/runit/*: added.
+	* re.c (reg_s_new): flag value was wrong.
 
-Sun Oct  5 10:55:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Jun 24 23:45:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/open-uri.rb (URI::Generic#find_proxy): no_proxy support did not
-	  work.  [ruby-dev:21484]
+	* regex.c (re_search): wrong anchor handling for reverse search.
 
-Sun Oct  5 09:52:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Wed Jun 24 02:18:57 1998  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.
+	* parse.y (mlhs): `((a,b)),c = [[1,2]],3' assigns a=1,b=2,c=3.
 
-	* test/testunit/test_assertions.rb: made a small change to exception
-	  formatting.
+Tue Jun 23 11:46:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 07:42:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* parse.y (yylex): `&&=' and `||=' added.
 
-	* lib/test/unit/assertions.rb: made small improvements to assertion
-	  messages. Deprecated Assertions#assert_not_nil; use #assert instead.
+Sat Jun 20 02:53:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/testunit/test_assertions.rb: ditto.
+	* parse.y (assignable): nesting local variables should have higher
+ 	  priority than normal local variables for assignment too.
 
-	* test/testunit/util/test_procwrapper.rb: use #assert instead of
-	  #assert_not_nil.
+Fri Jun 19 18:28:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 04:10:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* experimental release 1.1b9_27.
 
-	* lib/test/unit/assertions.rb: refactored message building.
+Fri Jun 19 14:34:49 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 03:40:22 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (assign): support hack for nested multiple assignment.
 
-	* ext/openssl/ossl_asn1.h: global symbols should be declared
-	  as external.
+	* parse.y (mlhs): nested multiple assignment.
 
-Sun Oct  5 03:03:20 2003  akira yamada  <akira@ruby-lang.org>
+	* eval.c (rb_eval): in-block variables now honors static scope.
 
-	* test/ruby/test_exception.rb (test_else): added.
+	* configure.in: RSHIFT check moved to configure.
 
-Sun Oct  5 02:12:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Thu Jun 18 16:46:04 1998  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.
+	* experimental release 1.1b9_26.
 
-	* test/testunit/test_assertions.rb: ditto.
+Thu Jun 18 13:37:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Oct  5 02:12:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* file.c (file_s_ftype): uses lstat(2) instead of stat(2).
 
-	* lib/drb/acl.rb, lib/drb/ssl.rb: added.
+	* dir.c (dir_s_glob): there can be buffer overrun, check added.
 
-	* lib/drb/drb.rb: exit from a thread using 'break'.
+	* eval.c (f_binding): handles in-block variables declared after
+	  binding's generation.
 
-Sat Oct  4 21:49:14 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* numeric.c (flo_floor): floor, ceil, round added to Float.
 
-	* gc.c (Init_stack): the type of space is changed to unsigned int
-	  from double.  [ruby-dev:21483]
+Wed Jun 17 11:20:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Oct  4 17:52:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* parse.y (gettable): nesting local variables should have higher
+ 	  priority than normal local variables.
 
-	* 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")
+Tue Jun 16 12:30:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/soap/rpc/cgistub.rb: return "Status: XXX MMM" line.
+	* bignum.c (str2inum): handles `+ddd'.
 
-	* test/runner.rb: give testsuite name.
+	* struct.c (make_struct): name parameter can be nil for unnamed
+	  structures.
 
-Sat Oct  4 15:16:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jun 15 16:30:10 1998  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.
+	* object.c (class_s_inherited): prohibiting to make subclass of
+	  class Class.
 
-	* gc.c (Init_stack): cast "space" (doble value) into unsigned
-	  int.  should run on PowerPC.
+	* object.c (module_s_new): support for making subclass of Module.
 
-	* eval.c (rb_eval): should not execute else part if any exception
-	  is caught. [ruby-dev:21482]
+	* parse.y (yycompile): clear eval_tree before compiling.
 
-	* parse.y (f_args): should allow unparenthesized block argument.
+Fri Jun 12 17:58:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* parse.y (f_rest_arg): should allow unparenthesized rest
-	  argument.
+	* eval.c (eval): write back the_dyna_var into the block.
 
-Sat Oct  4 14:59:51 2003  Tanaka Akira  <akr@m17n.org>
+Thu Jun 11 18:19:18 1998  Yukihiro Matsumoto  <matz@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.
+	* experimental release 1.1b9_25.
 
-Sat Oct  4 12:58:48 2003  akira yamada  <akira@ruby-lang.org>
+	* eval.c (dvar_add_compiling): register dyna_var at compile time.
 
-	* test/uri/* (6 files): added.
+	* regex.c (re_compile_pattern): RE_DUP_MAX iteration is too big.
 
-Sat Oct  4 12:44:45 2003  akira yamada  <akira@ruby-lang.org>
+Wed Jun 10 15:12:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/uri/ftp.rb, lib/uri/mailto.rb: renamed to #to_s from #to_str.
+	* io.c (io_eof): do not block other threads.
 
-Sat Oct  4 07:33:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* signal.c (trap): reserve SIGALRM for thread.
 
-	* lib/test/unit/testsuite.rb: changed #<< to return self, and added
-	  #delete.
+	* eval.c (thread_create): use ITIMER_REAL also to avoid system
+	  call blocking.
 
-	* test/testunit/test_testsuite.rb: ditto. Also slightly refactored
-	  #test_size.
+	* io.c (f_syscall): add TRAP_BEG, TRAP_END around system calls.
 
-	* lib/test/unit/collector/objectspace.rb: collector now preserves the
-	  hierarchy of suites.
+	* io.c (io_ctl): add TRAP_BEG, TRAP_END around system calls.
 
-	* test/testunit/collector/test_objectspace.rb: ditto.
+	* enum.c (enum_collect): did not collect false values.
 
-Sat Oct  4 04:48:49 2003  why the lucky stiff  <why@ruby-lang.org>
+	* array.c (ary_new2): forgot to initialize capa field.
 
-	* ext/syck/rubyext.c: default keys handled.
+Tue Jun  9 18:36:15 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/syck/syck.h: lowered default buffer size to 16k for increased
-	  performance.
+	* string.c (str_split_method): split dumped core for "\xff".
 
-	* test/yaml: checkin of basic unit tests.
+Tue Jun  9 16:22:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Oct  4 04:24:19 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* experimental release 1.1b9_24.
 
-	* ext/openssl/extconf.rb: add check for X509V3_set_nconf.
+Tue Jun  9 16:04:07 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
-	  cannot implement if X509V3_set_nconf doesn't exist.
+	* ext/kconv/kconv.c (kconv_guess): more precise decision for EUC,
+	  using jless algorithm (3 sequential EUC hiragana characters).
 
-Sat Oct  4 02:12:44 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Jun  9 15:12:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/xsd/datatypes.rb: dump sign by itself.  under the problematic
-	  platform, sprintf("%+.10g", -0.0) => +0.  sigh.
+	* ext/kconv/kconv.c (kconv_guess): wrong guess for EUC as SJIS in
+	  some cases (0xe0 - 0xef).
 
-	* sample/wsdl/amazon/*: update schema ver2 to ver3.
+	* gc.c (xmalloc): insert size check for big (negative in signed)
+	  allocation size.
 
-Sat Oct  4 01:33:46 2003  Tanaka Akira  <akr@m17n.org>
+Tue Jun  9 02:54:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/pathname.rb (initialize): duplicate and freeze argument.
-	  (to_s): return duplicated string.
-	  (children): new method.
-	  (each_line): new alias to foreachline.
+	* lib/parsedate.rb: wday moved to the last in the return values.
 
-Fri Oct  3 16:13:19 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Jun  8 10:40:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_asn1.c: add DER encoder and decoder.
+	* string.c (str_split_method): split dumped core for "\0".
 
-	* ext/openssl/ossl_asn1.h: add OpenSSL::ASN1 module.
+Sat Jun  6 22:50:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl.c (Init_openssl): call Init_ossl_asn1.
+	* regex.c (calculate_must_string): wrong condition for
+	  {start,stop}_nowidth.
 
-	* ext/openssl/extconf.rb: check if X509_ATTRIBUTE has field "single".
+	* regex.c (re_match): various features imported from GNU regex.c
+ 	  0.12, such as nested grouping, avoiding infinite loop with empty
+ 	  match, etc.
 
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): accept
-	  DER encoded data argument.
+	* regex.c (register_info_type): now use union.
 
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_get_value): return
-	  DER encoded data in OpenSSL::ASN1 types.
+	* regex.c (re_search): more precise anchor(^) check.
 
-Fri Oct  3 13:02:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Wed Jun  3 18:07:54 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit.rb: refactored to use optparse.
+	* re.c (reg_raise): check rb_in_compile, not rb_in_eval.
 
-	* lib/test/unit.rb: added support for selecting the output
-	  level from the command-line.
+Mon Jun  1 05:26:06 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-	* lib/test/unit.rb: added a command-line switch to stop processing
-	  the command-line, allowing arguments to be passed to tests.
+	* string.c (trnext): casting to signed char* needed.
 
-	* lib/test/unit.rb: changed the method for specifying a runner or a
-	  filter from the command-line.
+Tue Jun  2 16:00:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/collector/objectspace.rb: fixed a bug causing all
-	  tests to be excluded when the filter was set to an empty array.
+	* ext/socket/socket.c (udp_addrsetup): error check enhanced.
 
-	* test/testunit/collector/test_objectspace.rb: ditto.
+	* ext/socket/socket.c (sock_s_getservbyaname): use strtoul(), if
+	  possible.
 
-Fri Oct  3 08:14:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat May 30 07:10:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/irb/ruby-lex.rb (RubyLex::identify_identifier): support
-	  'class ::Foo' syntax. [ruby-talk:83514]
+	* re.c (reg_prepare_re): no more needless regular expression
+ 	  recompile on casefold conditions.
 
-Fri Oct  3 08:01:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Thu May 28 18:02:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/assertions.rb: added a default message for #assert,
-	  #assert_block, and #flunk.
+	* object.c (nil_plus): no more `+' method for nil.
 
-	* test/testunit/test_assertions.rb: ditto.
+Wed May 27 17:33:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/failure.rb: failures now show a better trace of where
-	  they occurred.
+	* hash.c (hash_fetch): new method.
 
-	* test/testunit/test_failure.rb: ditto (added).
+	* regex.c (re_search): check whether translate table is set.
 
-	* lib/test/unit/testcase.rb: ditto.
+Tue May 26 11:39:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/testunit/test_testcase.rb: ditto.
+	* experimental release 1.1b9_23.
 
-	* lib/test/unit/util/backtracefilter.rb: added.
+	* parse.y (yylex): no UPLUS/UMINUS for 1st argument if
+	  parenthesises are omitted.
 
-	* test/testunit/util/test_backtracefilter.rb: added.
+Tue May 26 01:09:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/error.rb: changed to use BacktraceFilter and improved
-	  output.
+	* regex.c (re_compile_pattern): (?XI) for turns off the
+	  corresponding option.
 
-	* test/testunit/test_error.rb: ditto.
+Mon May 25 12:38:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct  2 20:33:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (re_compile_pattern): inline i option (?i).
 
-	* ext/iconv/iconv.c (iconv_failure_initialize): conform with
-	  orthodox initialization method.
+	* regex.c (re_compile_pattern): inline x option (?x).
 
-	* ext/iconv/iconv.c (iconv_fail): initialize exception instance
-	  from the class, and do not share instance variables with the
-	  others.  [ruby-dev:21470]
+	* regex.c (re_compile_pattern): x option for regexp.
 
-Thu Oct  2 18:20:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c (dir_s_open): returns block's evaluated value.
 
-	* time.c (Init_Time): define initialize.  [ruby-dev:21469]
+	* io.c (f_open): returns block's evaluated value.
 
-Thu Oct  2 17:39:38 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/curses/curses.c (curses_addstr): nil argument caused SEGV.
 
-	* ext/openssl/ossl_engine.c: add a new module OpenSSL::Engine.
-	  it supports OpenSSL hardware cryptographic engine interface.
+Fri May 22 11:52:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_engine.h: ditto.
+	* regex.c (re_compile_pattern): push mark on (?:), so that
+	  laststart check for {a,b} can be done.
 
-	* ext/openssl/MANIFEST: add ossl_engine.c and ossl_engine.h.
+Thu May 21 17:31:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/extconf.rb: add check for openssl/engine.h.
+	* regex.c (re_match): wrong match (too non-greedy) for `{a,b}?'.
 
-	* ext/openssl/ossl.c: call Init_ossl_engine().
+	* io.c (io_lineno): new method IO#lineno, IO#lineno=.
 
-	* ext/openssl/ossl.h: include openssl/engine.h.
+Wed May 20 06:04:43 1998  MAEDA shugo  <shugo@aianet.ne.jp>
 
-	* ext/openssl/ossl_pkey_{rsa,dsa,dh}.c: check if underlying
-	  EVP_PKEY referes engine.
+	* BeOS patch.
 
-Thu Oct  2 17:22:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed May 20 16:32:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* time.c (time_load): restore instance variables (if any) before
-	  loading from marshaled data.
+	* bignum.c (BIGDN): use RSHIFT(), instead of mere `>>'.
 
-Thu Oct  2 14:19:15 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May 19 16:36:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/iconv/iconv.c (iconv_fail): now yield erred substring, and
-	  set error object to $!.
+	* experimental release 1.1b9_22.
 
-	* ext/iconv/iconv.c (iconv_convert): error handler block should
-	  return appended part and the rest.  if rest is nil, the
-	  conversion stops.
+Tue May 19 16:31:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct  2 12:00:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (assignable): specification changed for in-block
+ 	  variable definition.
 
-	* variable.c (rb_const_defined_0): look up constants in Object as
-	  well.  [ruby-dev:21458]
+	* eval.c (dyna_var_asgn): error in in-block variables' compile
+ 	  time definition.
 
-	* test/ruby/test_defined.rb (TestDefined::test_defined): test for
-	  constants.
+	* parse.y (str_extend): wrong nesting detection.
 
-Thu Oct  2 11:17:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Tue May 19 09:47:55 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/test/unit/assertions.rb: should not capture an
-	  AssertionFailedError unless explicitly requested.
+	* numeric.c (num2int): re-defined (extensions may use this).
 
-	* test/testunit/test_assertions.rb: ditto.
+Mon May 18 16:40:50 1998  MAEDA shugo  <shugo@aianet.ne.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]
+	* error.c (get_syserr): BeOS support.
 
-	* lib/test/unit/testcase.rb: ditto.
+	* configure.in: modified for BeOS.
 
-	* lib/test/unit/testsuite.rb: ditto.
+	* string.c (str_dump): do not call isascii().
 
-	* lib/test/unit/collector/objectspace.rb: ditto.
+	* sprintf.c (remove_sign_bits): forgot to initialize end pointer.
 
-Thu Oct  2 03:25:01 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* glob.c: #include <alloca.h> added.
 
-	* eval.c (rb_thread_raise): prototype; avoid VC++ warning.
+Mon May 18 14:52:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct  2 01:37:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* experimental release 1.1b9_21.
 
-	* time.c (time_mdump): new marshal dumper. _dump is still
-	  available for compatibility.
+Mon May 18 03:27:57 1998  MAEDA shugo  <shugo@aianet.ne.jp>
 
-	* time.c (time_mload): new marshal loader.
+	* file.c (file_s_expand_path): optional second argument
+	  `default_directory' added.
 
-	* marshal.c (w_object): preserve instance variables for objects
-	  with marshal_dump.
+Sat May 16 22:06:52 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* marshal.c (r_object0): restore instance variables before calling
-	  marshal_load.
+	* error.c (RAISE_ERROR): wrong error message
 
-	* error.c (rb_warn_m): always return nil.
+Fri May 15 14:43:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct  2 01:32:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* experimental release 1.1b9_20.
 
-	* eval.c (rb_f_block_given_p): real required condition is
-	  ruby_frame->prev->iter == ITER_CUR.
+Thu May 14 14:44:21 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* eval.c (rb_block_given_p): ditto.
+	* sun4 cc patches for intern.h and regex.h.
 
-	* eval.c (block_pass): update ruby_frame->iter only when previous
-	  value is ITER_NOT.
+Thu May 14 14:03:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Oct  2 01:02:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* random.c (RANDOM_MAX): guessing proper maximum value for random
+ 	  numbers.
 
-	* variable.c (rb_const_defined_at): should exclude constants from
-	  Object when TYPE(klass) == T_MODULE *and* exclude is on.
-	  [ruby-dev:21458]
+	* random.c (f_rand): use drand48 if possible.
 
-	* variable.c (rb_const_get_0): do not lookup constants from Object
-	  when TYPE(klass) == T_MODULE *and* exclude is on.
+Wed May 13 19:05:20 1998  MAEDA shugo  <shugo@aianet.ne.jp>
 
-Thu Oct  2 00:21:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* BeOS patches for io.c, error.c and config.guess.
 
-	* test/logger/test_logger.rb: unlinking file before close causes
-	  problem under win32 box.
+Wed May 13 14:56:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* 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.
+	* experimental release 1.1b9_19.
 
-	* test/xsd/test_xsd.rb, test/soap/test_basetype.rb: follow above change.
+	* most of the Mac and BeOS patches merged, except path separators.
 
-	* test/soap/calc/*: give httpd config param "CGIInterpreter".
-	  "/usr/bin/env ruby" thing does not work under non-Unix boxes.
+	* error.c (err_append): generated SyntaxError was String.
 
-Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.h: xxx2INT, xxx2UINT checks values as int, not long.
 
-	* marshal.c (r_byte): retrieve pointer from string value for each
-	  time.  [ruby-dev:24404]
+	* ruby.h: remove typedef's. INT, UINT, UCHAR, USHORT.
 
-	* marshal.c (r_bytes0): ditto.
+Tue May 12 17:38:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* enum.c (sort_by_i): re-entrance check added.  [ruby-dev:24399]
+	* experimental release 1.1b9_18.
 
-	* io.c (io_read): should freeze all reading buffer.
-	  [ruby-dev:24400]
+Tue May 12 11:38:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* string.c (rb_str_sum): should use bignums when bits is greater
-	  than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
+	* error.c (syserr_errno): returns errno of the SystemCallError.
 
-	* eval.c (specific_eval): defer pointer retrieval to prevent
-	  unsafe sourcefile string modification.  [ruby-dev:24382]
+	* error.c (rb_sys_fail): saves errno in the Exception.
 
-	* string.c (rb_str_sum): wrong cast caused wrong result.
-	  [ruby-dev:24385]
+	* error.c (set_syserr): no need to protect syserr_list.
 
-	* enum.c (enum_sort_by): hide temporary array from
-	  ObjectSpace.each_object.  [ruby-dev:24386]
+	* error.c (rb_sys_fail): no more bufsize limit.
 
-	* string.c (rb_str_sum): check was done with false pointer.
-	  [ruby-dev:24383]
+	* error.c (set_syserr): integer value of errno can be accessed by
+	  Errno::EXXX::Errno.
 
-	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
+Sun May 10 03:10:33 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
 
-Thu Oct  2 00:25:21 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (io_tell etc.): moved from File class to IO class.
 
-	* signal.c (ruby_signal_name): adjust to the prototype.
+Fri May  8 12:26:37 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* process.c (pst_inspect): ditto.
+	* pack.c (pack_unpack): should be unsigned int (was signed int).
 
-	* ext/etc/etc.c (etc_getgrent, Init_etc): typo.
+Thu May  7 16:34:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct  1 20:49:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* pack.c (pack_pack): `V', `N' uses newly created NUM2UINT().
 
-	* gc.c (heaps): manage slots and limits together.  [ruby-dev:21453]
+	* ruby.h (NUM2UINT): new macro.
 
-	* gc.c (add_heap): should not clear heaps slot even if realloc()
-	  failed.
+	* bignum.c (big2uint): try to convert bignum into UINT.
 
-Wed Oct  1 20:36:49 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* re.c (reg_match): needed to return false for match with nil.
 
-	* MANIFEST: add wince/mkconfig_wce.rb.
+	* gc.c (obj_free): wrong condition to free string.
 
-Wed Oct  1 17:22:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed May  6 21:08:08 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/etc/etc.c: add new functions: setpwent, getpwent, endpwent,
-	  setgrent, getgrent, endgrent.
+	* ruby.c (ruby_process_options): modified for DJGPP.
 
-	* ext/socket/socket.c (sock_s_gethostbyname): do not reverse lookup.
+Wed May  6 15:48:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct  1 17:01:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* experimental release 1.1b9_17.
 
-	* eval.c (rb_load): Object scope had priority over required file
-	  scope.  [ruby-dev:21415]
+Wed May  6 01:37:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Oct  1 14:09:53 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+	* eval.c: remove global variable `errat'.
 
-	* wince/mkconfig_wce.rb: sorry, forget to commit.
+	* eval.c (rb_longjmp): embed error position information in the
+ 	  exception object.
 
-Wed Oct  1 10:08:42 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+Sat May  2 12:20:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* wince/setup.mak: add sigmarionIII SDK support.
+	* re.c (reg_search): supports reverse search.
 
-	* wince/Makefile.sub: ditto.
+	* string.c (str_index_method): does update $~ etc.
 
-	* wince/mkexports.rb: fix linker error in SH4.
+	* eval.c (f_load): needed to clear the_dyna_vars.
 
-	* wince/mkconfig_wce.rb: camouflage RUBY_PLATFORM for compiling ext.
+	* eval.c (dyna_var_asgn): do not push dyna_var, which is id == 0.
 
-Wed Oct  1 08:02:52 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+	* error.c (Init_Exception): NotImplementError is no longer
+	  StandardError, which is not handled by default rescue.
 
-	* wince/time_wce.c (time): add zero check.
+Fri May  1 00:35:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Sep 30 16:11:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.c (proc_options): `-d' turns on verbose flag too.
 
-	* Makefile.in: copy lex.c from $(srcdir) if it's not the current
-	  directory.  [ruby-dev:21437]
+	* error.c (exception): last argument may be the superclass of the
+	  defining exception(s).
 
-Tue Sep 30 11:29:23 2003  Tanaka Akira  <akr@m17n.org>
+	* io.c (Init_IO): EOFError is now subclass of the IOError.
 
-	* process.c (pst_inspect): describe stopped process "stopped".
+	* io.c (Init_IO): forgot to define IOError.
 
-Tue Sep 30 09:31:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* error.c (Init_Exception): old Exception class renamed to
+	  StandardError.  Exception now replaces old GlobalExit.
 
-	* test/runner.rb: glob for directories.
+	* error.c (Init_Exception): Exception is now the root of the
+	  Global Exits.  There's no longer GlobalExit class.
 
-Tue Sep 30 09:11:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* util.c (ruby_mktemp): check TMP, TMPDIR first.
 
-	* eval.c (rb_eval): while/until should not capture break unless
-	  they are destination of the break.
+Thu Apr 30 01:08:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Sep 30 03:12:02 2003  Minero Aoki  <aamine@loveruby.net>
+	* lib/tk.rb: call 'unknown', if proc not defined.
 
-	* lib/net/http.rb (finish): revert to 1.93.
+	* eval.c (handle_rescue): default rescue handles `Exceptional' not 
+	  only the instance of the `Exception's.
 
-	* lib/net/pop.rb (finish): revert to 1.60.
+	* eval.c (f_raise): exception can be any object.
 
-	* lib/net/smtp.rb (finish): revert to 1.67.
+	* time.c (time_gm_or_local): call time_gmtime or time_localtime.
 
-	* lib/net/http.rb (do_start): ensure to close socket if failed to
-	  start session.
+	* eval.c (f_raise): raises TypeError if the class which is not a
+	  subclass of String is specified (checked in exc_new()).
 
-	* lib/net/pop.rb (do_start): ditto.
+	* error.c (exc_new): need to check whether invalid class (not a
+	  subclass of String) is specified.
 
-	* lib/net/smtp.rb (do_start): ditto.
+Wed Apr 29 21:05:44 1998  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* lib/net/smtp.rb: SMTP#started? wrongly returned false always.
+	* ruby.c (proc_options): option '-e' via tempfile.
 
-Tue Sep 30 02:54:49 2003  Minero Aoki  <aamine@loveruby.net>
+Tue Apr 28 15:27:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_iterator.rb: new test
-	  test_break__nested_loop[123].
+	* experimental release 1.1b9_16.
 
-Mon Sep 29 23:39:13 2003  Minero Aoki  <aamine@loveruby.net>
+Tue Apr 28 00:07:38 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/net/http.rb (finish): does not raise IOError even if
-	  !started?, to allow closing socket which was opened before
-	  session started.
+	* eval.c (obj_is_proc): type check predicate.
 
-	* lib/net/pop.rb (finish): ditto.
+	* eval.c (obj_is_block): ditto.
 
-	* lib/net/smtp.rb (finish): ditto.
+Mon Apr 27 16:59:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Sep 29 19:06:51 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/gtk/gtk.c (Init_gtk): use timeout, not idle to avoid
+	  consuming CPU too much.
 
-	* ext/win32ole/extconf.rb: add windows.h checking.
-	  (ruby-bugs:PR#1185)
+	* lib/tk.rb: use tcltklib#_invoke instead of `_eval'.
 
-Mon Sep 29 16:18:30 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Apr 27 16:59:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/logger.rb: check if the given logdevice object respond_to :write
-	  and :close, not is_a? IO.  duck duck.
+	* array.c (ary_sort): use dup, not clone.
 
-	* test/logger/test_logger.rb: self IO.pipe reading/writing may be
-	  locked by the flood.  use tempfile.
+Mon Apr 27 13:46:27 1998  Tadahiro Maebashi  <maebashi@iij.ad.jp>
 
-	* lib/wsdl/xmlSchema/data.rb: wrong constant reference.
+	* ext/tcltklib/tcltklib.c (ip_invoke): invoke tcl command
+	  directly.  need not worry about escaping tcl characters.
 
-Mon Sep 29 16:11:23 2003  Minero Aoki  <aamine@loveruby.net>
+Mon Apr 27 12:04:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/fileutils/test_fileutils.rb: clean up temporary symlink.
-	  Patched by NaHi.  [ruby-dev:21420]
+	* random.c (f_rand): do not call srand() implicitly.
 
-Mon Sep 29 11:16:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Apr 24 14:35:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_thread_atfork): wrong format specifier.
-	  [ruby-dev:21428]
+	* experimental release 1.1b9_15.
 
-	* process.c (pst_inspect): better description.
+	* parse.y (assignable): dyna_var_asgn actually defines nested
+	  local variables in outer context.
 
-Mon Sep 29 02:31:44 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* random.c (f_rand): call srand(), if it has not called yet.
 
-	* lib/webrick/utils.rb (Utils::su): use setgid and setuid to
-	  set real and effective IDs. and setup group access list by
-	  initgroups.
+	* random.c (f_srand): use tv_usec as the default seed.
 
-Sun Sep 28 11:14:19 2003  Koji Arai  <jca02266@nifty.ne.jp>
+	* eval.c (rb_eval): values of nested local variables should be
+ 	  independent.
 
-	* ext/digest/digest.c (Init_digest): `copy_object' was deprecated.
-	  `initialize_copy' should be defined.
+	* eval.c (rb_yield_0): local variables wrong nested conditions.
 
-	* ext/stringio/stringio.c (Init_stringio): ditto.
+Wed Apr 22 23:27:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Sep 27 18:25:13 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* io.c (select_get_io): get IO object by `to_io'.
 
-	* lib/xsd/charset.rb: XSD::Charset.is_ces did return always true under
-	  $KCODE = "NONE" environment.  check added.
+	* io.c (io_to_io): method to retrieve IO object, from delegating
+ 	  object for example.
 
-	* test/xsd/test_xsd.rb: add tests for above fix.
+Wed Apr 22 16:52:37 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Sep 27 15:58:50 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* experimental release 1.1b9_14.
 
-	* lib/soap/rpc/cgistub.rb: make logging severity threshold higher.
+	* string.c (str_modify): check for embedded pointer reference.
 
-	* lib/soap/rpc/standaloneServer.rb: defer WEBrick server start to give
-	  a chance to reset logging severity threshold.
+	* gc.c (obj_free): ditto.
 
-	* test/soap/calc/test_*, test/soap/helloworld/test_helloworld.rb: run
-	  silent.
+	* pack.c (pack_pack): p/P template to embed pointers.
 
-Sat Sep 27 09:44:18 2003  Minero Aoki  <aamine@loveruby.net>
+Wed Apr 22 00:07:10 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* test/fileutils/test_fileutils.rb: clear all errors on Windows.
-	  [ruby-dev:21417]
+	* array.c (ary_rindex): embarrassing typo.
 
-	* test/fileutils/test_nowrite.rb: ditto.
+Tue Apr 21 12:31:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Sep 27 09:14:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* experimental release 1.1b9_13.
 
-	* array.c (rb_ary_delete): comparison may change the capacity.
-	  [ruby-dev:24348]
+	* configure.in (RUBY_LIB): supports --program-{prefix,suffix}.
 
-	* array.c (rb_ary_fill): fill should honor length argument.
-	  [ruby-dev:24346]
+	* array.c (ary_rindex): new method.
 
-	* array.c (rb_ary_replace): should not use ptr from shared array.
-	  [ruby-dev:24345]
+	* io.c (io_binmode): should return self.
 
-	* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
-	  [ruby-talk:113807]
+Tue Apr 21 08:23:04 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Sat Sep 27 04:57:07 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* parse.y (here_document): calling parse_string with wrong
+	  arguments.
 
-	* test/ruby/test_file.rb: new file.  only asserts unlink-before-close
-	  behaviour now.
+	* struct.c (struct_aset): problem member assignment with name.
 
-	* test/soap/marshal/test_digraph.rb: should close before unlink.
-	  unlink-before-close pattern is not needed here.
+Mon Apr 20 14:47:49 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Sep 27 03:32:37 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* experimental release 1.1b9_12.
 
-	* 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.
+	* time.c (time_arg): args may be string (support for reduced
+	  implicit type conversion).
 
-Sat Sep 27 01:30:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/base64.rb: changed to use pack/unpack with `m' template.
 
-	* ext/socket/socket.c (ruby_connect): on win32, type of the 4th
-	  argument of getsockopt is char *.
+Mon Apr 20 06:23:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Sep 26 18:35:40 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* variable.c (mod_remove_const): new method.
 
-	* lib/resolv-replace.rb: 1.8 compliance.  [ruby-talk:82946]
+Sat Apr 18 03:53:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Sep 26 17:39:27 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* hash.c (hash_each_with_index): removed.  use Enumerable's
+	  each_with_index instead.
 
-	* test/ruby/test_marshal.rb: add test for ruby's objects.
+	* class.c (rb_include_module): check for super modules, since
+ 	  module's included modules may be changed.
 
-Fri Sep 26 09:52:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 17 21:50:47 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* defines.h (flush_register_windows): use volatile only for gcc on
-	  Solaris.  [ruby-dev:21403]
+	* marshal.c (r_long): r_byte() may return signed byte.
 
-	* lib/mkmf.rb (xsystem): use system directly to honor shell meta
-	  charaters.
+Fri Apr 17 11:58:30 1998  NAGAI Hidetoshi  <nagai@dumbo.ai.kyutech.ac.jp>
 
-Fri Sep 26 00:10:13 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/tcltklib/tcltklib.c (lib_mainloop): thread and interrupt check.
 
-	* lib/README: updated.
+Fri Apr 17 11:06:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Sep 25 17:48:10 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (find_file): try to fopen() to check whether file exists.
 
-	* ext/openssl/ossl.c (ossl_buf2str): fix type of 1st argument for
-	  rb_protect.
+	* ruby.c (load_file): ditto.
 
-	* ext/openssl/ossl_hmac.c (ossl_hmac_digest): should return meaningful
-	  value.
+	* struct.c (struct_aset): struct member can be set by member name.
 
-Thu Sep 25 09:00:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Fri Apr 17 00:47:19 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/ostruct.rb: Added OpenStruct#==.
+	* ext/extmk.rb.in: added m68k-human support
 
-	* test/ostruct/test_ostruct.rb: Added.
+	* file.c (LOCK_SH): defines moved.
 
-Thu Sep 25 07:55:26 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (ary_flatten_bang): simplified loop.
 
-	* 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)
+Thu Apr 16 16:52:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Sep 25 00:23:22 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* experimental release 1.1b9_11.
 
-	* MANIFEST: add SOAP4R.
+	* lib/tk.rb: thread support (experimental - maybe slow).
 
-Thu Sep 25 00:13:15 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* eval.c (rb_longjmp): trace event on exception in raising
+ 	  context, just before raising exception.
 
-	* lib/soap/* (29 files): SOAP4R added.
+	* struct.c (struct_s_members): forgot to check singletons.
 
-	* lib/wsdl/* (42 files): WSDL4R added.
+	* struct.c (struct_aref): members can be accessed by names too.
 
-	* lib/xsd/* (12 files): XSD4R added.
+	* array.c (ary_flatten): new method.
 
-	* test/soap/* (16 files): added.
+	* eval.c (rb_longjmp): prints exception information with `-d'.
 
-	* test/wsdl/* (2 files): added.
+	* object.c (any_to_s): remove class name restriction.
 
-	* test/xsd/* (3 files): added.
+Thu Apr 16 01:38:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* sample/soap/* (27 files): added.
+	* file.c (thread_flock): do not block other threads.
 
-	* sample/wsdl/* (13 files): added.
+	* 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.
 
-Wed Sep 24 02:08:11 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* string.c (str_new4): need not to duplicate frozen strings.
 
-	* lib/webrick/httpservlet/cgihandler.rb: conform to mswin32.
-	  [ruby-talk:82735], [ruby-talk:82748], [ruby-talk:82818]
+Wed Apr 15 08:33:47 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Tue Sep 23 23:10:16 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* struct.c (struct_inspect): remove restriction for struct names.
 
-	* lib/logger.rb: add Logger#<<(msg) for writing msg without any
-	  formatting.
+Wed Apr 15 02:55:02 1998  Kazuya 'Sharl' Masuda  <sharl@www.ufo.co.jp>
 
-	* test/logger/test_logger.rb: ditto.
+	* x68 patches to config.sub, ext/extmk.rb.in
 
-Tue Sep 23 20:47:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Apr 15 01:22:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* error.c (rb_warn_m): should not warn if -W0 is specified.
-	  [ruby-talk:82675]
+	* string.c (str_dup_frozen): do not duplicate frozen strings.
 
-Mon Sep 22 21:28:57 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* parse.y (yylex): allow nested parenthesises.
 
-	* MANIFEST: updated.
+	* io.c (obj_displayln): prints newline after `display'ing the
+	  receiver.
 
-Mon Sep 22 19:22:26 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* io.c (io_puts): avoid generating "\n" each time.  use RS_default
+ 	  instead.
 
-	* configure.in (AC_CHECK_FUNCS): add setuid and setgid.
+	* io.c (f_p): ditto.
 
-Mon Sep 22 12:34:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Apr 14 22:18:17 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* util.c (ruby_strtod): skip preceding zeros before counting
-	  digits in the mantissa. (ruby-bugs:PR#1181)
+	* struct.c (struct_aref): should not subtract negative index.
 
-Sun Sep 21 04:12:36 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Apr 14 11:34:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): the argument
-	  should be a String.
+	* experimental release 1.1b9_10.
 
-	* ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): ditt.
+	* parse.y: token names prefixed by `t'.
 
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): ditto.
+	* struct.c (struct_s_def): supports subclassing of Struct.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
+	* io.c (io_s_new): supports subclassing of IO.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
+Mon Apr 13 11:07:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Sep 20 11:49:05 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* eval.c (f_binding): need to restore method name.
 
-	* lib/logger.rb: typo fixed.
+	* eval.c (rb_call0): raises SystemStackError, not Fatal.
 
-	* test/logger/test_logger.rb: new file.
+	* io.c (obj_display): same as `print self'.
 
-Fri Sep 19 11:39:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* io.c (f_p): can now be called in the method form.
 
-	* test/testunit/*: Added.
+	* re.c (reg_regsub): needed to be mbchar aware.
 
-	* lib/test/unit.rb: Documentation update.
+Mon Apr 13 13:18:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/test/unit/ui/console/testrunner.rb (TestRunner#initialize):
-	  Ditto.
+	* eval.c (thread_trap_eval): all signals delivered to main_thread.
 
-	* lib/test/unit.rb: Factored out an ObjectSpace collector.
+Mon Apr 13 12:47:03 1998  TAKAHASHI Masayoshi  <maki@inac.co.jp>
 
-	* lib/test/unit/collector/objectspace.rb: Ditto.
+	* re.c (kcode_set_option): did not set SJIS on SJIS condition.
 
-	* sample/testunit/*: Added.
+Sun Apr 12 22:14:07 1998  Kazunori NISHI  <kazunori@swlab.csce.kyushu-u.ac.jp>
 
-Fri Sep 19 01:00:48 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* array.c (ary_uniq_bang): should be `==', not `='. embarrassing.
 
-	* lib/webrick/log.rb (BasicLog#log): get rid of as ineffectual
-	  condition.
+Sat Apr 11 02:13:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/log.rb (BasicLog#format): add "\n" to message.
+	* array.c (ary_subseq): SEGVed for `[][1,1]'.
 
-Thu Sep 18 22:43:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Apr 10 21:29:06 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* eval.c (proc_invoke): should push PROT_PCALL tag for orphans.
+	* array.c (ary_subseq): add check for beg larger than array length.
 
-	* eval.c (proc_invoke): should update "result" for orphans.
+Wed Apr  8 17:24:11 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
 
-Thu Sep 18 20:33:03 2003  Tietew  <tietew-ml-ruby-list@tietew.net>
+	* dir.c (dir_s_open): can be called with block (like IO#open).
 
-	* parse.y (str_xquote): do not prepend escapes in
-	  backqoute literals.  [ruby-list:38409]
+	* dir.c (dir_s_chdir): print directory path on error.
 
-Thu Sep 18 20:30:17 2003  Tanaka Akira  <akr@m17n.org>
+	* dir.c (dir_s_chroot): ditto
 
-	* lib/pathname.rb: update document.
+	* dir.c (Init_Dir): needed to override `new'.
 
-Thu Sep 18 15:27:05 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Apr  9 18:24:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/logger.rb: new file.  Logger, formerly called devel-logger or
-	  Devel::Logger.
+	* experimental release 1.1b9_09.
 
-	* sample/logger/*: new file.  samples of logger.rb.
+	* string.c (str_cmp): do not depend on sentinel at the end of the
+	  strings. 
 
-Wed Sep 17 23:41:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (str_chomp_bang): forgot to set the sentinel.
 
-	* eval.c (localjump_destination): should not raise ThreadError
-	  exception for "break". [ruby-dev:21348]
+Wed Apr  8 00:59:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (proc_invoke): use result instead of prot_tag->retval.
-	  retval is no longer propagated to the ancestors.
+	* bignum.c (big2int): converted int may be too big to fit in
+	  signed int.
 
-Wed Sep 17 20:34:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (arg): `foo += 1' should not cause an error.
 
-	* parse.y (tokadd_string, parse_string, yylex): escaped terminator
-	  is now interpreted as is.  [ruby-talk:82206]
+	* variable.c (rb_const_defined): returned false even if the
+	  constant is defined at the top level.
 
-Wed Sep 17 18:52:36 2003  Minero Aoki  <aamine@loveruby.net>
+	* eval.c (f_local_variables): dyna_var->id may be null.  should
+	  have checked before calling str_new2().
 
-	* test/fileutils/fileassertions.rb: new file.
+Tue Apr  7 01:15:15 1998  Kaneko Naoshi  <wbs01621@mail.wbs.or.jp>
 
-	* test/fileutils/test_fileutils.rb: new file.
+	* re.c (reg_regsub): need to check string boundary.
 
-	* test/fileutils/test_nowrite.rb: new file.
+Tue Apr  7 19:19:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Sep 17 18:51:02 2003  Minero Aoki  <aamine@loveruby.net>
+	* string.c (str_cmp): returns either 1, 0, -1.
 
-	* test/strscan/test_stringscanner.rb: require test/unit.
+	* array.c (ary_cmp): should check array length, too
 
-Wed Sep 17 18:35:34 2003  Minero Aoki  <aamine@loveruby.net>
+Tue Apr  7 18:50:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/strscan/test_stringscanner.rb: new file.
+	* experimental release 1.1b9_08.
 
-Wed Sep 17 18:03:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Apr  7 18:31:27 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/openssl: all files are reviewed to simplify and avoid memory leak.
+	* instruby.rb (mandir): dll installation for cygwin32
 
-	* ext/openssl/extconf.rb: add check for assert.h.
+Tue Apr  7 01:16:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl.c (ossl_buf2str): new function to convert
-	  C buffer to String and free buffer.
+	* config.sub (maybe_os): TOWNS support?
 
-	* ext/openssl/ossl.c (ossl_x509_ary2sk): new function to convert
-	  Array of OpenSSL::X509 to STACK_OF(X509) with exception safe.
+	* config.guess: too strict check for libc versions on linuxes.
 
-	* ext/openssl/ossl.c (ossl_to_der, ossl_to_der_if_possible): new
-	  functions to convert object to DER string.
+	* experimental release 1.1b9_07.
 
-	* ext/openssl/ossl.h: ditto.
+	* array.c (ary_cmp): compare each element using `<=>'.
 
-	* ext/openssl/ossl_bio.c (ossl_membio2str): new function to convert
-	  BIO to String object and free BIO.
+	* hash.c (hash_each_with_index): yields [value, key] pair.
 
-	* ext/openssl/ossl_bio.h: ditto.
+	* class.c (class_protected_instance_methods): list protected
+	  method names.
 
-	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_to_der): add for "to_der".
+	* class.c (ins_methods_i): exclude protected methods.
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_der): ditto.
+	* eval.c (PUSH_BLOCK): dynamic variables can be accessed from
+ 	  eval() with bindings.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_to_der): ditto.
+Mon Apr  6 14:49:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_x509ext.c (create_ext_from_array): removed
-	  and reimplement in openssl/x509.rb.
+	* eval.c (thread_yield): must return evaluated value.
 
-	* 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.
+Fri Apr  3 13:07:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/lib/openssl/x509.c (X509::Attribute): get rid off
-	  unused code.
+	* eval.c (thread_schedule): context switch bypassed on wrong
+	  conditions.
 
-	* ext/openssl/lib/openssl/x509.c (X509::ExtensionFactory): refine all.
+	* variable.c (rb_name_class): set classname by id before String
+ 	  class is initialized (1.0 behavior restored).
 
-Tue Sep 16 22:25:06 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Apr  3 11:25:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/csv/test_csv.rb: add negative tests of row_sep.
+	* numeric.c (num2int): no implicit conversion from string.
 
-Tue Sep 16 18:02:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* numeric.c (num2int): check whether `to_i' returns an Integer.
 
-	* regex.c (re_compile_pattern): should not translate character
-	  class range edge. [ruby-list:38393]
+	* numeric.c (num_zero_p): new method.
 
-Tue Sep 16 16:47:56 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* numeric.c (num_nonzero_p): new method.  returns the receiver if
+ 	  it's not zero.
 
-	* MANIFEST: add test/csv/mac.csv.
+	* eval.c (obj_instance_eval): the_class should be the object's
+	  singleton class.
 
-	* win32/Makefile.sub, bcc32/Makefile.sub (test): add phony NUL target.
+	* error.c (exc_s_new): message is converted into a string.
 
-Mon Sep 15 19:02:52 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Apr  2 18:31:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* 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".
+	* eval.c (obj_call_init): every object call `initialize'.
 
-	* test/csv/test_csv.rb: add tests for above feature.
+Wed Apr  1 08:51:53 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* test/csv/mac.csv: added.  Sample CR separated CSV file.
+	* parse.y (stmt): UNTIL_MOD should be for stmt, not only for expr.
 
-Fri Sep 12 22:41:48 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+Wed Apr  1 01:20:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl.c: move ASN.1 stuff to ossl_asn1.[ch]
+	* object.c (true_and): boolean operators &, | and ^.
 
-	* ext/openssl/ossl.c: move BIO stuff to ossl_bio.[ch]
+Tue Mar 31 13:23:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_asn1.[ch]: new files
+	* array.c (ary_compact_bang): returns nil, if it does not modify
+	  the array like String's bang methods.
 
-	* ext/openssl/ossl_bio.[ch]: new files
+	* array.c (ary_uniq_bang): new method to remove duplicate items.
 
-Fri Sep 12 12:30:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (bind_s_new): new method.
 
-	* 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]
+	* numeric.c (num2int): raise exception if Fixnums too big to
+ 	  convert into `int' in case that sizeof(int) < sizeof(INT).
 
-Fri Sep 12 12:09:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (str_center): SEGV on negative width.
 
-	* bignum.c (rb_big_and): convert argument using 'to_int'.
+	* eval.c (eval): forgot to set sourcefile.
 
-	* bignum.c (rb_big_or): ditto.
+Mon Mar 30 11:12:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* bignum.c (rb_big_xor): ditto.
+	* file.c (f_test): raises exception for unknown command.
 
-Fri Sep 12 07:06:14 2003  David Black  <dblack@superlink.net>
+	* eval.c (Init_eval): `class_eval': alias to the module_eval.
 
-	* lib/scanf.rb: Took out useless @matched_item variable; some small
-	  refactoring.
+Mon Mar 30 18:50:42 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-Thu Sep 11 08:43:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (str_capitalize_bang): did not check string modification.
 
-	* eval.c (rb_f_require): allow "require" on $SAFE>0, if feature
-	  name is not tainted.
+	* string.c (str_delete_bang): wrong conversion.
 
-	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::stream):
-	  Supports StringIO.
+	* string.c (str_intern): typo in error message.
 
-Wed Sep 10 22:47:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Mar 30 01:44:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl.h: add a workaround for win32 platform.
-	  libeay32.dll doesn't export functions defined in conf_api.h.
+	* eval.c (obj_instance_eval): accepts block as evaluation body.
+	  No compilation needed each time.
 
-	* ext/openssl/ossl_config.c (ossl_config_initialize): ditto.
+	* eval.c (mod_module_eval): ditto
 
-	* ext/openssl/ossl_config.c (ossl_config_add_value): ditto.
+	* file.c (file_s_umask): umask did not return old values, if no
+ 	  argument given.
 
-	* ext/openssl/ossl_config.c (set_conf_section_i): should check
-	  if the argument is Array.
+Sun Mar 29 00:54:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Sep 10 22:41:54 2003  Tietew  <tietew@tietew.net>
+	* eval.c (f_throw): nil returned always.
 
-	* eval.c (win32_get_exception_list): avoid VC7 warning.
-	  [ruby-win32:577]
+Sat Mar 28 20:40:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* experimental release 1.1b9_06.
 
-	* eval.c (struct tag): dst should be VALUE.
+Sat Mar 28 16:07:11 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (io_closed): should not cause exception for closed IO.
 
-	* eval.c (localjump_destination): stop at the scope where the current
-	  block was created.  [ruby-dev:21353]
+	* string.c (str_tr): returned nil for success.
 
-Tue Sep  9 05:17:04 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Mar 28 00:47:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6.
+	* eval.c (f_local_variables): new method to return an array of
+ 	  local variable names.
 
-Tue Sep  9 02:41:35 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+	* variable.c (obj_instance_variables): now returns an array of
+	  variable names, as described in the reference.
 
-	* ext/openssl/ossl_config.c: Refine compatibility.
+	* eval.c (rb_attr): honors default method visibility of the
+	  current scope.
 
-Tue Sep  9 01:50:45 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Mar 27 13:49:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/httpserver.rb (HTTPServer#access_log): add "\n" to
-	  the message.
+	* experimental release 1.1b9_05.
 
-	* lib/webrick/log.rb (BasicLog#log): add "\n" only if needed.
+	* ruby.c (ruby_prog_init): `site_ruby' added to load_path.
 
-Mon Sep  8 22:15:33 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ruby.c (ruby_prog_init): load-path order changed.  Paths in
+ 	  the RUBYLIB environment variable comes first in non-tainted
+ 	  mode.
 
-	* ext/tk/lib/multi-tk.rb: modify security check at creating
-	  a new interpreter
+Thu Mar 26 11:51:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Mon Sep  8 20:00:12 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_call): new feature: `protected' methods.
 
-	* lib/optparse.rb, lib/optparse/version.rb: search also all
-	  capital versions.
+	* string.c (str_dump): new method.
 
-Mon Sep  8 19:26:33 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* eval.c (block_pass): block argument can be nil, which means no
+	  block is supplied for the method.
 
-	* ext/openssl/ossl.h: include openssl/conf.h and openssl/conf_api.h.
+Wed Mar 25 21:20:13 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
 
-	* ext/openssl/ossl_config.c: refine all with backward compatibility.
+	* string.c (str_reverse_bang): string copied to wrong place.
 
-	* ext/openssl/ossl_config.h: export GetConfigPtr() and DupConfigPtr().
+Wed Mar 25 08:12:07 1998  Yukihiro Matsumoto  <matz@netlab.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.
+	* numeric.c (flo_modulo): caused SEGV if left operand is not a
+ 	  float value.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_free): don't free
-	  the members of the struct. it's left to GC.
+	* eval.c (f_eval): optional third and fourth argument to specify
+	  file-name and line-number.
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509_set_config): add for config=.
+	* eval.c (eval): file-name and line-number set properly.
 
-	* ext/openssl/ossl_x509ext.c (Xossl_x509extfactory_initialize):
-	  add attr readers: issuer_certificate, subject_certificate,
-	  subject_request, crl and config.
+	* parse.y (assign_in_cond): literal assignment is now warning, not 
+	  compile error.
 
-Mon Sep  8 18:26:41 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* error.c (Warn): Warn() always print message, OTOH Waring()
+	  prints when verbose flag is set.
 
-	* lib/webrick/accesslog.rb (AccessLog::setup_params): use req.port
-	  instead of config[:Port] or req.request_uri.port.
+Tue Mar 24 12:50:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): ditto.
+	* ruby.c (ruby_prog_init): `.' should come last in the load-path.
 
-	* lib/webrick/httpservlet/filehandler.rb (FileHandler#dir_list): ditto.
+	* eval.c (Init_eval): `__send__', alias for `send'.
 
-	* lib/webrick/config.rb: :Listen option never be used.
+Mon Mar 23 12:44:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/server.rb (GenericServer#initialize): don't use :Listen
-	  option and add warning message.
+	* string.c (str_chomp_bang): now takes `rs' as an argument.
 
-	* lib/webrick/log.rb (BasicLog#<<): shortcut of log(INFO, ...).
+	* eval.c (thread_free): main_thread should not be freed.
 
-	* lib/webrick/httpserver.rb (HTTPServer#accesslog): use << for logging.
+Fri Mar 20 16:40:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Sep  7 16:08:28 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* string.c (str_chomp_bang): chomp! (and other ! methods) returns
+ 	  nil if it does not modify the string.
 
-	* ext/tcltklib/tcltklib.c (lib_mainloop_core): fixed signal-trap bug
+	* string.c (str_sub_iter_s): should check last pattern since it
+ 	  may be matched to null.
 
-	* ext/tk/lib/*.rb : Ruby/Tk works at $SAFE == 4
+Thu Mar 19 13:48:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Sep  6 02:26:34 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* experimental release 1.1b9_04.
 
-	* test/ruby/test_*.rb: assert_same, assert_match, and so on.
+	* parse.y (yylex): `10e0.9' should cause syntax error.
 
-Sat Sep  6 18:45:46 2003  Mauricio Fernandez  <batsman.geo@yahoo.com>
+Wed Mar 18 17:46:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* parse.y (assignable): call rb_compile_error(), not rb_bug().
-	  [ruby-core:01523]
+	* ruby.c (load_file): new file object constant DATA.  Only
+	  available for the script from the file.
 
-Sat Sep  6 17:40:41 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* regex.c (re_match): forwarding failure point popped too much. 
 
-	* ext/openssl/ruby_missing.c: rid of unnecessary backward
-	  compatibility stuff. and remove DEFINE_ALLOC_WRAPPER from
-	  all sources.
+Tue Mar 17 18:23:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_x509ext.c (X509::Extension.new): new method.
+	* math.c (math_frexp): newly added.
 
-	* ext/openssl/ossl_x509ext.c (X509::Extension#oid=): new method.
+	* math.c (math_ldexp): ditto.
 
-	* ext/openssl/ossl_x509ext.c (X509::Extension#value=): new method.
+	* bignum.c (bigdivmod): calculates modulo.
 
-	* ext/openssl/ossl_x509ext.c (X509::Extension#critical=): new method.
+	* numeric.c (fix_remainder): returns reminder, formerly introduced
+ 	  as modulo.
 
-Sat Sep  6 01:23:22 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* numeric.c (fix_modulo): calculates proper `modulo'.
 
-	* win32/win32.c (CreateChild): need to quote cmd if RUBYSHELL is set.
+	* bignum.c (bigdivmod): wrong sign for reminder.
 
-	* win32/win32.c (CreateChild): fix condition about whether to call
-	  shell or not.
+Mon Mar 16 17:07:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Sep  6 00:36:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+	* experimental release 1.1b9_03.
 
-	* Makefile.in (test): phony target.
+Mon Mar 16 16:33:53 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/mkmf.rb (have_library, find_library): configure by library
-	  name.
+	* io.c (pipe_finalize): needed to add pipe_finalize to pipes on
+	  cygwin32.
 
-	* lib/optparse.rb (OptionParser#order, #permute, #parse): allow an
-	  array as argument.
+Mon Mar 16 14:11:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_*.rb: moved invariants to left side in
-	  assert_equal, and use assert_nil, assert_raises and so on.
+	* class.c (ins_methods_i): needed to consider NOEX_UNDEF.
 
-	* win32/win32.c (isInternalCmd): distinguish command.com and
-	  cmd.exe.
+Mon Mar 16 13:23:53 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* win32/win32.c (make_cmdvector): a character just after wildcard
-	  was ignored.  [ruby-core:01518]
+	* io.c (io_check_closed): check for `fptr->f2 == NULL'.
 
-Fri Sep  5 20:27:08 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* io.c (io_fptr_close): ditto.
 
-	* test/ruby/test_*.rb: replace 'assert(a == b)' with assert_equal(a, b)'
+Mon Mar 16 11:49:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Sep  5 18:00:51 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* io.c (pipe_atexit): free()ing referencing pipe_list.
 
-	* ext/openssl/lib/openssl/x509.rb: new method X509::Name::parse.
+	* range.c (range_length): returns zero, if the first is greater
+	  than the last.
 
-	* ext/openssl/ossl_digest.c: add ossl_digest_new().
+	* signal.c (trap_restore_mask): restore signal mask before raising 
+	  exceptions and throws.
 
-	* ext/openssl/ossl_digest.h: ditto.
+Fri Mar 13 13:49:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/ossl_cipher.c: add ossl_cipher_new().
+	* experimental release 1.1b9_02.
 
-	* ext/openssl/ossl_cipher.h: ditto.
+	* object.c (mod_clone): need to dups constants and instance
+	  variables.
 
-Fri Sep  5 15:32:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_eval): forgot to initialize body for NODE_DEFS.
 
-	* misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): should not
-	  search delimiter forward if found in backward.
+	* eval.c (rb_eval): retrieve self from calling frame, since self
+	  changes sometimes.
 
-Fri Sep  5 13:32:48 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* env.h (FRAME): need to save self in the calling frame.
 
-	* test/runner.rb: arguments should be keys.
+	* io.c (f_gets_method): rs should be initialized by RS.
 
-Fri Sep  5 12:09:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Thu Mar 12 15:33:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_system.rb (test_system): check existence of ruby
-	  interpreter.
+	* experimental release 1.1b9_01.
 
-Fri Sep  5 11:32:17 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* range.c (range_s_new): check values by `first <= last'.
 
-	* lib/optparse.rb (--version): fix assignment/reference order.
+	* parse.y (lastline_set): fixed offset for $_ and $~ in the local
+	  variable space.
 
-	* lib/optparse.rb (OptionParser#help): new; OptionParser#to_s may
-	  be deprecated in future.
+Wed Mar 11 02:14:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/optparse/version.rb (OptionParser#show_version): hide Object.
+	* io.c (io_gets): handle normal case specially for speed.
 
-	* test/runner.rb: fix optparse usage.
+	* eval.c (rb_disable_super): function to disable superclass's
+	  method explicitly.
 
-	* test/runner.rb: glob all testsuits if no tests given.
+	* eval.c (rb_eval): inherits previous method definition's
+	  NOEX_UNDEF-ness, if exists.
 
-Fri Sep  5 10:42:58 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* class.c (rb_define_method): disables superclass's overriding
+ 	  method by default.
 
-	* test/runner.rb: added.  gets testcases from command line and runs it.
+Wed Mar 11 01:40:48 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
 
-	* test/ruby/test_gc.rb: remove useless part which was for dumping test
-	  result.
+	* numeric.c (flo_gt,etc.): do not depend on `<=>', to handle NaN.
 
-Fri Sep  5 09:28:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Mar 10 00:03:24 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.
+	* ruby.c (load_file): understands multiple options in #! line.
 
-Fri Sep  5 03:00:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* regex.c (re_compile_pattern): support for [:alpha:] etc.
 
-	* test/ruby/test_iterator.rb (test_block_in_arg): add no block
-	  given tests.
+Mon Mar  9 16:53:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* test/ruby/test_iterator.rb (test_ljump): uncomment LocalJumpError
-	  test.
+	* io.h (GetOpenFile): embed io_check_closed in GetOpenFile.
 
-Fri Sep  5 01:10:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* sprintf.c (f_sprintf): zero padding failed for negative
+	  integers.
 
-	* test/ruby: tests for ruby itself.
+	* sprintf.c (remove_sign_bits): failed to remove some bits.
 
-	* 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 Mar  7 21:51:46 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
 
-	* test/csv/test_csv.rb: should require 'csv', not '../lib/csv'.  test
-	  runner should set load path correctly.
+	* class.c (ins_methods_i): body may be NULL for some case.
 
-Fri Sep  5 01:03:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Mar  6 17:23:07 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.
+	* regex.c (mbcinit): table driven mbchar detection.
 
-Thu Sep  4 23:59:40 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (obj_alloc): check for allocating instance for the
+	  primitive classes (mostly perfect).
 
-	* parse.y (tokadd_string): newlines have no special meanings in
-	  %w/%W, otherwise they are ignored only when interpolation is
-	  enabled.  [ruby-dev:21325]
+	* ext/curses/curses.c (curses_finalize): restore original state at 
+	  interpreter termination.
 
-Thu Sep  4 19:38:25 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/curses/curses.c (curses_addstr): forgot to check argument
+	  type (caused SEGV).  now uses STR2CSTR() macro.
 
-	* ext/io/wait/.cvsignore: added.
+Thu Mar  5 13:47:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/.cvsignore: added.
+	* eval.c (block_pass): accepts method object as block args.
 
-Thu Sep  4 19:28:24 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* eval.c (f_missing): use any_to_s() for stringify.
 
-	* sample/openssl: added.  Sample of standard distribution library
-	  should be locate in sample/{module_name}/*.
+Wed Mar  4 01:39:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/sample/*: removed.  move to sample/openssl/*.
+	* parse.y (block_arg): new syntax - block argument in the
+	  calling arglist.
 
-Thu Sep  4 18:02:15 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* eval.c (rb_call): no module search. simplified a lot.
 
-	* test/csv/test_csv.rb: use remove_const to reduce warnings.  use
-	  Dir.tmpdir to locate working files.
+	* eval.c (rb_eval): block arg support.
 
-Thu Sep  4 17:41:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (f_block_arg): new syntax - block argument in the
+ 	  formal arglist.
 
-	* misc/ruby-mode.el (ruby-here-doc-beg-re): underscore also is
-	  valid delimiter.
+Tue Mar  3 14:20:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* misc/ruby-mode.el (ruby-here-doc-end-match): must quote
-	  arbitrary string to use as regexp.
+	* eval.c (obj_method): returns bound method object.
 
-	* 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.
+	* eval.c (rb_call): argument check for empty methods.
 
-Thu Sep  4 15:40:07 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ruby.h (NUM2CHR): new macro, originally from curses module.
 
-	* test/csv/test_csv.rb: run on test/unit original layer.
+Tue Mar  3 13:03:35 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
 
-Thu Sep  4 12:54:50 2003  why the lucky stiff  <why@ruby-lang.org>
+	* io.c (io_putc): new method.
 
-	* ext/syck/token.c: headerless documents with root-level spacing now
-	  honored.
+Tue Mar  3 11:21:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Sep  4 00:06:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (str_inspect): more strict charcode detection.
 
-	* eval.c (mark_frame_adj): need to adjust argv pointer if using
-	  system's alloca. [ruby-core:01503]
+	* eval.c (thread_stop): stopping only thread raises ThreadError
+	  exception.
 
-Wed Sep  3 21:33:20 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Mar  3 08:04:56 1998  Tadayoshi Funaba  <tadf@kt.rim.or.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.
+	* struct.c (struct_alloc): incomplete struct initialization made
+ 	  GC to access unallocated addresses.
 
-	* test/csv/*: add testcase for lib/csv.rb.
+Mon Mar  2 16:28:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Sep  3 01:37:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (thread_stop_method): remove Thread#stop.
 
-	* io.c (rb_f_gets): should call next_argv() before type check
-	  current_file. [ruby-list:38336]
+Fri Feb 27 18:16:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Sep  2 20:37:15 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* version 1.1b9 released.
 
-	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): warning
-	  for skipping server verification.
+Fri Feb 27 09:36:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Sep  2 23:36:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* hash.c (hash_delete_nil): needed to compare value to nil, since
+	  nil is the valid key for hashes.
 
-	* eval.c (proc_invoke): should retrieve retval when pcall is true.
+	* hash.c (hash_foreach_iter): rehashing causes IndexError.
 
-Tue Sep  2 14:09:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* hash.c (hash_foreach_iter): rehash check by pointer comparison.
 
-	* ext/socket/extconf.rb: check s6_addr8 in in6_addr (Tru64 UNIX).
-	  the patch is submitted by nmu <nmu@users.sourceforge.jp>.
+Thu Feb 26 17:22:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/socket/getaddrinfo.c (getaddrinfo): should use in6_addr8 on
-	  some platforms.
+	* parse.y (fname): convert reswords into symbols.
 
-	* ext/socket/getnameinfo.c (getnameinfo): ditto.
+	* parse.y (reswords): reserved words are now embedded in the
+ 	  syntax (sigh).
 
-Tue Sep  2 14:02:19 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* parse.y: now reserved words can be method names safely.
 
-	* ext/tcltklib/tcltklib.c (ip_invoke): fixed bug on passing a exception
+Wed Feb 25 15:50:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb} :
-	  bug fix and improvement of font control
+	* eval.c (mod_module_eval): clear the_scope's PRIVATE flag before
+	  calling eval().
 
-Tue Sep  2 09:51:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_call_finalizer_at_exit): run finalizers before any data 
+	  object being freed.
 
-	* eval.c (rb_eval): should not handle exceptions within rescue
-	  argument.  [ruby-talk:80804]
+	* eval.c (rb_eval): needed to keep prot_tag->retval before
+	  evaluating the ensure clause.
 
-Tue Sep  2 00:44:37 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Feb 24 11:16:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* re.c (rb_memsearch): fix overrun.  [ruby-talk:80759]
+	* parse.y (yylex): reserved words can be appear as method names at
+ 	  right after 'def' and `.'(dot), like foo.next.
 
-Tue Sep  2 00:41:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (return_check): checks for return out of thread (formerly
+ 	  done in return_value).
 
-	* ext/iconv/iconv.c (map_charset): use lower case keys.
+	* eval.c (POP_TAG): copy retval to outer level.
 
-	* ext/iconv/iconv.c (iconv_fail): just yield error and return the
-	  result if a block is given.
+	* eval.c (return_value): just set retval, no check, no unwinding.
 
-	* ext/iconv/iconv.c (iconv_convert): yield error and append the
-	  result if a block is given.
+	* parse.y (nextc): line continuation by backslash at end of line.
 
-	* ext/iconv/charset_alias.rb (charset_alias): optional third
-	  argument.
+	* regex.c (re_compile_pattern): forgot to clear pending_exact on
+	  closing parentheses.
 
-	* ext/iconv/charset_alias.rb (charset_alias): use CP932 instead of
-	  SHIFT_JIS on cygwin.
+	* parse.y (assignable): should not assign dyna_var to true, if it
+ 	  is already defined.
 
-Mon Sep  1 18:34:25 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Feb 23 14:35:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_eval): make tail recursion in ELSE clause of
-	  RESCUE a jump.
+	* object.c (obj_is_kind_of): no longer accepts true/false/nil.
 
-Mon Sep  1 18:00:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* object.c ({true,false,nil}_to_i): can be converted into integers.
 
-	* parse.y (aref_args): forgot to call NEW_SPLAT(). reported by
-	  Dave Butcher.
+Mon Feb 23 12:11:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (Init_Thread): protect thgroup_default.  suggested by Guy
-	  Decoux in [ruby-talk:80623]
+	* re.c (reg_s_quote): needed to be mbchar aware.
 
-Mon Sep  1 16:59:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (proc_s_new): wrong iter mark.
 
-	* eval.c (rb_thread_switch): add RESTORE_EXIT; exit by another
-	  thread termination.
+Sat Feb 21 22:59:30 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
 
-	* 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]
+	* io.c (f_syscall): no argument check.
 
-Sun Aug 31 22:46:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Fri Feb 20 10:17:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (TAG_DST()): take no argument.
+	* version 1.1b8 released.
 
-	* process.c (p_gid_sw_ensure): return VALUE.
+	* ext/kconv/kconv.c (kconv_kconv): default output code now be
+	  determined according to the value of $KCODE.
 
-Sun Aug 31 22:27:10 2003  Hidetoshi NAGAI  <nagai@dumbo.ai.kyutech.ac.jp>
+	* re.c (rb_get_kcode): can retrieve $KCODE from C code. 
 
-	* process.c (p_gid_sw_ensure): lack of function type
+	* parse.y (stmt): if/unless modifiers returns nil, if condition is 
+	  not established.
 
-Sun Aug 31 12:25:06 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+Thu Feb 19 11:06:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/optparse.rb: --version takes an optional argument; "all" or
-	  a list of package names.
+	* ext/kconv/kconv.c (kconv_kconv): charcode can be specified by
+	  code name (JIS, SJIS, EUC like value of $KCODE).
 
-Sun Aug 31 10:17:02 2003  Tadayoshi Funaba  <tadf@dotrb.org>
+	* regex.c (re_compile_pattern): forgot to fixup_jump for (?:..).
 
-	* lib/date/format.rb: yyyy/mm is not an acceptable format.
+	* regex.c (re_compile_pattern): needed to clear pending_exact on
+	  non-registering grouping (?:...).
 
-	* lib/time.rb: follow above.
+Wed Feb 18 19:54:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sat Aug 30 14:25:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (here_document): needed to set lex_state to EXPR_END.
 
-	* eval.c (rb_iter_break): should not call TAG_JUMP directly.
+Wed Feb 18 18:45:10 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Sat Aug 30 03:58:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* patches for cygwin32 applied.
 
-	* eval.c (struct BLOCK): remove BLOCKTAG, use scope instead.
+Wed Feb 18 00:41:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (POP_TAG): no longer propagate retval.  retval is now set
-	  directly by localjump_destination().
+	* string.c (str_sub_s): needed to be mbchar aware to increment one
+ 	  character.
 
-	* eval.c (localjump_destination): new function to cast
-	  return/break local jump.
+	* regex.c (re_match): \Z matches newline just before the end of
+	  the string.
 
-	* eval.c (rb_yield_0): stop TAG_RETURN/TAG_BREAK escaping.
+Tue Feb 17 00:04:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Aug 29 22:35:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* time.c (time_arg): Time.gm and Time.local now understands
+ 	  Time#to_a format.
 
-	* bigdecimal.c *.html: The 2nd arg. for add,sub,mult, and div is 0,
-	  then result will be the same as +,-,*,/ respectively.
+	* string.c (str_sub_s): replace happened twice for null pattern.
 
-Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* regex.c (re_search): null pattern should not match after newline 
+	  at the end of string.
 
-	* process.c: bug fix
+	* time.c (time_isdst): now returns boolean value.
 
-	* process.c: add rb_secure(2) to methods of Process::{UID,GID,Sys}
+	* error.c (rb_check_type): treat special constants in messages.
 
-	* process.c: deny handling IDs during evaluating the block given to
-	  the Process::{UID,GID}.switch method
+	* parse.y (yylex): new form `::Const' to see toplevel constants.
 
-	* ext/tcltklib/tcltklib.c : some methods have no effect if on slave-IP
+	* parse.y (cond): SEGV on `if ()'.
 
-	* ext/tcltklib/tcltklib.c : can create a interpreter without Tk
+	* gc.c (obj_free): some data needed explicit free().
 
-	* ext/tcltklib/tcltklib.c : bug fix on handling exceptions
+Mon Feb 16 23:55:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tcltklib/MANUAL.euc : modify
+	* eval.c (blk_free): release duplicated block informations.
 
-	* ext/tk/lib/tk.rb : freeze some core modules
+	* eval.c (blk_copy_prev): duplicate outer block information into
+ 	  the heap, when proc/binding created.
 
-	* ext/tk/lib/multi-tk.rb : more secure
+Mon Feb 16 14:38:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
-	  Tk's list
+	* time.c (time_mon): now 1 for January and so on.
 
-	* ext/tk/lib/tk.rb: improve accessibility of TkVariable object
+	* time.c (time_year): year in 19xx (no + 1900 needed anymore).
 
-	* 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
+Mon Feb 16 13:28:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/tk/lib/tkfont.rb TkFont.new() accepts compound fonts
+	* regex.c (re_compile_pattern): need to fetch mbchar's second byte
+ 	  without translation.
 
-Thu Aug 28 22:07:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Feb 16 12:29:27 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
 
-	* variable.c (rb_autoload_load): call const_missing if autoloading
-	  constant is not defined to allow hook.
+	* eval.c (f_pass_block): pass iterator block to other method.
 
-	* eval.c (rb_eval): use rb_const_get_from() instead of
-	  rb_const_get_at().
+Fri Feb 13 08:16:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (is_defined): forgot to check NODE_COLON3.
+	* parse.y (parse_regx): handle \s before read_escape().
 
-Thu Aug 28 17:30:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (read_escape): `\s' in strings as space.
 
-	* variable.c (rb_const_get_0): should check constants defined in
-	  included modules, if klass is Object. [ruby-talk:79302]
+Tue Feb 10 17:29:08 1998  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]
+	* version 1.1b7 released.
 
-Thu Aug 28 05:02:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (str_aset): string insertion by `str[n] = str2'.
 
-	* parse.y (singleton): typo fixed (ruby-bugs-ja:PR#562)
+	* string.c (str_oct): does recognize `0x'.
 
-Thu Aug 28 02:37:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+ 	* sprintf.c (f_sprintf): use base 10 for conversion from string to
+ 	  integer.
 
-	* eval.c (rb_eval): *a = [1,2] now assigns [[1,2]] to a.
-	  consistent with *a = [1], which set [[1]] to a.
+Mon Feb  9 14:51:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* node.h: merge NODE_RESTARY to NODE_SPLAT.
+	* numeric.c (do_coerce): proper error message.
 
-	* parse.y: rules simplified a bit by removing NODE_RESTARY.
+	* string.c (str_sum): bug - masked by wrong value. (sigh..)
 
-	* sample/test.rb: updated for new assignment behavior.
+Sat Feb  7 15:11:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug 27 22:33:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (str_empty): new method
 
-	* error.c (rb_bug): should not use other methods; this function is
-	  not for ordinary use.  [ruby-dev:21259]
+Fri Feb  6 01:42:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug 27 15:07:57 2003  Minero Aoki  <aamine@loveruby.net>
+	* time.c (time_asctime): use asctime(3), not strftime(3).
 
-	* lib/net/smtp.rb (check_response): AUTH CRAM-MD5 returns 334
-	  response. [ruby-list:38279]
+Thu Feb  5 18:58:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug 27 05:10:15 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* io.c (io_fptr_close): do not free path on close().
 
-	* win32/win32.c (map_errno): support winsock error.
+	* array.c (ary_filter): new method.
 
-	* 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().
+	* enum.c (enum_each_with_index): new method.
 
-	* 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().
+Thu Feb  5 14:10:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* win32/win32.h: add winsock errors.
+	* parse.y (primary): singleton class def can be appeared inside
+ 	  method bodies.
 
-Tue Aug 26 23:53:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* hash.c (hash_replace): replace content.
 
-	* lib/ostruct.rb (OpenStruct::method_missing): prohibit modifying
-	  frozen OpenStruct. [ruby-talk:80214]
+	* string.c (str_replace_method): replace content.
 
-Tue Aug 26 20:03:50 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (ary_replace_method): replace elements.
 
-	* lib/mkmf.rb (create_tmpsrc): add the hook for source.
-	  [ruby-list:38122]
+	* string.c (str_succ_bang): String#succ!
 
-Tue Aug 26 15:59:53 2003  why the lucky stiff  <why@ruby-lang.org>
+Thu Feb  5 18:20:30 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* implicit.c (syck_type_id_to_taguri): corrected detection of
-	  x-private types.
+	* string.c (str_upcase_bang): multi byte character support.
 
-Sun Aug 24 01:02:48 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Feb  4 13:55:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* file.c (file_expand_path): performance improvement.
-	  [ruby-talk:79748]
+	* array.c (ary_reverse): SEGV on empty array reverse.
 
-Sat Aug 23 23:41:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Feb  3 12:24:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* file.c (rb_file_s_expand_path): avoid calling rb_scan_args() for
-	  apparent cases. [ruby-talk:79748]
+	* re.c (match_to_a): non matching element should be nil.
 
-Sat Aug 23 18:56:53 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.c (ruby_load_script): load script after all initialization.
 
-	* 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]
+	* bignum.c (str2inum): need to interpret prefix `0' of `0x'.
 
-Sat Aug 23 16:48:41 2003  Keiju Ishitsuka  <keiju@ishitsuka.com>
+Tue Feb  3 10:00:18 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/irb/ruby-lex.rb: bug fix for "foo" !~ /bar/. [ruby-talk:79942]
+	* numeric.c (fix_rshift): use `sizeof(INT)*8' instead of 32.
 
-Sat Aug 23 15:59:58 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Feb  2 14:09:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_eval, rb_iterate, block_pass): reduce PUSH/POP_TAG and
-	  EXEC_TAG() for retry.  [ruby-dev:21216]
+	* ruby.c (set_arg0): grab environment region too.
 
-Sat Aug 23 02:32:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jan 29 18:36:25 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* eval.c (rb_yield_splat): should check if "values" is array.
+	* process.c (rb_proc_exec): check `sh' to be exist.
 
-	* enum.c (each_with_index_i): typo.
+Thu Jan 29 18:18:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Aug 22 17:07:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (io_stdio_set): assignment to $stdin or $stdout does
+	  reopen() as well as $stderr.
 
-	* enum.c (inject_i): use rb_yield_values.
+Thu Jan 29 14:18:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* enum.c (each_with_index_i): ditto.
+	* class.c (mod_ancestors): should not include singleton classes.
 
-	* eval.c (rb_yield_splat): new function to call "yield *values".
+	* object.c (obj_type): should not return internal class.
 
-	* string.c (rb_str_scan): use rb_yield_splat().
+	* io.c (io_reopen): unwillingly closes stdio streams.
 
-Fri Aug 22 06:13:22 2003  why the lucky stiff  <why@ruby-lang.org>
+Thu Jan 29 11:50:35 1998  Toshihiko SHIMOKAWA  <toshi@csce.kyushu-u.ac.jp>
 
-	* ext/syck/rubyext.c: refactoring of the transfer method
-	  dispatch.  added yaml_org_handler for faster dispatch of
-	  transfers to base types.
+	* ext/socket/socket.c (udp_addrsetup): forgot to use htons().
 
-	* lib/yaml/rubytypes.rb: removed handling of builtins from
-	  Ruby library.
+Tue Jan 27 23:15:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/token.c: quoted and block scalars are now implicit !str
+	* keywords: __FILE__, __LINE__ are available again.
 
-	* ext/syck/implicit.c: empty string detected as !null.
+Fri Jan 23 14:19:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Aug 22 01:00:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* version 1.1b6 released.
 
-	* eval.c (block_pass): improve passing current block.
+	* object.c (mod_to_s): need to duplicate classpath.
 
-Fri Aug 22 00:13:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* error.c (exc_inspect): need to duplicate classpath.
 
-	* ext/bigdecimal/bigdecimal.c: Int. overflow bug in multiplication
-	  fixed, and VpNmlz() speed up.
+Thu Jan 22 00:37:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug 20 16:44:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.h (STR2CSTR): new macro to retrieve char*.
 
-	* ext/socket/socket.c (ruby_connect): many systems seem to have
-	  a problem in select() after EINPROGRESS.  [ruby-list:38080]
+	* class.c (rb_define_method): `initialize' should always be
+	  private, even if it defined by C extensions.
 
-Wed Aug 20 01:31:17 2003  why the lucky stiff  <why@ruby-lang.org>
+	* eval.c (rb_eval): `initialize' should always be private.
 
-	* ext/syck/syck.h: Parser definition problems on HP-UX.
-	  [ruby-talk:79389]
+Thu Jan 22 16:21:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/syck/handler.c (syck_hdlr_get_anchor): Memory leak.
+	* eval.c (rb_eval): some singleton class def cause SEGV.
 
-	* ext/syck/syck.s (syck_io_file_read): Bad arguments to fread.
+	* eval.c (TMP_ALLOC): replace ALLOCA_N, where thread context
+ 	  switch may happen.
 
-	* ext/syck/rubyext.c: Tainting issues.
+Wed Jan 21 01:43:42 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Aug 19 23:20:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* eval.c (PUSH_FRAME): do not use ALLOCA_N().  crash on some
+	  platforms that use missing/alloca.c.
 
-	* ext/bigdecimal/bigdecimal.c .h .html: to_s("+") implemented.
+	* regex.c (re_compile_pattern): too many pops for non register
+	  subexpr.
 
-	* ext/bigdecimal/lib/bigdecimal/math.rb: E implemented.
+	* parse.y (yylex): open parentheses after identifiers are argument 
+	  list, even if whitespaces have seen.
 
-Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Jan 20 15:19:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/ssl.rb: new file; SSL/TLS enhancement for GenericServer.
+	* parse.y (terms): quoted word list by %w(a b c).
 
-	* lib/webrick/https.rb: SSLSocket handling is moved to webrick/ssl.rb.
+	* ext/tcltklib/extconf.rb: more accurate check for tcl/tk libs.
 
-	* lib/webrick/compat.rb (File::fnmatch): remove old migration code.
+	* file.c (rb_stat): most of the FileTest methods (and function
+ 	  `test') accept File objects as the argument.
 
-	* lib/webrick/httpserver.rb (HTTPServer#run): ditto.
+Tue Jan 19 18:19:24 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/webrick/server.rb (GenericServer#listen): the body of this
-	  method is pull out as Utils::create_lisnteners.
+	* ext/extmk.rb.in (install): there should be no newline after install:
 
-	* lib/webrick/utils.rb (Utils::create_lisnteners): new method.
+	* re.c (MIN): renamed from min().  there's a local variable named
+ 	  min in the file, so that some cpp will raise an error.
 
-	* lib/webrick/server.rb (GenericServer#start): should rescue
-	  unknown errors. and refine comments.
+Mon Jan 19 16:30:05 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): should close
-	  socket if SSLSocket raises error.
+	* version 1.1b5 released.
 
-Tue Aug 19 11:19:33 2003  Shugo Maeda  <shugo@ruby-lang.org>
+	* process.c (rb_syswait): no exception raised.
 
-	* io.c (next_argv): should not call GetOpenFile() if rb_stdout is
-	  not a IO (T_FILE).
+Fri Jan 16 00:43:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ruby.h (CLONESETUP): copies its singleton classes too.
 
-	* ext/openssl/ossl_ssl.c: sync_close is moved to SSLSocket as
-	  a builtin.
+	* class.c (singleton_class_attached): saves binded object in the
+	  singleton classes.
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#close): ditto.
+	* eval.c (rb_eval): calls singleton_method_added even in the
+	  singleton class clauses.
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#puts): should
-	  add a return to the tails of each line.
+Fri Jan 15 23:22:43 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/openssl/lib/openssl/ssl.rb: new class OpenSSL::SSL::SSLServer.
+	* ruby.c (proc_options): -S does not recognize PATH.
 
-	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): use sync_close.
+Thu Jan 15 02:03:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/sample/echo_svr.rb: use SSLServer.
+	* eval.c (rb_clear_cache_by_id): clear only affected cache
+	  entries.
 
-	* ext/openssl/sample/echo_cli.rb: add example of SSLSocket#sync_close.
+Wed Jan 14 02:14:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Aug 19 01:24:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/socket.c: new UDP/IP socket classes.
 
-	* ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): Mac OS X standard
-	  headers are inconsistent at this macro.  [ruby-core:01432]
+Tue Jan 13 10:00:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/curses/extconf.rb: check if _XOPEN_SOURCE_EXTENDED breaks.
+	* string.c (str_cmp): ignorecase($=) works wrong.
 
-	* ext/tcltklib/stubs.c: Status macro in X11/Xthreads.h bothers
-	  winspool.h
+Fri Jan  9 13:19:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* instruby.rb: make list at first instead of iterator.
-	  [ruby-talk:79347]
+	* version 1.1b4 released.
 
-Mon Aug 18 11:23:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (f_missing): class name omitted from the error message.
 
-	* dir.c (glob_helper): preserve raw order for **.
+	* error.c (exc_inspect): description changed.
 
-Sun Aug 17 23:39:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (Init_String): GlobalExit's superclass did not filled,
+	  since GlobalExit created earlier than String.
 
-	* ext/openssl/extconf.rb (HAVE_VA_ARGS_MACRO): need to compile.
+Thu Jan  8 12:10:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Sun Aug 17 17:10:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (aryset): expr in the brackets can be null.
 
-	* 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 Jan  7 21:13:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/openssl/lib/openssl/buffering.rb: add forwarders to
-	  setsockopt, getsockopt and fcntl.
+	* io.c (io_reopen): keep stderr unclosed.
 
-	* ext/openssl/lib/net/protocols.rb: enable sync for SSLSocket.
+	* io.c (io_errset): keep stderr unclosed.
 
-Sun Aug 17 11:32:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jan  6 00:27:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/extmk.rb (extmake): should not force to remake Makefile when
-	  installation and so on.
+	* parse.y: syntax modified for `while expr do .. end' etc.
 
-Sat Aug 16 23:58:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (f_exec,f_system): can supply arbitrary name for the
+ 	  new process.
 
-	* marshal.c (w_symbol, w_object): get rid of warnings.
+Mon Jan  5 16:59:13 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* re.c (rb_memsearch): ditto.
+	* file.c (file_s_basename): removes any extension by ".*".
 
-	* time.c (time_dump): ditto.
+Sun Jan  4 19:36:22 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/extmk.rb (extmake): not continue making when extconf.rb
-	  failed.
+	* parse.y (yylex): needed to update lex_p (reading point).
 
-	* ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely.
+Sat Jan  3 19:14:14 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/openssl/ossl.h: remove version.h dependency.
+	* class.c,object.c: duplicate defines mKernel and cFinxnum.
 
-	* ext/openssl/ruby_missing.h: ditto.
+Fri Jan  2 20:38:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/mkmf.rb (pkg_config): use --libs output except with
-	  only-L for other options.  [ruby-list:38099]
+	* ext/curses/curses.c (NUM2CHAR): uses the first character for
+ 	  string arguments.
 
-	* lib/mkmf.rb (create_makefile): separate rule for static
-	  library from shared object.
+	* array.c (ary_fill): did not extend array for ranges.
 
-	* win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub:
-	  define exec_prefix and libdir.
+	* array.c (beg_len): did not return end pos bigger than size.
 
-Fri Aug 15 23:15:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Fri Jan  2 02:09:16 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/bigdecimal/bigdecimal.c .h: Bug in combination of limit & div
-	  method fixed.
+	* dir.c (dir_s_chdir): bug in nil check.
 
-	* ext/bigdecimal/lib/bigdecimal/math.rb: atan() & sqrt() added.
+	* array.c (ary_fill): bug in nil check.
 
-Fri Aug 15 12:01:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec 30 11:46:23 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* 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
+	* hash.c (env_path_tainted): checks directories in PATH
+	  environment variable are not world writable.
 
-	* error.c (syserr_eqq): errno might exceed Fixnum limit.
+	* ruby.c (load_file): invoke specified interpreter if the #! line
+ 	  does not contain the word `ruby'.
 
-	* error.c (Init_Exception): moved base initialization from
-	  init_syserr().
+Fri Dec 26 03:26:41 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* inits.c (rb_call_inits): postpone initializing errnos until
-	  Bignum is available.
+	* string.c (uscore_get): type information included in the error
+ 	  message.
 
-Fri Aug 15 12:01:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* variable.c (f_untrace_var): does not free trace-data within
+ 	  trace procedure.
 
-	* ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): needed to let
-	  keyname() and so on be declared.
+Thu Dec 25 02:50:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/curses/curses.c (curses_resizeterm, window_resize):
-	  arguments conflicted with macros in term.h.
+	* version 1.1b3 released.
 
-	* ext/curses/curses.c (Curses module methods): ensure
-	  initialized.  [ruby-dev:21191]
+	* ruby.h: inlining some functions on gcc 2.x
 
-Fri Aug 15 02:08:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Dec 23 02:47:33 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* gc.c (id2ref): recycle check should be done by klass == 0.
-	  [ruby-core:01408]
+	* eval.c (rb_eval): public/private information kept in the current 
+	  scope, to remove undesired state from the class/module.
 
-Fri Aug 15 01:34:23 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+	* time.c (time_strftime): remove hidden limit of 100 bytes of
+	  result string, using malloc'ed buffer. 
 
-	* ext/openssl/ossl_pkey.c: move generate_cb here
+	* hash.c (hash_update): merges the contents of another hash,
+	  overriding existing keys.
 
-	* ext/openssl/ossl_pkey_{dh|dsa|rsa}.c: adapt to this cb
+	* regex.c (must_instr): totally re-written.
 
-	* ext/openssl/openssl_missing.[ch]: add (0.9.6x, x<j) missing BN funcs
+	* io.c (read_all): try to allocate proper sized buffer using
+	  fstat(2) for speedup.
 
-	* ext/openssl/ossl_bn.c: use supplied funcs from openssl_missing.c
+Sat Dec 20 00:27:28 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Fri Aug 15 00:38:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* regex.c (must_instr): need to skip 2 bytes for mbchars.
 
-	* ext/bigdecimal/bigdecimal.c: Bug in div method fixed.
+Fri Dec 19 01:18:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/bigdecimal/lib/bigdecimal/math.rb: Newly added.
+	* version 1.1b2 released.
 
-	* ext/bigdecimal/sample/pi.rb: Changed so as to use math.rb.
+	* eval.c (check_errat): check and convert (if necessary) traceback 
+	  information before assigning to the variable $@.
 
-Thu Aug 14 21:19:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (f_raise): optional third argument to specify traceback
+	  information.
 
-	* eval.c (Init_Thread): Continuation#[] added.  [ruby-talk:79028]
+	* io.c (f_open): prevent infinite recursive call.
 
-Thu Aug 14 20:03:34 2003  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Thu Dec 18 19:33:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/win32ole/win32ole.c (OLE_FREE): should not call
-	  ole_message_loop.
+	* string.c (str_rindex): now accepts regexp as index.
 
-	* ext/win32ole/win32ole.c (ole_event_free): ditto.
+Thu Dec 18 18:42:50 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* ext/win32ole/win32ole.c (ole_initialize): stop calling
-	  OleUninitialize at exit.
+	* ext/socket/extconf.rb: modified to detect win32 socket lib.
 
-Thu Aug 14 11:27:37 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Dec 18 00:25:03 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* gc.c (rb_data_object_alloc): check type of 1st argument.
-	  [ruby-dev:21192]
+	* re.c (reg_equal): checks for source and casefold and kcode matching.
 
-Thu Aug 14 00:21:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c: became built-in module.
 
-	* parse.y (mlhs_node): should allow "::Foo" (colon3) as lhs.
+	* ext/marshal/marshal.c (r_object): displays struct name for
+	  non-compatible struct.
 
-	* parse.y (lhs): ditto.
+	* string.c (str_index_method): now searches character (fixnum) in
+	  the string.
 
-	* parse.y (yylex): should return tCOLON3 right after kCLASS.
-	  [ruby-talk:78918]
+	* string.c (str_include): redefine `include?'.
 
-	* error.c (exc_initialize): was converting argument to string too
-	  eagerly.  Only check was needed. [ruby-talk:78958]
+	* regex.c (re_match): start_nowidth saves current stack position
+	  to stop_nowidth.
 
-Wed Aug 13 23:31:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* regex.c (re_compile_pattern): add space to stop_nowidth to save
+	  runtime stack position.
 
-	* ext/bigdecimal/bigdecimal.c .h .html: Ambiguity of
-	  BigDecimal::limit removed.
+Tue Dec 16 14:57:43 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug 13 19:21:34 2003  Christian Neukirchen  <chneukirchen@yahoo.de>
+	* string.c (scan_once): wrong exception for regexp that match with 
+	  null string (use substr instead of subseq).
 
-	* lib/webrick/https.rb (HTTPServer#run): should set syncing-mode
-	  to SSLSocket. [ruby-talk:78919]
+Sat Dec 13 00:13:32 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug 13 18:13:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (expr): remove bare assocs from expr rule.
 
-	* eval.c (POP_BLOCK): turn on BLOCK_LEFT flag when leaving block.
+	* rbconfig.rb: renamed from config.rb (it was too generic name).
 
-	* eval.c (proc_invoke): unpack return/break destination when block
-	  is already left.
+Fri Dec 12 00:50:25 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug 13 15:58:31 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* parse.y (expr): warns if BEGIN or END appear in the method
+ 	  bodies.
 
-	* object.c (rb_class_s_alloc): add function prototype to avoid VC++
-	  warning.
+	* string.c (str_match): calls y =~ x if y is neither String nor
+	  Regexp so that eregex.rb works.  
 
-Wed Aug 13 13:50:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (f_at_exit): to register end proc.
 
-	* ext/Win32API/Win32API.c (Win32API_initialize): should pass some
-	  class to first argument of Data_Wrap_Struct(). (ruby-bugs:PR#1109)
+	* class.c (rb_define_module_function): define 'function' method
+	  for the Module, not private method.
 
-Tue Aug 12 16:55:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* class.c (rb_define_function): function to define `function' method.
 
-	* Makefile.in: static link libraries to LIBRUBY_SO with static linked
-	  ext.  [ruby-dev:21157]
+	* eval.c (rb_eval): inherit visibility from superclass's method
+	  except when it is set to `function'
 
-	* ext/extmk.rb (extmake): sort extension library initialization order.
+	* eval.c (rb_eval): new visibility status `function'.
 
-	* ext/extmk.rb (extmake): compact $extlibs.
+	* parse.y (yycompile): do not clear eval_tree. thus enable multiple 
+	  command line script by option `-e'.
 
-Tue Aug 12 02:48:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_eval): END execute just once.
 
-	* eval.c (THREAD_SAVE_CONTEXT): should explicitly turn off the
-	  flag before calling getcontext(2).
+	* parse.y (expr): BEGIN/END built in the syntax.
 
-	* eval.c (struct thread): add member to save backing store on
-	  IA64. (ruby-bugs PR1086)
+Thu Dec 11 13:14:35 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (thread_mark): mark IA64 backing store region.
+	* object.c (mod_le): Module (or Class) comparison.
 
-	* eval.c (thread_free): free saved IA64 backing store.
+	* eval.c (rb_remove_method): raises NameError if named method does 
+	  not exist.
 
-	* eval.c (rb_thread_save_context): save IA64 backing store as well.
+	* ext/curses/curses.c: remove CHECK macro for BSD curses.
 
-	* eval.c (rb_thread_restore_context): restore IA64 backing store.
+Thu Dec 11 12:44:01 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* eval.c (THREAD_ALLOC): initialize IA64 members.
+	* pack.c: sun4 cc patch
 
-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>.
+Wed Dec 10 15:21:36 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/debug.rb(debug_command): incomplete regexp.
+	* ext/marshal/marshal.c (marshal_load): can supply evolution proc
+	  object as optional second argument.
 
-Mon Aug 11 17:33:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* re.c (reg_source): get source string of the regular expression.
 
-	* eval.c (rb_call_super): do not use rb_block_given_p() for
-	  check. [ruby-talk:78656]
+Tue Dec  9 10:05:17 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.
+	* version 1.1b1 released.
 
-Sun Aug 10 10:43:05 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* parse.y (tokadd): token buffer overrun.
 
-	* ext/openssl/lib/openssl/buffering.rb: increase BLOCK_SIZE
-	  from 1k to 16k bytes. [ruby-talk:78603]
+	* ruby.c (ruby_prog_init): forgot to protect rb_argv0 from gc.
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): enable
-	  partial write to allow interruption in SSLSocket#write.
+	* eval.c (ruby_run): call finalizers at process termination.
 
-Sun Aug 10 00:34:16 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* gc.c (gc_call_finalizer_at_exit): call free proc for every Data
+ 	  Wrapper, and finalizer for specified objects at termination.
 
-	* cygwin/GNUmakefile: remove unnecessary '--drive-name=$(CC)'
-	  for ccache.
+	* version.c (show_version): version format changed.
 
-Sat Aug  9 10:36:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (re_match): wrong match with non-greedy if they appear
+	  more than once in regular expressions.
 
-	* marshal.c (w_object): do not dump generic instance variable when
-	  marshal_dump is defined.
+	* sample/ruby-mode.el (ruby-expr-beg): forgot to handle modifiers.
 
-Sat Aug  9 00:35:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Mon Dec  8 19:00:15 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* 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.
+	* io.c (io_puts): just put a newline if no argument given.
 
-Fri Aug  8 12:33:17 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/tcltklib/tcltklib.c (lib_mainloop): thread-aware tk handle
+ 	  when $tk_thread_safe is set.
 
-	* bcc32/Makefile.sub: rubyw.exe should be a Windows GUI program.
-	  add the -aa option to WLDFLAGS.
+	* ext/tcltklib/tcltklib.c (lib_mainloop): use Tcl_DoOneEvent()
+	  instead of Tk_MainLoop().
 
-Fri Aug  8 11:29:26 2003  Koji Arai  <jca02266@nifty.ne.jp>
+Mon Dec  6 07:11:16 1997  MAEDA shugo  <shugo@po.aianet.ne.jp>
 
-	* marshal.c (w_object): should set `c_arg' at first.
+	* io.c (io_puts): core dumped without any argument.
 
-Fri Aug  8 03:22:28 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Dec  5 18:17:17 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/webrick/httputils.rb (FormData#list): should not take
-	  a side effect for the receiver.
+	* eval.c (mod_remove_method): remove (not undef) a method from the 
+	  class/module.
 
-Thu Aug  7 14:40:37 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* variable.c (obj_remove_instance_variable): method to remove
+	  instance variables.
 
-	* cygwin/GNUmakefile: better --disbale-shared option support.
+Thu Dec  4 13:50:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* cygwin/GNUmakefile: add forwarding DLL target for cygwin.
+	* version 1.1b0 released.
 
-Thu Aug  7 14:21:05 2003  Corinna Vinschen  <vinschen@redhat.com>
+	* string.c (str_aref): called str_index for regexp.
 
-	* configure.in: Fix Cygwin specific naming of libraries to
-	  be net distribution compliant. (ruby-bugs:PR#1077)
-	  cygwin-ruby18.dll -> cygruby18.dll
+Mon Dec  1 15:24:41 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Aug  7 12:51:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* compar.c (cmp_between): wrong comparison made.
 
-	* eval.c (rb_f_at_exit): should not be called without a block.
-	  block_given check added.
+Wed Nov 26 18:18:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Thu Aug  7 06:46:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mkmf.rb: generate Makefile for extension modules out of ruby 
+	  source tree. use like `ruby -r mkmf extconf.rb'.
 
-	* eval.c (rb_call0): forgot to pop ruby_class.
+	* numeric.c (fix2str): enlarge buffer to prevent overflow on some
+	  machines.
 
-	* eval.c (rb_call0): update ruby_class as well as ruby_cref.
-	  (ruby-bugs-ja:PR#540)
+	* parse.y (here_document): wrong line number generated after here-doc.
 
-Thu Aug  7 04:52:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Nov 21 13:17:12 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_yield_0): remove ruby_frame->cbase and unify to
-	  ruby_cref.  [ruby-talk:78141]
+	* parse.y (yylex): skip multibyte characters in comments.
 
-Thu Aug  7 04:19:15 2003  Akinori MUSHA  <knu@iDaemons.org>
+Wed Nov 19 17:19:20 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* 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.
+	* object.c (nil_to_a): nil.to_a => [].
 
-Thu Aug  7 00:15:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* parse.y (call_args): wrong node generation.
 
-	* ext/bigdecimal.c: Comparison results adjusted to Float's.
-	* ext/bigdecimal.c: Use rb_num_coerce_????(x,y) instead of own.
+Tue Nov 18 10:13:08 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug  6 22:58:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* array.c (Init_Array): Array#=== works as Array#include?
 
-	* lib/test/unit/testcase.rb: Added equality checking.
-	* lib/test/unit/testsuite.rb: Added equality checking.
-	* lib/test/unit/assertions.rb: Fixed a warning.
+	* regex.c (re_compile_pattern): insert initialize code for jump_n, 
+	  before entering loops.
 
-Wed Aug  6 17:28:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* re.c (reg_search): does not save registers unless $& etc appear
+	  in the script.
 
-	* ext/extmk.rb (extmake): pass LIBPATH to make ruby.  [ruby-dev:21137]
+Mon Nov 17 13:01:43 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/extmk.rb (extmake): set library name as source file name in
-	  Init_ext().  [ruby-dev:21137]
+	* eval.c (is_defined): add defined? check for receivers and
+ 	  arguments for calls.
 
-	* lib/mkmf.rb (Logging::postpone): postpone logging messages after
-	  heading message as the result of the block.
+	* re.c (reg_search): cache last match object.
 
-	* lib/mkmf.rb (macro_defined?): append newline to src unless ended
-	  with it.
+	* re.c (match_aref): $[0] etc. are available.
 
-	* lib/mkmf.rb (have_library): treat nil function name as "main".
-	  (ruby-bugs:PR#1083)
+Sat Nov 15 00:11:36 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* lib/mkmf.rb (pkg_config): should append additional libraries to
-	  $libs but not $LIBS.  [ruby-dev:21137]
+	* io.c (io_s_popen): "rb" detection
 
-	* ext/io/wait/extconf.rb: check DOSISH macro instead of platform.
+Fri Nov 14 18:28:40 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* ext/digest/sha1/extconf.rb: have_library already appends library
-	  name.
+	* string.c (scan_once): returns whole match if the pattern does
+	  not contain any parentheses.
 
-Wed Aug  6 17:23:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Nov 13 14:39:06 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c: initialize /* OK */ variables by Qnil to stop warnings.
+	* string.c (str_sub): returns copy of the receiver string, even if 
+	  any substitution occurred.
 
-Wed Aug  6 04:58:32 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* regex.c (re_compile_pattern): no-width match by (?=..), (?!..).
 
-	* ext/Setup*: add io/wait and openssl.
+Wed Nov 12 13:44:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Wed Aug  6 01:13:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* time.c: remove coerce from Time class.
 
-	* eval.c (rb_f_autoload): use ruby_cbase instead of ruby_class.
+	* regex.c (re_match): non-greedy match by ??, *? +?, {n,m}?.
 
-	* eval.c (rb_f_autoload_p): ditto.
+Mon Nov 10 11:24:51 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* class.c (rb_mod_init_copy): no longer implements independent
-	  clone and dup methods.  override "initialize_copy" instead.
-	  [ruby-core:01352]
+	* regex.c (re_compile_pattern): non-registering parens (?:..).
 
-	* object.c (rb_class_s_alloc): define Class allocation function.
-	  this makes Classes to follow clone framework that uses
-	  initialize_copy.
+	* regex.c (re_compile_pattern): new meta character \< (wordbeg)
+	  and \> (wordend).
 
-	* object.c (rb_class_initialize): separate instantiation and
-	  initialization.
+	* regex.c (re_compile_pattern): embedded comment for regular
+	  expression by (?#...).
 
-	* object.c (rb_obj_alloc): prohibit instantiation from
-	  uninitialized class.
+Fri Nov  7 16:58:24 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* object.c (rb_class_superclass): check uninitialized class.
+	* regex.c (re_compile_pattern): perl5 regxp \A and \Z available.
 
-	* array.c (rb_ary_fill): wrong index processing with block.  this
-	  fix was done by Koji Arai <JCA02266@nifty.ne.jp> [ruby-list:38029]
+	* regex.c (re_compile_pattern): can expand compile stack dynamically.
 
-	* marshal.c (w_object): should preserve generic ivar for nil,
-	  true, false, symbols, and fixnums.
+	* regex.c (PUSH_FAILURE_POINT): wrong compare condition.
 
-	* marshal.c (w_uclass): base_klass check should be done after
-	  rb_class_real().
+Wed Nov  2 16:00:00 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-Wed Aug  6 01:18:50 2003  Minero Aoki  <aamine@loveruby.net>
+	* string.c (str_sub_s): "".sub! "", "" => "\000"
 
-	* lib/net/http.rb: update document.
+Fri Oct 31 15:52:10 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* lib/net/pop.rb: ditto.
+	* parse.y (assoc): keyword assoc like {fg->"black"}.
 
-	* lib/net/protocol.rb: ditto.
+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.
 
-Wed Aug  6 00:48:37 2003  Koji Arai  <jca02266@nifty.ne.jp>
+	* parse.y: provides more accurate line number information.
 
-	* marshal.c (w_object): should recommend marshal_dump rather than
-	  _dump_data.
+	* eval.c (thread_value): include value's backtrace information in
+	  the variable `$@'. 
 
-Tue Aug  5 17:58:57 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* eval.c (f_abort): print backtrace and exit.
 
-	* lib/fileutils.rb (install): should preserve timestamp only.
+Sat Aug 16 00:17:44 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-Tue Aug  5 17:31:59 2003  Ian Macdonald  <ian@caliban.org>
+	* eval.c (class_new_instance): do not make instance from virtual
+	  classes. 
 
-	* lib/shell/command-processor.rb (Shell::CommandProcessor::rmdir):
-	  simple typo.
+	* object.c (class_s_new): do not make subclass of singleton class.
 
-Tue Aug  5 15:47:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug 15 15:49:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-	* eval.c (rb_load): should preserve current source file/line.
+	* eval.c (call_trace_func): block context switch in the trace
+	  function.
 
-Tue Aug  5 10:04:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c (rb_eval): clear method cache at class extension.
 
-	* string.c (str_new4): ptr may refer null_str.
+	* object.c (obj_type): returns object's class even if it defines
+	  singleton methods.
 
-Mon Aug  4 17:25:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Aug 15 19:40:43 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* stable version 1.8.0 released.
+	* ext/socket/socket.c (Init_socket): small typo caused SEGV.
 
-For the changes before 1.8.0, see doc/ChangeLog-1.8.0
+Wed Aug 13 17:51:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
-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:
+	* version 1.1 alpha0 released.
diff --git a/LEGAL b/LEGAL
index 908eb270f5..8a87bfa668 100644
--- a/LEGAL
+++ b/LEGAL
@@ -140,6 +140,7 @@ missing/isinf.c:
 missing/isnan.c:
 missing/memcmp.c:
 missing/memmove.c:
+missing/mkdir.c:
 missing/strcasecmp.c:
 missing/strchr.c:
 missing/streror.c:
@@ -184,8 +185,6 @@ missing/strtoul.c:
     software for any purpose.  It is provided "as is" without
     express or implied warranty.
 
-missing/erf.c:
-missing/crypt.c:
 missing/vsnprintf.c:
 
   This file is under the old-style BSD license.  Note that the
@@ -205,7 +204,11 @@ missing/vsnprintf.c:
     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 University nor the names of its contributors
+    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.
 
@@ -305,20 +308,17 @@ ext/digest/sha2/sha2hl.c:
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-ext/nkf/nkf-utf8/config.h:
-ext/nkf/nkf-utf8/nkf.c:
-ext/nkf/nkf-utf8/utf8tbl.c:
+ext/nkf/nkf1.7/nkf.c:
 
-  These files are under the following license.  So to speak, it is
+  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,
+       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.
-       Binary distribution requires original version messages.
-       You don't have to ask before copying, redistribution or publishing.
+       You don't have to ask before copying or publishing.
        THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
 
 ext/socket/addrinfo.h:
diff --git a/MANIFEST b/MANIFEST
new file mode 100644
index 0000000000..84331165cf
--- /dev/null
+++ b/MANIFEST
@@ -0,0 +1,364 @@
+COPYING
+COPYING.ja
+ChangeLog
+GPL
+LEGAL
+LGPL
+MANIFEST
+Makefile.in
+README
+README.ja
+README.EXT
+README.EXT.ja
+ToDo
+array.c
+bignum.c
+class.c
+compar.c
+configure
+configure.in
+config.guess
+config.sub
+defines.h
+dir.c
+dln.c
+dln.h
+dmyext.c
+enum.c
+env.h
+error.c
+eval.c
+file.c
+gc.c
+hash.c
+inits.c
+install-sh
+instruby.rb
+intern.h
+io.c
+keywords
+lex.c
+main.c
+marshal.c
+math.c
+mdoc2man.rb
+missing.h
+mkconfig.rb
+node.h
+numeric.c
+object.c
+pack.c
+parse.c
+parse.y
+prec.c
+process.c
+random.c
+range.c
+re.c
+re.h
+regex.c
+regex.h
+ruby.1
+ruby.c
+ruby.h
+rubyio.h
+rubysig.h
+rubytest.rb
+signal.c
+sprintf.c
+st.c
+st.h
+string.c
+struct.c
+time.c
+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
+cygwin/GNUmakefile.in
+djgpp/GNUmakefile.in
+djgpp/README.djgpp
+djgpp/config.hin
+djgpp/config.sed
+djgpp/configure.bat
+djgpp/mkver.sed
+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/aix_mksym.rb
+ext/configsub.rb
+ext/extmk.rb
+lib/English.rb
+lib/Env.rb
+lib/README
+lib/base64.rb
+lib/benchmark.rb
+lib/cgi-lib.rb
+lib/cgi.rb
+lib/cgi/session.rb
+lib/complex.rb
+lib/date.rb
+lib/date/format.rb
+lib/date2.rb
+lib/debug.rb
+lib/delegate.rb
+lib/e2mmap.rb
+lib/erb.rb
+lib/eregex.rb
+lib/fileutils.rb
+lib/finalize.rb
+lib/find.rb
+lib/forwardable.rb
+lib/ftools.rb
+lib/getoptlong.rb
+lib/getopts.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/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/shellwords.rb
+lib/optparse/time.rb
+lib/optparse/uri.rb
+lib/ostruct.rb
+lib/parsearg.rb
+lib/parsedate.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/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/sync.rb
+lib/tempfile.rb
+lib/thread.rb
+lib/thwait.rb
+lib/time.rb
+lib/timeout.rb
+lib/tracer.rb
+lib/tsort.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
+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/dup2.c
+missing/file.h
+missing/fileblocks.c
+missing/finite.c
+missing/flock.c
+missing/hypot.c
+missing/isinf.c
+missing/isnan.c
+missing/memcmp.c
+missing/memmove.c
+missing/mkdir.c
+missing/os2.c
+missing/strcasecmp.c
+missing/strchr.c
+missing/strerror.c
+missing/strftime.c
+missing/strncasecmp.c
+missing/strstr.c
+missing/strtod.c
+missing/strtol.c
+missing/strtoul.c
+missing/vsnprintf.c
+missing/x68.c
+sample/README
+sample/biorhythm.rb
+sample/cal.rb
+sample/cbreak.rb
+sample/clnt.rb
+sample/dbmtest.rb
+sample/dir.rb
+sample/dualstack-fetch.rb
+sample/dualstack-httpd.rb
+sample/eval.rb
+sample/export.rb
+sample/exyacc.rb
+sample/fact.rb
+sample/fib.awk
+sample/fib.pl
+sample/fib.py
+sample/fib.rb
+sample/fib.scm
+sample/freq.rb
+sample/from.rb
+sample/fullpath.rb
+sample/getopts.test
+sample/goodfriday.rb
+sample/less.rb
+sample/list.rb
+sample/list2.rb
+sample/list3.rb
+sample/mine.rb
+sample/mkproto.rb
+sample/mpart.rb
+sample/mrshtest.rb
+sample/observ.rb
+sample/occur.pl
+sample/occur.rb
+sample/occur2.rb
+sample/philos.rb
+sample/pi.rb
+sample/rcs.awk
+sample/rcs.dat
+sample/rcs.rb
+sample/regx.rb
+sample/sieve.rb
+sample/svr.rb
+sample/test.rb
+sample/time.rb
+sample/trojan.rb
+sample/tsvr.rb
+sample/uumerge.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/win32.c
+win32/win32.h
+win32/winmain.c
+x68/_dtos18.c
+x68/_round.c
+x68/fconvert.c
+x68/select.c
+wince/README.wince
+wince/assert.h
+wince/config
+wince/configure.bat
+wince/direct.c
+wince/direct.h
+wince/dll.mak
+wince/errno.c
+wince/errno.h
+wince/exe.mak
+wince/fcntl.h
+wince/io.c
+wince/io.h
+wince/mswince-ruby17.def
+wince/process.c
+wince/process.h
+wince/signal.c
+wince/signal.h
+wince/stddef.h
+wince/stdio.c
+wince/stdlib.c
+wince/string.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.c
+wince/time.h
+wince/varargs.h
+wince/wince.c
+wince/wince.h
+wince/wincemain.c
+wince/wincon.h
+wince/winsock2.c
diff --git a/Makefile.in b/Makefile.in
index 8fd59babcd..825a5f4729 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,7 +10,6 @@ YACC = @YACC@
 PURIFY =
 AUTOCONF = autoconf
 @SET_MAKE@
-MKFILES = @MAKEFILES@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -18,23 +17,12 @@ bindir = @bindir@
 sbindir = @sbindir@
 libdir = @libdir@
 libexecdir = @libexecdir@
-datarootdir = @datarootdir@
-datadir = @datadir@
 arch = @arch@
 sitearch = @sitearch@
 sitedir = @sitedir@
 
-TESTUI = console
-TESTS =
-RDOCTARGET = @RDOCTARGET@
-
-EXTOUT = @EXTOUT@
-RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
-
-empty =
-OUTFLAG = @OUTFLAG@$(empty)
-CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
-CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
+CFLAGS = @CFLAGS@ @XCFLAGS@
+CPPFLAGS = -I. -I$(srcdir)
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXTLDFLAGS = 
 XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
@@ -42,10 +30,9 @@ EXTLIBS =
 LIBS = @LIBS@ $(EXTLIBS)
 MISSING = @LIBOBJS@ @ALLOCA@
 LDSHARED = @LIBRUBY_LDSHARED@
-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
+DLDFLAGS = @LIBRUBY_DLDFLAGS@
 SOLIBS = @SOLIBS@
 MAINLIBS = @MAINLIBS@
-MINIOBJS = @MINIOBJS@
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
@@ -53,7 +40,6 @@ EXEEXT = @EXEEXT@
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 RUBY = $(RUBY_INSTALL_NAME)
 MINIRUBY = @MINIRUBY@
-RUNRUBY = @RUNRUBY@
 
 #### End of system configuration section. ####
 
@@ -69,55 +55,122 @@ LIBRUBYARG    = @LIBRUBYARG@
 LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
 LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
 
-PREP          = @PREP@
-ARCHFILE      = @ARCHFILE@
+PREP          = @PREP@ @ARCHFILE@
 SETUP         =
-EXTSTATIC     = @EXTSTATIC@
 
-RM            = rm -f
-NM            = @NM@
-AR            = @AR@
-ARFLAGS       = rcu
-RANLIB        = @RANLIB@
-AS            = @AS@
-ASFLAGS       = @ASFLAGS@
+EXTOBJS	      = 
+
+MAINOBJ	      = main.@OBJEXT@
+
+OBJS	      = array.@OBJEXT@ \
+		bignum.@OBJEXT@ \
+		class.@OBJEXT@ \
+		compar.@OBJEXT@ \
+		dir.@OBJEXT@ \
+		dln.@OBJEXT@ \
+		enum.@OBJEXT@ \
+		error.@OBJEXT@ \
+		eval.@OBJEXT@ \
+		file.@OBJEXT@ \
+		gc.@OBJEXT@ \
+		hash.@OBJEXT@ \
+		inits.@OBJEXT@ \
+		io.@OBJEXT@ \
+		marshal.@OBJEXT@ \
+		math.@OBJEXT@ \
+		numeric.@OBJEXT@ \
+		object.@OBJEXT@ \
+		pack.@OBJEXT@ \
+		parse.@OBJEXT@ \
+		process.@OBJEXT@ \
+		prec.@OBJEXT@ \
+		random.@OBJEXT@ \
+		range.@OBJEXT@ \
+		re.@OBJEXT@ \
+		regex.@OBJEXT@ \
+		ruby.@OBJEXT@ \
+		signal.@OBJEXT@ \
+		sprintf.@OBJEXT@ \
+		st.@OBJEXT@ \
+		string.@OBJEXT@ \
+		struct.@OBJEXT@ \
+		time.@OBJEXT@ \
+		util.@OBJEXT@ \
+		variable.@OBJEXT@ \
+		version.@OBJEXT@ \
+		$(MISSING)
 
-OBJEXT        = @OBJEXT@
 MANTYPE	      = @MANTYPE@
 
-PREINSTALL    = @PREINSTALL@
-#### End of variables
+SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
+		--make="$(MAKE)" \
+		--mflags="$(MFLAGS)" \
+		--make-flags="$(MAKEFLAGS)"
 
-all:
+all:		@MAKEFILES@ miniruby$(EXEEXT) rbconfig.rb $(LIBRUBY)
+		@$(MINIRUBY) $(srcdir)/ext/extmk.rb --extstatic="@EXTSTATIC@" $(SCRIPT_ARGS)
 
-.DEFAULT: all
+miniruby$(EXEEXT):	config.status $(LIBRUBY_A) $(MAINOBJ) dmyext.@OBJEXT@
+		@rm -f $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) dmyext.@OBJEXT@ $(LIBRUBY_A) $(LIBS) -o $@
 
-# Prevent GNU make v3 from overflowing arg limit on SysV.
-.NOEXPORT:
+$(PROGRAM):     $(LIBRUBY) $(MAINOBJ) $(EXTOBJS) $(SETUP) miniruby$(EXEEXT)
+		@rm -f $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
-miniruby$(EXEEXT):
-		@$(RM) $@
-		$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(MAINLIBS)
+$(LIBRUBY_A):	$(OBJS) dmyext.@OBJEXT@
+		@AR@ rcu $@ $(OBJS) dmyext.@OBJEXT@
+		@-@RANLIB@ $@ 2> /dev/null || true
 
-$(PROGRAM):
-		@$(RM) $@
-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
-
-# We must `rm' the library each time this rule is invoked because "updating" a
-# MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
-# supported.
-$(LIBRUBY_A):
-		@$(RM) $@
-		$(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
-		@-$(RANLIB) $@ 2> /dev/null || true
-
-$(LIBRUBY_SO):
-		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
+$(LIBRUBY_SO):	$(OBJS) dmyext.@OBJEXT@ miniruby$(EXEEXT) $(PREP)
+		$(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.@OBJEXT@ $(SOLIBS) -o $@
 		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
 
-fake.rb:	Makefile
+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
+
+clean-local:
+		@rm -f $(OBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY_ALIASES)
+		@rm -f ext/extinit.c ext/extinit.@OBJEXT@ dmyext.@OBJEXT@
+		@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
+		@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
+		@rm -f parse.c
+		@rm -f lex.c
+
+test:		miniruby$(EXEEXT) rbconfig.rb $(PROGRAM)
+		@./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; \
@@ -125,25 +178,21 @@ fake.rb:	Makefile
 		  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; \
+		end \
 		' > $@
 
 Makefile:	$(srcdir)/Makefile.in
 
-$(MKFILES): config.status $(srcdir)/common.mk
+.PRECIOUS:	@MAKEFILES@
+
+@MAKEFILES@: config.status
 		MAKE=$(MAKE) $(SHELL) ./config.status
-		@{ \
+		@{ : $(MAKE); \
 		    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 || \
+		} > conftest.mk
+		@$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
 		{ echo "Makefile updated, restart."; exit 1; }
 
 config.status:	$(srcdir)/configure
@@ -152,27 +201,155 @@ config.status:	$(srcdir)/configure
 $(srcdir)/configure: $(srcdir)/configure.in
 		cd $(srcdir) && $(AUTOCONF)
 
+.c.@OBJEXT@:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
 lex.c: keywords
-	@-$(RM) $@
-	gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@ || \
-	cp "$(srcdir)/$@" .
+	gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $(srcdir)/keywords > lex.c
 
 .y.c:
 	$(YACC) $<
 	sed '/^#/s|y\.tab\.c|$@|' y.tab.c > $@
 	rm -f y.tab.c
 
-.c.@OBJEXT@:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ext/extinit.@OBJEXT@: ext/extinit.c $(SETUP)
+	$(CC) $(CFLAGS) $(CPPFLAGS) @OUTFLAG@$@ -c ext/extinit.c
+
+acosh.@OBJEXT@: $(srcdir)/missing/acosh.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/acosh.c
 
-.s.@OBJEXT@:
-	$(AS) $(ASFLAGS) -o $@ $<
+alloca.@OBJEXT@: $(srcdir)/missing/alloca.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/alloca.c
 
-clean-local::
-	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
+crypt.@OBJEXT@: $(srcdir)/missing/crypt.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/crypt.c
 
-distclean-local::
-	@$(RM) ext/config.cache $(RBCONFIG)
+dup2.@OBJEXT@: $(srcdir)/missing/dup2.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/dup2.c
 
-ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c
+fileblocks.@OBJEXT@: $(srcdir)/missing/fileblocks.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/fileblocks.c
+
+finite.@OBJEXT@: $(srcdir)/missing/finite.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/finite.c
+
+flock.@OBJEXT@: $(srcdir)/missing/flock.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/flock.c
+
+isinf.@OBJEXT@: $(srcdir)/missing/isinf.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/isinf.c
+
+isnan.@OBJEXT@: $(srcdir)/missing/isnan.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/isnan.c
+
+fnmatch.@OBJEXT@: $(srcdir)/missing/fnmatch.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/fnmatch.c
+
+memcmp.@OBJEXT@: $(srcdir)/missing/memcmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/memcmp.c
+
+memmove.@OBJEXT@: $(srcdir)/missing/memmove.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/memmove.c
+
+mkdir.@OBJEXT@: $(srcdir)/missing/mkdir.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/mkdir.c
+
+vsnprintf.@OBJEXT@: $(srcdir)/missing/vsnprintf.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/vsnprintf.c
+
+strcasecmp.@OBJEXT@: $(srcdir)/missing/strcasecmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strcasecmp.c
+
+strncasecmp.@OBJEXT@: $(srcdir)/missing/strncasecmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strncasecmp.c
+
+strchr.@OBJEXT@: $(srcdir)/missing/strchr.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strchr.c
+
+strerror.@OBJEXT@: $(srcdir)/missing/strerror.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strerror.c
+
+strftime.@OBJEXT@: $(srcdir)/missing/strftime.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strftime.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
+
+strtoul.@OBJEXT@: $(srcdir)/missing/strtoul.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strtoul.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
+
+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
+
+# 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
+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 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
+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
+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
+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
+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
+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
+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
diff --git a/README b/README
index cf836415ad..bde22dff78 100644
--- a/README
+++ b/README
@@ -22,24 +22,16 @@ Perl).  It is simple, straight-forward, and extensible.
 
 * How to get Ruby
 
-The Ruby distribution files can be found in the following FTP site:
+The Ruby distribution can be found on:
 
   ftp://ftp.ruby-lang.org/pub/ruby/
 
-The latest source code of this version series can be checked out
-through SVN with the following command:
+You can get it by anonymous CVS.  How to check out is:
 
-  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
-
-The trunk of the Ruby source tree can be checked out with the
-following command:
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-
-There are some other branches under development.  Try the following
-command and see the list of branches:
-
-  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+  $ 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
@@ -70,7 +62,7 @@ This is what you need to do to compile and install Ruby:
 
   2. Run ./configure, which will generate config.h and Makefile.
 
-  3. Edit defines.h if you need.  Usually this step will not be needed.
+  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
      add module names if not present), if you want to link modules
diff --git a/README.EXT b/README.EXT
index e5d39911ca..95c5ddea61 100644
--- a/README.EXT
+++ b/README.EXT
@@ -35,7 +35,6 @@ The Ruby interpreter has the following data types:
 	T_HASH		associative array
 	T_STRUCT	(Ruby) structure
 	T_BIGNUM	multi precision integer
-	T_FILE		IO
 	T_TRUE		true
 	T_FALSE		false
 	T_DATA		data
@@ -94,20 +93,7 @@ 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.
+an exception will be raised if the 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
@@ -115,7 +101,7 @@ 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".
 
-For example, `RSTRING(str)->len' is the way to get the size of the
+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
 `RARRAY(ary)->ptr' respectively.
@@ -295,15 +281,6 @@ To define alias to the method,
 
   void rb_define_alias(VALUE module, const char* new, const char* old);
 
-To define and undefine the `allocate' class method,
-
-  void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
-  void rb_undef_alloc_func(VALUE klass);
-
-func have to take the klass as the argument and return a newly
-allocated instance.  This instance should be empty as possible,
-without any expensive (including external) resources.
-
 2.1.3 Constant definition
 
 We have 2 functions to define constants:
@@ -330,30 +307,17 @@ 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 ID.  ID is the integer number to represent Ruby's
-identifiers such as variable names.  The Ruby data type corresponding to ID
-is Symbol.  It can be accessed from Ruby in the form:
+You can invoke methods directly, without parsing the string.  First I
+need to explain about symbols (whose 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:
 
  :Identifier
 
-You can get the ID value from a string within C code by using
+You can get the symbol value from a string within C code by using
 
   rb_intern(const char *name)
 
-You can retrieve ID from Ruby object (Symbol or String) given as an
-argument by using
-
-  rb_to_id(VALUE symbol)
-
-You can convert C ID to Ruby Symbol by using
-
-  VALUE ID2SYM(ID id)
-
-and to convert Ruby Symbol object to ID, use
-
-  ID SYM2ID(VALUE symbol)
-
 2.2.3 Invoke Ruby method from C
 
 To invoke methods directly, you can use the function below
@@ -444,9 +408,8 @@ DATA), use Data_Wrap_Struct().
 Data_Wrap_Struct() returns a created DATA object.  The klass 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.
 
@@ -482,11 +445,19 @@ directory in the Ruby's source tree.
 
 Make a directory for the extension library under ext directory.
 
-(2) design the library
+(2) create MANIFEST file
+
+  % cd ext/dbm
+  % touch MANIFEST
+
+There should be MANIFEST file in the directory for the extension
+library.  Make an empty file for now.
+
+(3) design the library
 
 You need to design the library features, before making it.
 
-(3) write C code.
+(4) write C code.
 
 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
@@ -517,8 +488,6 @@ Init_dbm()
     rb_define_method(cDBM, "[]", fdbm_fetch, 1);
 		:
 
-    /* ID for a instance variable to store DBM data */
-    id_dbm = rb_intern("dbm");
 }
 --
 
@@ -614,10 +583,11 @@ are not exported to the Ruby world.  You need to protect them by
 
   void rb_global_variable(VALUE *var)
 
-(4) prepare extconf.rb
+(5) prepare extconf.rb
 
 If the file named extconf.rb exists, it will be executed to generate
-Makefile.
+Makefile.  If not, the compilation scheme will try to generate Makefile
+anyway.
 
 extconf.rb is the file for check compilation conditions etc.  You
 need to put
@@ -634,20 +604,14 @@ various conditions.
 
 The value of the variables below will affect the Makefile.
 
-  $CFLAGS: included in CFLAGS make variable (such as -O)
-  $CPPFLAGS: included in CPPFLAGS make variable (such as -I, -D)
+  $CFLAGS: included in CFLAGS make variable (such as -I)
   $LDFLAGS: included in LDFLAGS make variable (such as -L)
-  $objs: list of object file names
-
-In normal, object files list is automatically generated by searching
-source files, but you need directs them explicitly if any sources will
-be generated while building.
 
 If a compilation condition is not fulfilled, you should not call
 ``create_makefile''.  The Makefile will not generated, compilation will
 not be done.
 
-(5) prepare depend (optional)
+(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
@@ -656,7 +620,16 @@ check dependencies.  You can make this file by invoking
 
 It's no harm.  Prepare it.
 
-(6) generate Makefile
+(7) put file names into MANIFEST (optional)
+
+  % find * -type f -print > MANIFEST
+  % 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.
+
+(8) generate Makefile
 
 Try generating the Makefile by:
 
@@ -666,7 +639,7 @@ You don't need this step if you put the extension library under the ext
 directory of the ruby source tree.  In that case, compilation of the
 interpreter will do this step for you.
 
-(7) make
+(9) make
 
 Type
 
@@ -675,13 +648,13 @@ Type
 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.
 
-(8) debug
+(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.
 
-(9) done, now you have the extension library
+(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.
@@ -783,27 +756,6 @@ 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)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
-rb_str_new2(s)
-
 ** defining class/module
 
  VALUE rb_define_class(const char *name, VALUE super)
@@ -819,7 +771,7 @@ namespace.
 
 Defines a new Ruby module.
 
- VALUE rb_define_module_under(VALUE module, const char *name)
+ VALUE rb_define_module_under(VALUE module, const char *name, VALUE super)
 
 Defines a new Ruby module under the module's namespace.
 
@@ -992,10 +944,6 @@ Prints a warning message according to a printf-like format.
 Prints a warning message according to a printf-like format, if
 $VERBOSE is true.
 
-void rb_raise(rb_eRuntimeError, const char *fmt, ...)
-
-Raises RuntimeError.  The fmt is a format string just like printf().
-
  void rb_raise(VALUE exception, const char *fmt, ...)
 
 Raises a class exception.  The fmt is a format string just like printf().
@@ -1035,11 +983,6 @@ Appendix C. Functions Available in extconf.rb
 
 These functions are available in extconf.rb:
 
- have_macro(macro, headers)
-
-Checks whether macro is defined with header.  Returns true if the macro
-is defined.
-
  have_library(lib, func)
 
 Checks whether the library exists, containing the specified function.
@@ -1056,61 +999,20 @@ 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().
 
- have_var(var, header)
-
-Checks whether var exists with header.  Returns true if the variable
-exists.  To check variables in an 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.
 
- find_header(header, path...)
-
-Checks whether header exists in path.  Returns true if the header file
-exists.
-
- have_struct_member(type, member, header)
-
-Checks whether type has member with header.  Returns true if the type
-is defined and has the member.
-
- have_type(type, header, opt)
-
-Checks whether type is defined with header.  Returns true if the type
-is defined.
-
- check_sizeof(type, header)
-
-Checks the size of type in char with header.  Returns the size if the
-type is defined, otherwise nil.
-
  create_makefile(target)
 
 Generates the Makefile for the extension library.  If you don't invoke
 this method, the compilation will not be done.
 
- find_executable(bin, path)
-
-Finds command in path, which is File::PATH_SEPARATOR-separated list of
-directories.  If path is nil or omitted, environment varialbe PATH
-will be used.  Returns the path name of the command if it is found,
-otherwise nil.
-
  with_config(withval[, default=nil])
 
 Parses the command line options and returns the value specified by
 --with-<withval>.
 
- enable_config(config, *defaults)
- disable_config(config, *defaults)
-
-Parses the command line options for boolean.  Returns true if
---enable-<config> is given, or false if --disable-<config> is given.
-Otherwise, yields defaults to the given block and returns the result
-if it is called with a block, or returns defaults.
-
  dir_config(target[, default_dir])
  dir_config(target[, default_include, default_lib])
 
@@ -1120,12 +1022,6 @@ 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]).
 
- pkg_config(pkg)
-
-Obtains the information of pkg by pkg-config command.  The actual
-command name can be overriden by --with-pkg-config command line
-option.
-
 /*
  * Local variables:
  * fill-column: 70
diff --git a/README.EXT.ja b/README.EXT.ja
index 30c4d520ba..0ef67497ce 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -104,19 +104,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�Ϥ��Τޤޥ��㥹��(���Ѵ�)����й�¤�Τ�
@@ -331,17 +322,6 @@ private�᥽�åɤȤϴؿ������Ǥ����ƤӽФ����Ȥν���ʤ��᥽��
 
   void rb_define_alias(VALUE module, const char* new, const char* old);
 
-���饹�᥽�å�allocate������������������ꤹ�뤿��δؿ���
-�ʲ����̤�Ǥ���
-
-  void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
-  void rb_undef_alloc_func(VALUE klass);
-
-func�ϥ��饹������Ȥ��Ƽ�����äơ�������������Ƥ�줿����
-�����󥹤��֤��ʤ��ƤϤʤ�ޤ��󡣤��Υ��󥹥��󥹤ϡ�������
-�������ʤɤ�ޤޤʤ����Ǥ�������ֶ��פΤޤޤˤ��Ƥ������ۤ�
-���褤�Ǥ��礦��
-
 2.1.3 ������
 
 ��ĥ�饤�֥�꤬ɬ�פ�����Ϥ��餫����������Ƥ����������ɤ�
@@ -380,8 +360,7 @@ C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ����Ȥ�Ǥ���
 �����������ˡ�Ruby���󥿥ץ꥿��ǥ᥽�åɤ��ѿ�̾����ꤹ��
 ���˻Ȥ��Ƥ���ID�ˤĤ����������Ƥ����ޤ��礦��
 
-ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby�Ǥ�ID���б�����
-���֥������ȤȤ��ƥ���ܥ�(Symbol)�����ꡤ
+ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby����Ǥ�
 
  :���̻�
 
@@ -394,14 +373,6 @@ ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby�Ǥ�ID���б�����
 
   rb_to_id(VALUE symbol)
 
-ID���饷��ܥ�����뤿��ˤϰʲ��Υޥ�����Ȥ��ޤ���
-
-  VALUE ID2SYM(ID id)
-
-����ܥ뤫��ID�����뤿��ˤϰʲ��Υޥ�����Ȥ��ޤ���
-
-  ID SYM2ID(VALUE symbol)
-
 2.2.3 C����Ruby�Υ᥽�åɤ�ƤӽФ�
 
 C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ�����ˤϰʲ�
@@ -522,8 +493,7 @@ C�ι�¤�ΤؤΥݥ��󥿤Ǥ���mark�Ϥ��ι�¤�Τ�Ruby�Υ��֥���
 # ���Τ褦�ʻ��Ȥϴ�����ޤ���
 
 free�Ϥ��ι�¤�Τ��⤦���פˤʤä����˸ƤФ��ؿ��Ǥ�������
-�ؿ��������١������쥯������ƤФ�ޤ������줬-1�ξ��ϡ�ñ
-��˳�������ޤ���
+�ؿ��������١������쥯������ƤФ�ޤ���
 
 C�ι�¤�Τγ�����Data���֥������Ȥ�������Ʊ���˹Ԥ��ޥ�����
 ���ưʲ��Τ�Τ��󶡤���Ƥ��ޤ���
@@ -562,14 +532,28 @@ Ruby 1.1�����Ǥ�դΥǥ��쥯�ȥ�ǥ����ʥߥå��饤�֥����
 �饤�֥���ѤΥǥ��쥯�ȥ����ɬ�פ�����ޤ���̾����Ŭ����
 ����ǹ����ޤ���
 
-(2) �߷פ���
+(2) MANIFEST�ե��������
+
+  % cd ext/dbm
+  % touch MANIFEST
+
+��ĥ�饤�֥��Υǥ��쥯�ȥ�β��ˤ�MANIFEST�Ȥ����ե����뤬
+ɬ�פʤΤǡ��Ȥꤢ�������Υե�������äƤ����ޤ�����Ǥ���
+�ե�����ˤ�ɬ�פʥե�������������뤳�Ȥˤʤ�ޤ���
+
+MANIFEST�Ȥ����ե�����ϡ���Ū��󥯤�make�λ��˥ǥ��쥯�ȥ�
+����ĥ�饤�֥���ޤ�Ǥ��뤫�ɤ���Ƚ�ꤹ�뤿��˻Ȥ����
+���ޤ��������ʥߥå��饤�֥�������ˤ�ɬ������ɬ�פǤ�
+����ޤ���
+
+(3) �߷פ���
 
 �ޤ��������ʤ�Ǥ����ɡ��ɤ�������ǽ��¸����뤫�ɤ����ޤ���
 �פ���ɬ�פ�����ޤ����ɤ�ʥ��饹��Ĥ��뤫�����Υ��饹�ˤ�
 �ɤ�ʥ᥽�åɤ����뤫�����饹���󶡤�������ʤɤˤĤ����߷�
 ���ޤ���
 
-(3) C�����ɤ��
+(4) C�����ɤ��
 
 ��ĥ�饤�֥�����ΤȤʤ�C����Υ�������񤭤ޤ���C����Υ���
 �����ҤȤĤλ��ˤϡ֥饤�֥��̾.c�פ����֤��ɤ��Ǥ��礦��C
@@ -712,7 +696,7 @@ C������ѿ��ϰʲ��δؿ���Ȥä�Ruby���󥿥ץ꥿���ѿ���¸��
 
   void rb_global_variable(VALUE *var)
 
-(4) extconf.rb���Ѱդ���
+(5) extconf.rb���Ѱդ���
 
 Makefile������ο����ˤʤ�extconf.rb�Ȥ����ե��������
 �ޤ���extconf.rb�ϥ饤�֥��Υ���ѥ����ɬ�פʾ��Υ�����
@@ -730,20 +714,14 @@ Makefile������ο����ˤʤ�extconf.rb�Ȥ����ե��������
 
 �ʲ����ѿ���Ȥ����Ȥ��Ǥ��ޤ���
 
-  $CFLAGS: ����ѥ�������ɲ�Ū�˻��ꤹ��ե饰(-O�ʤ�)
-  $CPPFLAGS: �ץ�ץ����å����ɲ�Ū�˻��ꤹ��ե饰(-I��-D�ʤ�)
+  $CFLAGS: ����ѥ�������ɲ�Ū�˻��ꤹ��ե饰(-I�ʤ�)
   $LDFLAGS: ��󥯻����ɲ�Ū�˻��ꤹ��ե饰(-L�ʤ�)
-  $objs: ��󥯤���륪�֥������ȥե�����̾�Υꥹ��
-
-���֥������ȥե�����Υꥹ�Ȥϡ��̾�ϥ������ե�����򸡺���
-�Ƽ�ưŪ����������ޤ�����make������ǥ���������������褦��
-��������Ū�˻��ꤹ��ɬ�פ�����ޤ���
 
 �饤�֥��򥳥�ѥ��뤹���郎·�鷺�����Υ饤�֥��򥳥�
 �ѥ��뤷�ʤ����ˤ�create_makefile��ƤФʤ����Makefile����
 �����줺������ѥ����Ԥ��ޤ���
 
-(5) depend���Ѱդ���
+(6) depend���Ѱդ���
 
 �⤷���ǥ��쥯�ȥ��depend�Ȥ����ե����뤬¸�ߤ���С�
 Makefile����¸�ط�������å����Ƥ���ޤ���
@@ -752,7 +730,18 @@ Makefile����¸�ط�������å����Ƥ���ޤ���
 
 �ʤɤǺ�뤳�Ȥ�����ޤ������ä�»��̵���Ǥ��礦��
 
-(6) Makefile����������
+(7) MANIFEST�ե�����˥ե�����̾�������
+
+  % find * -type f -print > MANIFEST
+  % vi MANIFEST
+
+*.o, *~�ʤ���ɬ�פʥե�����ʳ���MANIFEST���ɲä��Ƥ����ޤ���
+make���ˤ�MANIFEST�����Ƥϻ��Ȥ��ޤ���Τǡ����ΤޤޤǤ�����
+�ϵ����ޤ��󤬡��ѥå������󥰤λ��˻��Ȥ��뤳�Ȥ�����Τȡ�
+ɬ�פʥե��������̤Ǥ���Τǡ��Ѱդ��Ƥ����������ɤ��Ǥ���
+����
+
+(8) Makefile����������
 
 Makefile��ºݤ��������뤿��ˤ�
 
@@ -768,7 +757,7 @@ Makefile��ºݤ��������뤿��ˤ�
 �ǥ��쥯�ȥ��ext�ʲ����Ѱդ������ˤ�Ruby���Τ�make�λ���
 ��ưŪ��Makefile����������ޤ��Τǡ����Υ��ƥåפ����פǤ���
 
-(7) make����
+(9) make����
 
 ưŪ��󥯥饤�֥�������������ˤϤ��ξ��make���Ƥ�����
 ����ɬ�פǤ���� make install �ǥ��󥹥ȡ��뤵��ޤ���
@@ -786,13 +775,13 @@ extconf.rb��񤭴�����ʤɤ���Makefile�κ�������ɬ�פʻ��Ϥ�
 ���ꡤ������ ��ĥ�� .rb �Υե�������֤��Ƥ�����Ʊ���˥���
 ���ȡ��뤵��ޤ���
 
-(8) �ǥХå�
+(10) �ǥХå�
 
 �ޤ����ǥХå����ʤ���ư���ʤ��Ǥ��礦�͡�ext/Setup�˥ǥ���
 ���ȥ�̾��񤯤���Ū�˥�󥯤���ΤǥǥХå����Ȥ���褦�ˤ�
 ��ޤ�������ʬ����ѥ��뤬�٤��ʤ�ޤ����ɡ�
 
-(9) �Ǥ�������
+(11) �Ǥ�������
 
 ��Ϥ��ä���Ȥ��ʤꡤ������������ʤꡤ���ʤꡤ����ͳ�ˤ�
 �Ȥ�����������Ruby�κ�Ԥϳ�ĥ�饤�֥��˴ؤ��ư��ڤθ�����
@@ -917,9 +906,7 @@ NUM2INT(value)
 INT2NUM(i)
 NUM2DBL(value)
 rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
+STR2CSTR(value)
 rb_str_new2(s)
 
 ** ���饹/�⥸�塼�����
@@ -937,7 +924,7 @@ VALUE rb_define_module(const char *name)
 
   ������Ruby�⥸�塼���������롥
 
-VALUE rb_define_module_under(VALUE module, const char *name)
+VALUE rb_define_module_under(VALUE module, const char *name, VALUE super)
 
   ������Ruby�⥸�塼����������module������Ȥ���������롥
 
@@ -1151,12 +1138,6 @@ Appendix C. extconf.rb�ǻȤ���ؿ�����
 extconf.rb����Ǥ����Ѳ�ǽ�ʥ���ѥ���������å��δؿ��ϰ�
 �����̤�Ǥ��롥
 
-have_macro(macro, headers)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��ƥޥ���macro�������
-  ��Ƥ��뤫�ɤ��������å����롥�ޥ������������Ƥ����true
-  ���֤���
-
 have_library(lib, func)
 
   �ؿ�func��������Ƥ���饤�֥��lib��¸�ߤ�����å����롥
@@ -1174,67 +1155,21 @@ have_func(func, header)
   ����ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ���
   �����ؿ���¸�ߤ����true���֤���
 
-have_var(var, header)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ����ѿ�var��¸�ߤ������
-  �����롥var��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�ΤǤ�
-  ����ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ���
-  �����ѿ���¸�ߤ����true���֤���
-
 have_header(header)
 
   �إå��ե������¸�ߤ�����å����롥�إå��ե����뤬¸�ߤ�
   ���true���֤���
 
-find_header(header, path...)
-
-  �إå��ե�����header��¸�ߤ� -Ipath ���ɲä��ʤ�������å�
-  ���롥�إå��ե����뤬���դ��ä�����true���֤���
-
-have_struct_member(type, member, header)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type�˥���member
-  ��¸�ߤ��뤫������å����롥type���������Ƥ��ơ�member��
-  ���Ĥ����true���֤���
-
-have_type(type, header, opt)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type��¸�ߤ��뤫��
-  �����å����롥type���������Ƥ����true���֤���
-
-check_sizeof(type, header)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type��charñ�̥���
-  ����Ĵ�٤롥type���������Ƥ�������Υ��������֤��������
-  ��Ƥ��ʤ��Ȥ���nil���֤���
-
 create_makefile(target)
 
   ��ĥ�饤�֥���Ѥ�Makefile���������롥���δؿ���ƤФʤ���
   �Ф��Υ饤�֥��ϥ���ѥ��뤵��ʤ���target�ϥ⥸�塼��̾
   ��ɽ����
 
-find_executable(command, path)
-
-  ���ޥ��command��File::PATH_SEPARATOR�Ƕ��ڤ�줿�ѥ�̾��
-  �ꥹ��path����õ����path��nil�ޤ��Ͼ�ά���줿���ϡ��Ķ�
-  �ѿ�PATH���ͤ���Ѥ��롥�¹Բ�ǽ�ʥ��ޥ�ɤ����Ĥ��ä����
-  �ϥѥ���ޤ�ե�����̾�����Ĥ���ʤ��ä�����nil���֤���
-
 with_config(withval[, default=nil])
 
   ���ޥ�ɥ饤����--with-<withval>�ǻ��ꤵ�줿���ץ�����ͤ����롥
 
-enable_config(config, *defaults)
-disable_config(config, *defaults)
-
-  ���ޥ�ɥ饤����--enable-<config>�ޤ���
-  --disable-<config>�ǻ��ꤵ�줿�����ͤ����롥
-  --enable-<config>�����ꤵ��Ƥ�������true��
-  --disable-<config>�����ꤵ��Ƥ�������false���֤���
-  �ɤ������ꤵ��Ƥ��ʤ����ϡ��֥��å��Ĥ��ǸƤӽФ���Ƥ������
-  *defaults��yield������̡��֥��å��ʤ��ʤ�*defaults���֤���
-
 dir_config(target[, default_dir])
 dir_config(target[, default_include, default_lib])
 
@@ -1245,12 +1180,6 @@ dir_config(target[, default_include, default_lib])
   �������Ǥ��롥�ɲä��줿 include �ǥ��쥯�ȥ�� lib �ǥ��쥯�ȥ��
   ������֤��� ([include_dir, lib_dir])
 
-pkg_config(pkg)
-
-  pkg-config���ޥ�ɤ���ѥå�����pkg�ξ�������롥 
-  pkg-config�μºݤΥ��ޥ��̾�ϡ�--with-pkg-config���ޥ��
-  �饤�󥪥ץ����ǻ����ǽ��
-
 /*
  * Local variables:
  * fill-column: 60
diff --git a/README.ja b/README.ja
index df8cfc03f4..fc502dd440 100644
--- a/README.ja
+++ b/README.ja
@@ -26,25 +26,18 @@ Ruby�ϥƥ����Ƚ����ط���ǽ�Ϥʤɤ�ͥ�졤Perl��Ʊ�����餤����
 
 * ����ˡ
 
-** FTP��
+** ftp��
 
 �ʲ��ξ��ˤ����Ƥ���ޤ���
 
   ftp://ftp.ruby-lang.org/pub/ruby/
 
-** Subversion��
+** CVS��
 
-�ܥ֥�����Ruby�κǿ��Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
-
-��ȯ��ü�Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-
-¾�˳�ȯ��Υ֥����ΰ����ϼ��Υ��ޥ�ɤǸ����ޤ���
-
-  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+  $ 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
 
 
 * �ۡ���ڡ���
diff --git a/ToDo b/ToDo
index b55e399edf..fa7f32daed 100644
--- a/ToDo
+++ b/ToDo
@@ -1,7 +1,6 @@
 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.
@@ -12,6 +11,7 @@ Language Spec.
 * 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 ????
@@ -81,8 +81,6 @@ Standard Libraries
 - 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
@@ -103,10 +101,11 @@ Standard Libraries
 * 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.
+* remove dependency on MAXPATHLEN.
 * pointer share mechanism similar to one in String for Array.
+* deprecate Array#indexes, and Array#indices.
 * 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
 
@@ -117,6 +116,7 @@ Extension Libraries
 
 Ruby Libraries
 
+- add uri.rb
 * urllib.rb, nttplib.rb, etc.
 * format like perl's
 
@@ -124,3 +124,8 @@ Tools
 
 * freeze or undump to bundle everything
 * bundle using zlib
+
+Misc
+
+- publish Ruby books
+- publish Ruby books in English
diff --git a/array.c b/array.c
index baae2706e5..666a68a947 100644
--- a/array.c
+++ b/array.c
@@ -2,8 +2,8 @@
 
   array.c -
 
-  $Author: akr $
-  $Date: 2006/06/24 14:53:36 $
+  $Author$
+  $Date$
   created at: Fri Aug  6 09:46:12 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -31,7 +31,7 @@ rb_mem_clear(mem, size)
     }
 }
 
-static inline void
+static void
 memfill(mem, size, val)
     register VALUE *mem;
     register long size;
@@ -50,7 +50,7 @@ rb_ary_modify_check(ary)
 {
     if (OBJ_FROZEN(ary)) rb_error_frozen("array");
     if (FL_TEST(ary, ARY_TMPLOCK))
-	rb_raise(rb_eRuntimeError, "can't modify array during iteration");
+	rb_raise(rb_eTypeError, "can't modify array during sort");
     if (!OBJ_TAINTED(ary) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
 }
@@ -70,7 +70,6 @@ rb_ary_modify(ary)
 	RARRAY(ary)->ptr = ptr;
     }
 }
-
 VALUE
 rb_ary_freeze(ary)
     VALUE ary;
@@ -78,20 +77,12 @@ rb_ary_freeze(ary)
     return rb_obj_freeze(ary);
 }
 
-/*
- *  call-seq:
- *     array.frozen?  -> true or false
- *
- *  Return <code>true</code> if this array is frozen (or temporarily frozen
- *  while being sorted).
- */
-
 static VALUE
 rb_ary_frozen_p(ary)
     VALUE ary;
 {
-    if (OBJ_FROZEN(ary)) return Qtrue;
-    if (FL_TEST(ary, ARY_TMPLOCK)) return Qtrue;
+    if (FL_TEST(ary, FL_FREEZE|ARY_TMPLOCK))
+	return Qtrue;
     return Qfalse;
 }
 
@@ -188,8 +179,6 @@ rb_ary_new4(n, elts)
     if (n > 0 && elts) {
 	MEMCPY(RARRAY(ary)->ptr, elts, VALUE, n);
     }
-
-    /* This assignment to len will be moved to the above "if" block in Ruby 1.9 */
     RARRAY(ary)->len = n;
 
     return ary;
@@ -225,44 +214,6 @@ rb_check_array_type(ary)
 
 static VALUE rb_ary_replace _((VALUE, VALUE));
 
-/*
- *  call-seq:
- *     Array.new(size=0, obj=nil)
- *     Array.new(array)
- *     Array.new(size) {|index| block }
- *
- *  Returns a new array. In the first form, the new array is
- *  empty. In the second it is created with _size_ copies of _obj_
- *  (that is, _size_ references to the same
- *  _obj_). The third form creates a copy of the array
- *  passed as a parameter (the array is generated by calling
- *  to_ary  on the parameter). In the last form, an array
- *  of the given size is created. Each element in this array is
- *  calculated by passing the element's index to the given block and
- *  storing the return value.
- *
- *     Array.new
- *     Array.new(2)
- *     Array.new(5, "A")
- * 
- *     # only one copy of the object is created
- *     a = Array.new(2, Hash.new)
- *     a[0]['cat'] = 'feline'
- *     a
- *     a[1]['cat'] = 'Felix'
- *     a
- * 
- *     # here multiple copies are created
- *     a = Array.new(2) { Hash.new }
- *     a[0]['cat'] = 'feline'
- *     a
- * 
- *     squares = Array.new(5) {|i| i*i}
- *     squares
- * 
- *     copy = Array.new(squares)
- */
-
 static VALUE
 rb_ary_initialize(argc, argv, ary)
     int argc;
@@ -303,11 +254,11 @@ rb_ary_initialize(argc, argv, ary)
     if (rb_block_given_p()) {
 	long i;
 
-	if (argc == 2) {
-	    rb_warn("block supersedes default value argument");
+	if (argc > 1) {
+	    rb_raise(rb_eArgError, "wrong number of arguments");
 	}
 	for (i=0; i<len; i++) {
-	    rb_ary_store(ary, i, rb_yield(LONG2NUM(i)));
+	    RARRAY(ary)->ptr[i] = rb_yield(LONG2NUM(i));
 	    RARRAY(ary)->len = i + 1;
 	}
     }
@@ -319,15 +270,6 @@ rb_ary_initialize(argc, argv, ary)
     return ary;
 }
 
-
-/* 
-* Returns a new array populated with the given objects. 
-*
-*   Array.[]( 1, 'a', /^A/ )
-*   Array[ 1, 'a', /^A/ ]
-*   [ 1, 'a', /^A/ ]
-*/
-
 static VALUE
 rb_ary_s_create(argc, argv, klass)
     int argc;
@@ -336,6 +278,9 @@ rb_ary_s_create(argc, argv, klass)
 {
     VALUE ary = ary_alloc(klass);
 
+    if (argc < 0) {
+	rb_raise(rb_eArgError, "negative number of arguments");
+    }
     if (argc > 0) {
 	RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
 	MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
@@ -351,6 +296,7 @@ rb_ary_store(ary, idx, val)
     long idx;
     VALUE val;
 {
+    rb_ary_modify(ary);
     if (idx < 0) {
 	idx += RARRAY(ary)->len;
 	if (idx < 0) {
@@ -359,7 +305,6 @@ rb_ary_store(ary, idx, val)
 	}
     }
 
-    rb_ary_modify(ary);
     if (idx >= RARRAY(ary)->aux.capa) {
 	long new_capa = RARRAY(ary)->aux.capa / 2;
 
@@ -384,19 +329,6 @@ rb_ary_store(ary, idx, val)
     RARRAY(ary)->ptr[idx] = val;
 }
 
-/*
- *  call-seq:
- *     array << obj            -> array
- *  
- *  Append---Pushes the given object on to the end of this array. This
- *  expression returns the array itself, so several appends
- *  may be chained together.
- *
- *     [ 1, 2 ] << "c" << "d" << [ 3, 4 ]
- *             #=>  [ 1, 2, "c", "d", [ 3, 4 ] ]
- *
- */
-
 VALUE
 rb_ary_push(ary, item)
     VALUE ary;
@@ -406,43 +338,21 @@ rb_ary_push(ary, item)
     return ary;
 }
 
-/* 
- *  call-seq:
- *     array.push(obj, ... )   -> array
- *  
- *  Append---Pushes the given object(s) on to the end of this array. This
- *  expression returns the array itself, so several appends
- *  may be chained together.
- *
- *     a = [ "a", "b", "c" ]
- *     a.push("d", "e", "f")  
- *             #=> ["a", "b", "c", "d", "e", "f"]
- */
-
 static VALUE
 rb_ary_push_m(argc, argv, ary)
     int argc;
     VALUE *argv;
     VALUE ary;
 {
+    if (argc <= 0) {
+	rb_raise(rb_eArgError, "wrong number arguments (at least 1)");
+    }
     while (argc--) {
 	rb_ary_push(ary, *argv++);
     }
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.pop  -> obj or nil
- *  
- *  Removes the last element from <i>self</i> and returns it, or
- *  <code>nil</code> if the array is empty.
- *     
- *     a = [ "a", "m", "z" ]
- *     a.pop   #=> "z"
- *     a       #=> ["a", "m"]
- */
-
 VALUE
 rb_ary_pop(ary)
     VALUE ary;
@@ -458,7 +368,7 @@ rb_ary_pop(ary)
     return RARRAY(ary)->ptr[--RARRAY(ary)->len];
 }
 
-static VALUE
+static void
 ary_make_shared(ary)
     VALUE ary;
 {
@@ -471,27 +381,9 @@ ary_make_shared(ary)
 	shared->aux.capa = RARRAY(ary)->aux.capa;
 	RARRAY(ary)->aux.shared = (VALUE)shared;
 	FL_SET(ary, ELTS_SHARED);
-	OBJ_FREEZE(shared);
-	return (VALUE)shared;
-    }
-    else {
-	return RARRAY(ary)->aux.shared;
     }
 }
 
-/*
- *  call-seq:
- *     array.shift   ->   obj or nil
- *  
- *  Returns the first element of <i>self</i> and removes it (shifting all
- *  other elements down by one). Returns <code>nil</code> if the array
- *  is empty.
- *     
- *     args = [ "-m", "-q", "filename" ]
- *     args.shift   #=> "-m"
- *     args         #=> ["-q", "filename"]
- */
-
 VALUE
 rb_ary_shift(ary)
     VALUE ary;
@@ -531,18 +423,6 @@ rb_ary_unshift(ary, item)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.unshift(obj, ...)  -> array
- *  
- *  Prepends objects to the front of <i>array</i>.
- *  other elements up one.
- *     
- *     a = [ "b", "c", "d" ]
- *     a.unshift("a")   #=> ["a", "b", "c", "d"]
- *     a.unshift(1, 2)  #=> [ 1, 2, "a", "b", "c", "d"]
- */
-
 static VALUE
 rb_ary_unshift_m(argc, argv, ary)
     int argc;
@@ -550,8 +430,10 @@ rb_ary_unshift_m(argc, argv, ary)
     VALUE ary;
 {
     long len = RARRAY(ary)->len;
-
-    if (argc == 0) return ary;
+    
+    if (argc <= 0) {
+	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
+    }
 
     /* make rooms by setting the last item */
     rb_ary_store(ary, len + argc - 1, Qnil);
@@ -563,28 +445,21 @@ rb_ary_unshift_m(argc, argv, ary)
     return ary;
 }
 
-/* faster version - use this if you don't need to treat negative offset */
-static inline VALUE
-rb_ary_elt(ary, offset)
-    VALUE ary;
-    long offset;
-{
-    if (RARRAY(ary)->len == 0) return Qnil;
-    if (offset < 0 || RARRAY(ary)->len <= offset) {
-	return Qnil;
-    }
-    return RARRAY(ary)->ptr[offset];
-}
-
 VALUE
 rb_ary_entry(ary, offset)
     VALUE ary;
     long offset;
 {
+    if (RARRAY(ary)->len == 0) return Qnil;
+
     if (offset < 0) {
 	offset += RARRAY(ary)->len;
     }
-    return rb_ary_elt(ary, offset);
+    if (offset < 0 || RARRAY(ary)->len <= offset) {
+	return Qnil;
+    }
+
+    return RARRAY(ary)->ptr[offset];
 }
 
 static VALUE
@@ -592,13 +467,12 @@ rb_ary_subseq(ary, beg, len)
     VALUE ary;
     long beg, len;
 {
-    VALUE klass, ary2, shared;
-    VALUE *ptr;
+    VALUE klass, ary2;
 
     if (beg > RARRAY(ary)->len) return Qnil;
     if (beg < 0 || len < 0) return Qnil;
 
-    if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
+    if (beg + len > RARRAY(ary)->len) {
 	len = RARRAY(ary)->len - beg;
 	if (len < 0)
 	    len = 0;
@@ -606,49 +480,16 @@ rb_ary_subseq(ary, beg, len)
     klass = rb_obj_class(ary);
     if (len == 0) return ary_new(klass, 0);
 
-    shared = ary_make_shared(ary);
-    ptr = RARRAY(ary)->ptr;
+    ary_make_shared(ary);
     ary2 = ary_alloc(klass);
-    RARRAY(ary2)->ptr = ptr + beg;
+    RARRAY(ary2)->ptr = RARRAY(ary)->ptr + beg;
     RARRAY(ary2)->len = len;
-    RARRAY(ary2)->aux.shared = shared;
+    RARRAY(ary2)->aux.shared = RARRAY(ary)->aux.shared;
     FL_SET(ary2, ELTS_SHARED);
 
     return ary2;
 }
 
-/* 
- *  call-seq:
- *     array[index]                -> obj      or nil
- *     array[start, length]        -> an_array or nil
- *     array[range]                -> an_array or nil
- *     array.slice(index)          -> obj      or nil
- *     array.slice(start, length)  -> an_array or nil
- *     array.slice(range)          -> an_array or nil
- *
- *  Element Reference---Returns the element at _index_,
- *  or returns a subarray starting at _start_ and
- *  continuing for _length_ elements, or returns a subarray
- *  specified by _range_.
- *  Negative indices count backward from the end of the
- *  array (-1 is the last element). Returns nil if the index
- *  (or starting index) are out of range.
- *
- *     a = [ "a", "b", "c", "d", "e" ]
- *     a[2] +  a[0] + a[1]    #=> "cab"
- *     a[6]                   #=> nil
- *     a[1, 2]                #=> [ "b", "c" ]
- *     a[1..3]                #=> [ "b", "c", "d" ]
- *     a[4..7]                #=> [ "e" ]
- *     a[6..10]               #=> nil
- *     a[-3, 3]               #=> [ "c", "d", "e" ]
- *     # special cases
- *     a[5]                   #=> nil
- *     a[5, 1]                #=> []
- *     a[5..10]               #=> []
- *
- */
-
 VALUE
 rb_ary_aref(argc, argv, ary)
     int argc;
@@ -659,9 +500,6 @@ rb_ary_aref(argc, argv, ary)
     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 (beg < 0) {
@@ -677,9 +515,6 @@ rb_ary_aref(argc, argv, ary)
     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:
@@ -692,21 +527,6 @@ rb_ary_aref(argc, argv, ary)
     return rb_ary_entry(ary, NUM2LONG(arg));
 }
 
-/* 
- *  call-seq:
- *     array.at(index)   ->   obj  or nil
- *
- *  Returns the element at _index_. A
- *  negative index counts from the end of _self_.  Returns +nil+
- *  if the index is out of range. See also <code>Array#[]</code>.
- *  (<code>Array#at</code> is slightly faster than <code>Array#[]</code>,
- *  as it does not accept ranges and so on.)
- *
- *     a = [ "a", "b", "c", "d", "e" ]
- *     a.at(0)     #=> "a"
- *     a.at(-1)    #=> "e"
- */
-
 static VALUE
 rb_ary_at(ary, pos)
     VALUE ary, pos;
@@ -714,101 +534,21 @@ rb_ary_at(ary, pos)
     return rb_ary_entry(ary, NUM2LONG(pos));
 }
 
-/*
- *  call-seq:
- *     array.first   ->   obj or nil
- *     array.first(n) -> an_array
- *
- *  Returns the first element, or the first +n+ elements, of the array.
- *  If the array is empty, the first form returns <code>nil</code>, and the
- *  second form returns an empty array.
- *
- *     a = [ "q", "r", "s", "t" ]
- *     a.first    #=> "q"
- *     a.first(1) #=> ["q"]
- *     a.first(3) #=> ["q", "r", "s"]
- */
-
 static VALUE
-rb_ary_first(argc, argv, ary)
-    int argc;
-    VALUE *argv;
+rb_ary_first(ary)
     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;
-    }
+    if (RARRAY(ary)->len == 0) return Qnil;
+    return RARRAY(ary)->ptr[0];
 }
 
-/*
- *  call-seq:
- *     array.last     ->  obj or nil
- *     array.last(n)  ->  an_array
- *  
- *  Returns the last element(s) of <i>self</i>. If the array is empty,
- *  the first form returns <code>nil</code>.
- *     
- *     [ "w", "x", "y", "z" ].last   #=> "z"
- */
-
 static VALUE
-rb_ary_last(argc, argv, ary)
-    int argc;
-    VALUE *argv;
+rb_ary_last(ary)
     VALUE ary;
 {
-    if (argc == 0) {
-	if (RARRAY(ary)->len == 0) return Qnil;
-	return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
-    }
-    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;
-    }
-}
-
-/*
- *  call-seq:
- *     array.fetch(index)                    -> obj
- *     array.fetch(index, default )          -> obj
- *     array.fetch(index) {|index| block }   -> obj
- *  
- *  Tries to return the element at position <i>index</i>. If the index
- *  lies outside the array, the first form throws an
- *  <code>IndexError</code> exception, the second form returns
- *  <i>default</i>, and the third form returns the value of invoking
- *  the block, passing in the index. Negative values of <i>index</i>
- *  count from the end of the array.
- *     
- *     a = [ 11, 22, 33, 44 ]
- *     a.fetch(1)               #=> 22
- *     a.fetch(-1)              #=> 44
- *     a.fetch(4, 'cat')        #=> "cat"
- *     a.fetch(4) { |i| i*i }   #=> 16
- */
+    if (RARRAY(ary)->len == 0) return Qnil;
+    return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
+}
 
 static VALUE
 rb_ary_fetch(argc, argv, ary)
@@ -817,21 +557,21 @@ rb_ary_fetch(argc, argv, ary)
     VALUE ary;
 {
     VALUE pos, ifnone;
-    long block_given;
     long idx;
 
     rb_scan_args(argc, argv, "11", &pos, &ifnone);
-    block_given = rb_block_given_p();
-    if (block_given && argc == 2) {
-	rb_warn("block supersedes default value argument");
-    }
     idx = NUM2LONG(pos);
 
     if (idx < 0) {
 	idx +=  RARRAY(ary)->len;
     }
     if (idx < 0 || RARRAY(ary)->len <= idx) {
-	if (block_given) return rb_yield(pos);
+	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);
 	}
@@ -840,19 +580,6 @@ rb_ary_fetch(argc, argv, ary)
     return RARRAY(ary)->ptr[idx];
 }
 
-/*
- *  call-seq:
- *     array.index(obj)   ->  int or nil
- *  
- *  Returns the index of the first object in <i>self</i> such that is 
- *  <code>==</code> to <i>obj</i>. Returns <code>nil</code> if
- *  no match is found.
- *     
- *     a = [ "a", "b", "c" ]
- *     a.index("b")   #=> 1
- *     a.index("z")   #=> nil
- */
-
 static VALUE
 rb_ary_index(ary, val)
     VALUE ary;
@@ -867,19 +594,6 @@ rb_ary_index(ary, val)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     array.rindex(obj)    ->  int or nil
- *  
- *  Returns the index of the last object in <i>array</i> 
- *  <code>==</code> to <i>obj</i>. Returns <code>nil</code> if
- *  no match is found.
- *     
- *     a = [ "a", "b", "b", "b", "c" ]
- *     a.rindex("b")   #=> 3
- *     a.rindex("z")   #=> nil
- */
-
 static VALUE
 rb_ary_rindex(ary, val)
     VALUE ary;
@@ -888,24 +602,12 @@ rb_ary_rindex(ary, val)
     long i = RARRAY(ary)->len;
 
     while (i--) {
-	if (i > RARRAY(ary)->len) {
-	    i = RARRAY(ary)->len;
-	    continue;
-	}
 	if (rb_equal(RARRAY(ary)->ptr[i], val))
 	    return LONG2NUM(i);
     }
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     array.indexes( i1, i2, ... iN )   -> an_array
- *     array.indices( i1, i2, ... iN )   -> an_array
- *  
- *  Deprecated; use <code>Array#values_at</code>.
- */
-
 static VALUE
 rb_ary_indexes(argc, argv, ary)
     int argc;
@@ -915,7 +617,8 @@ 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()));
+    rb_warn("Array#%s is deprecated; use Array#select",
+	    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));
@@ -938,7 +641,7 @@ rb_ary_to_ary(obj)
 }
 
 static void
-rb_ary_splice(ary, beg, len, rpl)
+rb_ary_update(ary, beg, len, rpl)
     VALUE ary;
     long beg, len;
     VALUE rpl;
@@ -953,10 +656,11 @@ rb_ary_splice(ary, beg, len, rpl)
 	    rb_raise(rb_eIndexError, "index %ld out of array", beg);
 	}
     }
-    if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
+    if (beg + len > RARRAY(ary)->len) {
 	len = RARRAY(ary)->len - beg;
     }
 
+    rb_ary_modify(ary);
     if (NIL_P(rpl)) {
 	rlen = 0;
     }
@@ -964,7 +668,6 @@ rb_ary_splice(ary, beg, len, rpl)
 	rpl = rb_ary_to_ary(rpl);
 	rlen = RARRAY(rpl)->len;
     }
-    rb_ary_modify(ary);
 
     if (beg >= RARRAY(ary)->len) {
 	len = beg + rlen;
@@ -1002,34 +705,6 @@ rb_ary_splice(ary, beg, len, rpl)
     }
 }
 
-/* 
- *  call-seq:
- *     array[index]         = obj                     ->  obj
- *     array[start, length] = obj or an_array or nil  ->  obj or an_array or nil
- *     array[range]         = obj or an_array or nil  ->  obj or an_array or nil
- *
- *  Element Assignment---Sets the element at _index_,
- *  or replaces a subarray starting at _start_ and
- *  continuing for _length_ elements, or replaces a subarray
- *  specified by _range_.  If indices are greater than
- *  the current capacity of the array, the array grows
- *  automatically. A negative indices will count backward
- *  from the end of the array. Inserts elements if _length_ is
- *  zero. If +nil+ is used in the second and third form,
- *  deletes elements from _self_. An +IndexError+ is raised if a
- *  negative index points past the beginning of the array. See also
- *  <code>Array#push</code>, and <code>Array#unshift</code>.
- * 
- *     a = Array.new
- *     a[4] = "4";                 #=> [nil, nil, nil, nil, "4"]
- *     a[0, 3] = [ 'a', 'b', 'c' ] #=> ["a", "b", "c", nil, "4"]
- *     a[1..2] = [ 1, 2 ]          #=> ["a", 1, 2, nil, "4"]
- *     a[0, 2] = "?"               #=> ["?", 2, nil, "4"]
- *     a[0..2] = "A"               #=> ["A", "4"]
- *     a[-1]   = "Z"               #=> ["A", "Z"]
- *     a[1..-1] = nil              #=> ["A"]
- */
-
 static VALUE
 rb_ary_aset(argc, argv, ary)
     int argc;
@@ -1039,13 +714,7 @@ rb_ary_aset(argc, argv, ary)
     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_splice(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
+	rb_ary_update(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
 	return argv[2];
     }
     if (argc != 2) {
@@ -1055,12 +724,9 @@ rb_ary_aset(argc, argv, ary)
 	offset = FIX2LONG(argv[0]);
 	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)) {
 	/* check if idx is Range */
-	rb_ary_splice(ary, beg, len, argv[1]);
+	rb_ary_update(ary, beg, len, argv[1]);
 	return argv[1];
     }
 
@@ -1070,18 +736,6 @@ fixnum:
     return argv[1];
 }
 
-/*
- *  call-seq:
- *     array.insert(index, obj...)  -> array
- *  
- *  Inserts the given values before the element with the given index
- *  (which may be negative).
- *     
- *     a = %w{ a b c d }
- *     a.insert(2, 99)         #=> ["a", "b", 99, "c", "d"]
- *     a.insert(-2, 1, 2, 3)   #=> ["a", "b", 99, "c", 1, 2, 3, "d"]
- */
-
 static VALUE
 rb_ary_insert(argc, argv, ary)
     int argc;
@@ -1090,36 +744,21 @@ rb_ary_insert(argc, argv, ary)
 {
     long pos;
 
-    if (argc == 1) return ary;
-    if (argc < 1) {
-	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
+    if (argc < 2) {
+	rb_raise(rb_eArgError, "wrong number of arguments (at least 2)");
     }
     pos = NUM2LONG(argv[0]);
     if (pos == -1) {
 	pos = RARRAY(ary)->len;
     }
-    if (pos < 0) {
+    else if (pos < 0) {
 	pos++;
     }
-    rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
+
+    rb_ary_update(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.each {|item| block }   ->   array
- *  
- *  Calls <i>block</i> once for each element in <i>self</i>, passing that
- *  element as a parameter.
- *     
- *     a = [ "a", "b", "c" ]
- *     a.each {|x| print x, " -- " }
- *     
- *  produces:
- *     
- *     a -- b -- c --
- */
-
 VALUE
 rb_ary_each(ary)
     VALUE ary;
@@ -1132,21 +771,6 @@ rb_ary_each(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.each_index {|index| block }  ->  array
- *  
- *  Same as <code>Array#each</code>, but passes the index of the element
- *  instead of the element itself.
- *     
- *     a = [ "a", "b", "c" ]
- *     a.each_index {|x| print x, " -- " }
- *     
- *  produces:
- *     
- *     0 -- 1 -- 2 --
- */
-
 static VALUE
 rb_ary_each_index(ary)
     VALUE ary;
@@ -1159,21 +783,6 @@ rb_ary_each_index(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.reverse_each {|item| block } 
- *  
- *  Same as <code>Array#each</code>, but traverses <i>self</i> in reverse
- *  order.
- *     
- *     a = [ "a", "b", "c" ]
- *     a.reverse_each {|x| print x, " " }
- *     
- *  produces:
- *     
- *     c b a
- */
-
 static VALUE
 rb_ary_reverse_each(ary)
     VALUE ary;
@@ -1182,22 +791,10 @@ rb_ary_reverse_each(ary)
 
     while (len--) {
 	rb_yield(RARRAY(ary)->ptr[len]);
-	if (RARRAY(ary)->len < len) {
-	    len = RARRAY(ary)->len;
-	}
     }
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.length -> int
- *  
- *  Returns the number of elements in <i>self</i>. May be zero.
- *     
- *     [ 1, 2, 3, 4, 5 ].length   #=> 5
- */
-
 static VALUE
 rb_ary_length(ary)
     VALUE ary;
@@ -1205,15 +802,6 @@ rb_ary_length(ary)
     return LONG2NUM(RARRAY(ary)->len);
 }
 
-/*
- *  call-seq:
- *     array.empty?   -> true or false
- *  
- *  Returns <code>true</code> if <i>self</i> array contains no elements.
- *     
- *     [].empty?   #=> true
- */
-
 static VALUE
 rb_ary_empty_p(ary)
     VALUE ary;
@@ -1295,17 +883,6 @@ rb_ary_join(ary, sep)
     return result;
 }
 
-/*
- *  call-seq:
- *     array.join(sep=$,)    -> str
- *  
- *  Returns a string created by converting each element of the array to
- *  a string, separated by <i>sep</i>.
- *     
- *     [ "a", "b", "c" ].join        #=> "abc"
- *     [ "a", "b", "c" ].join("-")   #=> "a-b-c"
- */
-
 static VALUE
 rb_ary_join_m(argc, argv, ary)
     int argc;
@@ -1320,16 +897,6 @@ rb_ary_join_m(argc, argv, ary)
     return rb_ary_join(ary, sep);
 }
 
-/*
- *  call-seq:
- *     array.to_s -> string
- *  
- *  Returns _self_<code>.join</code>.
- *     
- *     [ "a", "e", "i", "o" ].to_s   #=> "aeio"
- *
- */
-
 VALUE
 rb_ary_to_s(ary)
     VALUE ary;
@@ -1354,37 +921,13 @@ 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;
 }
 
@@ -1397,7 +940,11 @@ rb_protect_inspect(func, obj, arg)
     VALUE inspect_tbl;
     VALUE id;
 
-    inspect_tbl = get_inspect_tbl(Qtrue);
+    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);
+    }
     id = rb_obj_id(obj);
     if (rb_ary_includes(inspect_tbl, id)) {
 	return (*func)(obj, arg);
@@ -1416,7 +963,7 @@ rb_inspecting_p(obj)
 {
     VALUE inspect_tbl;
 
-    inspect_tbl = get_inspect_tbl(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));
 }
@@ -1441,13 +988,6 @@ inspect_ary(ary)
     return str;
 }
 
-/*
- *  call-seq:
- *     array.inspect  -> string
- *
- *  Create a printable version of <i>array</i>.
- */
-
 static VALUE
 rb_ary_inspect(ary)
     VALUE ary;
@@ -1457,14 +997,6 @@ rb_ary_inspect(ary)
     return rb_protect_inspect(inspect_ary, ary, 0);
 }
 
-/*
- *  call-seq:
- *     array.to_a     -> array
- *  
- *  Returns _self_. If called on a subclass of Array, converts
- *  the receiver to an Array object.
- */
-
 static VALUE
 rb_ary_to_a(ary)
     VALUE ary;
@@ -1477,13 +1009,6 @@ rb_ary_to_a(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.to_ary -> array
- *  
- *  Returns _self_.
- */
-
 static VALUE
 rb_ary_to_ary_m(ary)
     VALUE ary;
@@ -1499,47 +1024,28 @@ rb_ary_reverse(ary)
     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 <= 1) return ary;
+
+    p1 = RARRAY(ary)->ptr;
+    p2 = p1 + RARRAY(ary)->len - 1;	/* points last item */
+
+    while (p1 < p2) {
+	tmp = *p1;
+	*p1++ = *p2;
+	*p2-- = tmp;
     }
+
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.reverse!   -> array 
- *  
- *  Reverses _self_ in place.
- *     
- *     a = [ "a", "b", "c" ]
- *     a.reverse!       #=> ["c", "b", "a"]
- *     a                #=> ["c", "b", "a"]
- */
-
 static VALUE
 rb_ary_reverse_bang(ary)
     VALUE ary;
 {
+    if (RARRAY(ary)->len <= 1) return Qnil;
     return rb_ary_reverse(ary);
 }
 
-/*
- *  call-seq:
- *     array.reverse -> an_array
- *  
- *  Returns a new array containing <i>self</i>'s elements in reverse order.
- *     
- *     [ "a", "b", "c" ].reverse   #=> ["c", "b", "a"]
- *     [ 1 ].reverse               #=> [1]
- */
-
 static VALUE
 rb_ary_reverse_m(ary)
     VALUE ary;
@@ -1547,69 +1053,40 @@ rb_ary_reverse_m(ary)
     return rb_ary_reverse(rb_ary_dup(ary));
 }
 
-struct ary_sort_data {
-    VALUE ary;
-    VALUE *ptr;
-    long len;
-};
-
-static void
-ary_sort_check(data)
-    struct ary_sort_data *data;
-{
-    if (RARRAY(data->ary)->ptr != data->ptr || RARRAY(data->ary)->len != data->len) {
-	rb_raise(rb_eArgError, "array modified during sort");
-    }
-}
-
 static int
-sort_1(a, b, data)
+sort_1(a, b)
     VALUE *a, *b;
-    struct ary_sort_data *data;
 {
-    VALUE retval = rb_yield_values(2, *a, *b);
-    int n;
-
-    n = rb_cmpint(retval, *a, *b);
-    ary_sort_check(data);
-    return n;
+    VALUE retval = rb_yield(rb_assoc_new(*a, *b));
+    return rb_cmpint(retval);
 }
 
 static int
-sort_2(ap, bp, data)
+sort_2(ap, bp)
     VALUE *ap, *bp;
-    struct ary_sort_data *data;
 {
     VALUE retval;
-    VALUE a = *ap, b = *bp;
-    int n;
+    long a = (long)*ap, b = (long)*bp;
 
     if (FIXNUM_P(a) && FIXNUM_P(b)) {
-	if ((long)a > (long)b) return 1;
-	if ((long)a < (long)b) return -1;
+	if (a > b) return 1;
+	if (a < b) return -1;
 	return 0;
     }
-    if (TYPE(a) == T_STRING) {
-	if (TYPE(b) == T_STRING) return rb_str_cmp(a, b);
+    if (TYPE(a) == T_STRING && TYPE(b) == T_STRING) {
+	return rb_str_cmp(a, b);
     }
 
     retval = rb_funcall(a, id_cmp, 1, b);
-    n = rb_cmpint(retval, a, b);
-    ary_sort_check(data);
-
-    return n;
+    return rb_cmpint(retval);
 }
 
 static VALUE
 sort_internal(ary)
     VALUE ary;
 {
-    struct ary_sort_data data;
-
-    data.ary = ary;
-    data.ptr = RARRAY(ary)->ptr; data.len = RARRAY(ary)->len;
     qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE),
-	  rb_block_given_p()?sort_1:sort_2, &data);
+	  rb_block_given_p()?sort_1:sort_2);
     return ary;
 }
 
@@ -1621,50 +1098,18 @@ sort_unlock(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.sort!                   -> array
- *     array.sort! {| a,b | block }  -> array 
- *  
- *  Sorts _self_. Comparisons for
- *  the sort will be done using the <code><=></code> operator or using
- *  an optional code block. The block implements a comparison between
- *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
- *  <code>Enumerable#sort_by</code>.
- *     
- *     a = [ "d", "a", "e", "c", "b" ]
- *     a.sort                    #=> ["a", "b", "c", "d", "e"]
- *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
- */
-
 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);
-    }
+    if (RARRAY(ary)->len <= 1) return ary;
+
+    FL_SET(ary, ARY_TMPLOCK);	/* prohibit modification during sort */
+    rb_ensure(sort_internal, ary, sort_unlock, ary);
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.sort                   -> an_array 
- *     array.sort {| a,b | block }  -> an_array 
- *  
- *  Returns a new array created by sorting <i>self</i>. Comparisons for
- *  the sort will be done using the <code><=></code> operator or using
- *  an optional code block. The block implements a comparison between
- *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
- *  <code>Enumerable#sort_by</code>.
- *     
- *     a = [ "d", "a", "e", "c", "b" ]
- *     a.sort                    #=> ["a", "b", "c", "d", "e"]
- *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
- */
-
 VALUE
 rb_ary_sort(ary)
     VALUE ary;
@@ -1674,52 +1119,25 @@ rb_ary_sort(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.collect {|item| block }  -> an_array
- *     array.map     {|item| block }  -> an_array
- *  
- *  Invokes <i>block</i> once for each element of <i>self</i>. Creates a 
- *  new array containing the values returned by the block.
- *  See also <code>Enumerable#collect</code>.
- *     
- *     a = [ "a", "b", "c", "d" ]
- *     a.collect {|x| x + "!" }   #=> ["a!", "b!", "c!", "d!"]
- *     a                          #=> ["a", "b", "c", "d"]
- */
-
 static VALUE
 rb_ary_collect(ary)
     VALUE ary;
 {
-    long i;
+    long len, 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++) {
+    len = RARRAY(ary)->len;
+    collect = rb_ary_new2(len);
+    for (i=0; i<len; i++) {
 	rb_ary_push(collect, rb_yield(RARRAY(ary)->ptr[i]));
     }
     return collect;
 }
 
-/* 
- *  call-seq:
- *     array.collect! {|item| block }   ->   array
- *     array.map!     {|item| block }   ->   array
- *
- *  Invokes the block once for each element of _self_, replacing the
- *  element with the value returned by _block_.
- *  See also <code>Enumerable#collect</code>.
- *   
- *     a = [ "a", "b", "c", "d" ]
- *     a.collect! {|x| x + "!" }
- *     a             #=>  [ "a!", "b!", "c!", "d!" ]
- */
-
 static VALUE
 rb_ary_collect_bang(ary)
     VALUE ary;
@@ -1728,114 +1146,40 @@ rb_ary_collect_bang(ary)
 
     rb_ary_modify(ary);
     for (i = 0; i < RARRAY(ary)->len; i++) {
-	rb_ary_store(ary, i, rb_yield(RARRAY(ary)->ptr[i]));
+	RARRAY(ary)->ptr[i] = rb_yield(RARRAY(ary)->ptr[i]);
     }
     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;
-}
-
-/* 
- *  call-seq:
- *     array.values_at(selector,... )  -> an_array
- *
- *  Returns an array containing the elements in
- *  _self_ corresponding to the given selector(s). The selectors
- *  may be either integer indices or ranges. 
- *  See also <code>Array#select</code>.
- * 
- *     a = %w{ a b c d e f }
- *     a.values_at(1, 3, 5)
- *     a.values_at(1, 3, 5, 7)
- *     a.values_at(-1, -3, -5, -7)
- *     a.values_at(1..3, 2...5)
- */
-
 static VALUE
-rb_ary_values_at(argc, argv, ary)
+rb_ary_select(argc, argv, ary)
     int argc;
     VALUE *argv;
     VALUE ary;
 {
-    return rb_values_at(ary, RARRAY(ary)->len, argc, argv, rb_ary_entry);
-}
-
-/*
- *  call-seq:
- *     array.select {|item| block } -> an_array
- *  
- *  Invokes the block passing in successive elements from <i>array</i>,
- *  returning an array containing those elements for which the block
- *  returns a true value (equivalent to <code>Enumerable#select</code>).
- *     
- *     a = %w{ a b c d e f }
- *     a.select {|v| v =~ /[aeiou]/}   #=> ["a", "e"]
- */
-
-static VALUE
-rb_ary_select(ary)
-    VALUE ary;
-{
     VALUE result;
     long i;
 
-    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, rb_ary_elt(ary, i));
+    if (rb_block_given_p()) {
+	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]);
+	    }
+	}
+    }
+    else {
+	result = rb_ary_new2(argc);
+	for (i=0; i<argc; i++) {
+	    rb_ary_push(result, rb_ary_entry(ary, NUM2LONG(argv[i])));
 	}
     }
     return result;
 }
 
-/*
- *  call-seq:
- *     array.delete(obj)            -> obj or nil 
- *     array.delete(obj) { block }  -> obj or nil
- *  
- *  Deletes items from <i>self</i> that are equal to <i>obj</i>. If
- *  the item is not found, returns <code>nil</code>. If the optional
- *  code block is given, returns the result of <i>block</i> if the item
- *  is not found.
- *     
- *     a = [ "a", "b", "b", "b", "c" ]
- *     a.delete("b")                   #=> "b"
- *     a                               #=> ["a", "c"]
- *     a.delete("z")                   #=> nil
- *     a.delete("z") { "not found" }   #=> "not found"
- */
-
 VALUE
 rb_ary_delete(ary, item)
     VALUE ary;
@@ -1843,12 +1187,11 @@ rb_ary_delete(ary, item)
 {
     long i1, i2;
 
+    rb_ary_modify(ary);
     for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
-	VALUE e = RARRAY(ary)->ptr[i1];
-
-	if (rb_equal(e, item)) continue;
+	if (rb_equal(RARRAY(ary)->ptr[i1], item)) continue;
 	if (i1 != i2) {
-	    rb_ary_store(ary, i2, e);
+	    RARRAY(ary)->ptr[i2] = RARRAY(ary)->ptr[i1];
 	}
 	i2++;
     }
@@ -1859,14 +1202,11 @@ rb_ary_delete(ary, item)
 	return Qnil;
     }
 
-    rb_ary_modify(ary);
-    if (RARRAY(ary)->len > i2) {
-	RARRAY(ary)->len = i2;
-	if (i2 * 2 < RARRAY(ary)->aux.capa &&
+    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;
-	}
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, i2 * 2);
+	RARRAY(ary)->aux.capa = i2 * 2;
     }
 
     return item;
@@ -1880,13 +1220,13 @@ rb_ary_delete_at(ary, pos)
     long i, len = RARRAY(ary)->len;
     VALUE del;
 
+    rb_ary_modify(ary);
     if (pos >= len) return Qnil;
     if (pos < 0) {
 	pos += len;
 	if (pos < 0) return Qnil;
     }
 
-    rb_ary_modify(ary);
     del = RARRAY(ary)->ptr[pos];
     for (i = pos + 1; i < len; i++, pos++) {
 	RARRAY(ary)->ptr[pos] = RARRAY(ary)->ptr[i];
@@ -1896,20 +1236,6 @@ rb_ary_delete_at(ary, pos)
     return del;
 }
 
-/*
- *  call-seq:
- *     array.delete_at(index)  -> obj or nil
- *  
- *  Deletes the element at the specified index, returning that element,
- *  or <code>nil</code> if the index is out of range. See also
- *  <code>Array#slice!</code>.
- *     
- *     a = %w( ant bat cat dog )
- *     a.delete_at(2)    #=> "cat"
- *     a                 #=> ["ant", "bat", "dog"]
- *     a.delete_at(99)   #=> nil
- */
-
 static VALUE
 rb_ary_delete_at_m(ary, pos)
     VALUE ary, pos;
@@ -1917,31 +1243,6 @@ rb_ary_delete_at_m(ary, pos)
     return rb_ary_delete_at(ary, NUM2LONG(pos));
 }
 
-/*
- *  call-seq:
- *     array.slice!(index)         -> obj or nil
- *     array.slice!(start, length) -> sub_array or nil
- *     array.slice!(range)         -> sub_array or nil 
- *  
- *  Deletes the element(s) given by an index (optionally with a length)
- *  or by a range. Returns the deleted object, subarray, or
- *  <code>nil</code> if the index is out of range. Equivalent to:
- *     
- *     def slice!(*args)
- *       result = self[*args]
- *       self[*args] = nil
- *       result
- *     end
- *     
- *     a = [ "a", "b", "c" ]
- *     a.slice!(1)     #=> "b"
- *     a               #=> ["a", "c"]
- *     a.slice!(-1)    #=> "c"
- *     a               #=> ["a"]
- *     a.slice!(100)   #=> nil
- *     a               #=> ["a"]
- */
-
 static VALUE
 rb_ary_slice_bang(argc, argv, ary)
     int argc;
@@ -1951,6 +1252,7 @@ rb_ary_slice_bang(argc, argv, 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);
@@ -1959,7 +1261,7 @@ rb_ary_slice_bang(argc, argv, ary)
 	    pos = RARRAY(ary)->len + pos;
 	}
 	arg2 = rb_ary_subseq(ary, pos, len);
-	rb_ary_splice(ary, pos, len, Qnil);	/* Qnil/rb_ary_new2(0) */
+	rb_ary_update(ary, pos, len, Qnil);	/* Qnil/rb_ary_new2(0) */
 	return arg2;
     }
 
@@ -1970,16 +1272,6 @@ rb_ary_slice_bang(argc, argv, ary)
     return rb_ary_delete_at(ary, NUM2LONG(arg1));
 }
 
-/*
- *  call-seq:
- *     array.reject! {|item| block }  -> array or nil
- *  
- *  Equivalent to <code>Array#delete_if</code>, deleting elements from
- *  _self_ for which the block evaluates to true, but returns
- *  <code>nil</code> if no changes were made. Also see
- *  <code>Enumerable#reject</code>.
- */
-
 static VALUE
 rb_ary_reject_bang(ary)
     VALUE ary;
@@ -1988,28 +1280,18 @@ rb_ary_reject_bang(ary)
 
     rb_ary_modify(ary);
     for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
-	VALUE v = RARRAY(ary)->ptr[i1];
-	if (RTEST(rb_yield(v))) continue;
+	if (RTEST(rb_yield(RARRAY(ary)->ptr[i1]))) continue;
 	if (i1 != i2) {
-	    rb_ary_store(ary, i2, v);
+	    RARRAY(ary)->ptr[i2] = RARRAY(ary)->ptr[i1];
 	}
 	i2++;
     }
     if (RARRAY(ary)->len == i2) return Qnil;
-    if (i2 < RARRAY(ary)->len)
-	RARRAY(ary)->len = i2;
+    RARRAY(ary)->len = i2;
 
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.reject {|item| block }  -> an_array
- *  
- *  Returns a new array containing the items in _self_
- *  for which the block is not true.
- */
-
 static VALUE
 rb_ary_reject(ary)
     VALUE ary;
@@ -2019,17 +1301,6 @@ rb_ary_reject(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.delete_if {|item| block }  -> array
- *  
- *  Deletes every element of <i>self</i> for which <i>block</i> evaluates
- *  to <code>true</code>.
- *     
- *     a = [ "a", "b", "c" ]
- *     a.delete_if {|x| x >= "b" }   #=> ["a"]
- */
-
 static VALUE
 rb_ary_delete_if(ary)
     VALUE ary;
@@ -2038,28 +1309,6 @@ rb_ary_delete_if(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.zip(arg, ...)                   -> an_array
- *     array.zip(arg, ...) {| arr | block }  -> nil
- *  
- *  Converts any arguments to arrays, then merges elements of
- *  <i>self</i> with corresponding elements from each argument. This
- *  generates a sequence of <code>self.size</code> <em>n</em>-element
- *  arrays, where <em>n</em> is one more that the count of arguments. If
- *  the size of any argument is less than <code>enumObj.size</code>,
- *  <code>nil</code> values are supplied. If a block given, it is
- *  invoked for each output array, otherwise an array of arrays is
- *  returned.
- *     
- *     a = [ 4, 5, 6 ]
- *     b = [ 7, 8, 9 ]
- *     
- *     [1,2,3].zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
- *     [1,2].zip(a,b)         #=> [[1, 4, 7], [2, 5, 8]]
- *     a.zip([1,2],[8])       #=> [[4,1,8], [5,2,nil], [6,nil,nil]]
- */
-
 static VALUE
 rb_ary_zip(argc, argv, ary)
     int argc;
@@ -2070,57 +1319,46 @@ rb_ary_zip(argc, argv, ary)
     long len;
     VALUE result;
 
+    len = RARRAY(ary)->len;
     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++) {
+	for (i=0; i<len; i++) {
 	    VALUE tmp = rb_ary_new2(argc+1);
 
-	    rb_ary_push(tmp, rb_ary_elt(ary, i));
+	    rb_ary_push(tmp, rb_ary_entry(ary, i));
 	    for (j=0; j<argc; j++) {
-		rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+		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);
 
-	rb_ary_push(tmp, rb_ary_elt(ary, i));
+	rb_ary_push(tmp, rb_ary_entry(ary, i));
 	for (j=0; j<argc; j++) {
-	    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+	    rb_ary_push(tmp, rb_ary_entry(argv[j], i));
 	}
 	rb_ary_push(result, tmp);
     }
     return result;
 }
 
-/*
- *  call-seq:
- *     array.transpose -> an_array
- *  
- *  Assumes that <i>self</i> is an array of arrays and transposes the
- *  rows and columns.
- *     
- *     a = [[1,2], [3,4], [5,6]]
- *     a.transpose   #=> [[1, 3, 5], [2, 4, 6]]
- */
-
 static VALUE
 rb_ary_transpose(ary)
     VALUE ary;
 {
     long elen = -1, alen, i, j;
-    VALUE tmp, result = 0;
+    VALUE tmp, result;
 
     alen = RARRAY(ary)->len;
     if (alen == 0) return rb_ary_dup(ary);
     for (i=0; i<alen; i++) {
-	tmp = to_ary(rb_ary_elt(ary, i));
+	tmp = to_ary(RARRAY(ary)->ptr[i]);
 	if (elen < 0) {		/* first element */
 	    elen = RARRAY(tmp)->len;
 	    result = rb_ary_new2(elen);
@@ -2129,58 +1367,34 @@ rb_ary_transpose(ary)
 	    }
 	}
 	else if (elen != RARRAY(tmp)->len) {
-	    rb_raise(rb_eIndexError, "element size differs (%d should be %d)",
+	    rb_raise(rb_eIndexError, "element size differ (%d should be %d)",
 		     RARRAY(tmp)->len, elen);
 	}
 	for (j=0; j<elen; j++) {
-	    rb_ary_store(rb_ary_elt(result, j), i, rb_ary_elt(tmp, j));
+	    rb_ary_store(RARRAY(result)->ptr[j], i, RARRAY(tmp)->ptr[j]);
 	}
     }
     return result;
 }
 
-/*
- *  call-seq:
- *     array.replace(other_array)  -> array
- *  
- *  Replaces the contents of <i>self</i> with the contents of
- *  <i>other_array</i>, truncating or expanding if necessary.
- *     
- *     a = [ "a", "b", "c", "d", "e" ]
- *     a.replace([ "x", "y", "z" ])   #=> ["x", "y", "z"]
- *     a                              #=> ["x", "y", "z"]
- */
-
 static VALUE
 rb_ary_replace(copy, orig)
     VALUE copy, orig;
 {
-    VALUE shared;
-
     rb_ary_modify(copy);
     orig = to_ary(orig);
     if (copy == orig) return copy;
-    shared = ary_make_shared(orig);
+    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 = shared;
+    RARRAY(copy)->aux.shared = RARRAY(orig)->aux.shared;
     FL_SET(copy, ELTS_SHARED);
 
     return copy;
 }
 
-/* 
- *  call-seq:
- *     array.clear    ->  array
- *
- *  Removes all elements from _self_.
- *
- *     a = [ "a", "b", "c", "d", "e" ]
- *     a.clear    #=> [ ]
- */
-
 VALUE
 rb_ary_clear(ary)
     VALUE ary;
@@ -2194,30 +1408,6 @@ rb_ary_clear(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.fill(obj)                                -> array
- *     array.fill(obj, start [, length])              -> array
- *     array.fill(obj, range )                        -> array
- *     array.fill {|index| block }                    -> array
- *     array.fill(start [, length] ) {|index| block } -> array
- *     array.fill(range) {|index| block }             -> array
- *  
- *  The first three forms set the selected elements of <i>self</i> (which
- *  may be the entire array) to <i>obj</i>. A <i>start</i> of
- *  <code>nil</code> is equivalent to zero. A <i>length</i> of
- *  <code>nil</code> is equivalent to <i>self.length</i>. The last three
- *  forms fill the array with the value of the block. The block is
- *  passed the absolute index of each element to be filled.
- *     
- *     a = [ "a", "b", "c", "d" ]
- *     a.fill("x")              #=> ["x", "x", "x", "x"]
- *     a.fill("z", 2, 2)        #=> ["x", "x", "z", "z"]
- *     a.fill("y", 0..1)        #=> ["y", "y", "z", "z"]
- *     a.fill {|i| i*i}         #=> [0, 1, 4, 9]
- *     a.fill(-2) {|i| i*i*i}   #=> [0, 1, 8, 27]
- */
-
 static VALUE
 rb_ary_fill(argc, argv, ary)
     int argc;
@@ -2225,7 +1415,7 @@ rb_ary_fill(argc, argv, ary)
     VALUE ary;
 {
     VALUE item, arg1, arg2;
-    long beg = 0, end = 0, len = 0;
+    long beg, end, len;
     VALUE *p, *pend;
     int block_p = Qfalse;
 
@@ -2258,31 +1448,25 @@ rb_ary_fill(argc, argv, ary)
     }
     rb_ary_modify(ary);
     end = beg + len;
-    if (end < 0) {
-	rb_raise(rb_eArgError, "argument too big");
-    }
     if (end > RARRAY(ary)->len) {
 	if (end >= RARRAY(ary)->aux.capa) {
 	    REALLOC_N(RARRAY(ary)->ptr, VALUE, end);
 	    RARRAY(ary)->aux.capa = end;
 	}
-	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
+	if (beg > 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<end; i++) {
-	    v = rb_yield(LONG2NUM(i));
-	    if (i>=RARRAY(ary)->len) break;
-	    RARRAY(ary)->ptr[i] = v;
+	while (p < pend) {
+	    *p++ = rb_yield(LONG2NUM(beg++));
 	}
     }
     else {
-	p = RARRAY(ary)->ptr + beg;
-	pend = p + len;
 	while (p < pend) {
 	    *p++ = item;
 	}
@@ -2290,16 +1474,6 @@ rb_ary_fill(argc, argv, ary)
     return ary;
 }
 
-/* 
- *  call-seq:
- *     array + other_array   -> an_array
- *
- *  Concatenation---Returns a new array built by concatenating the
- *  two arrays together to produce a third array.
- * 
- *     [ 1, 2, 3 ] + [ 4, 5 ]    #=> [ 1, 2, 3, 4, 5 ]
- */
-
 VALUE
 rb_ary_plus(x, y)
     VALUE x, y;
@@ -2316,43 +1490,17 @@ rb_ary_plus(x, y)
     return z;
 }
 
-/* 
- *  call-seq:
- *     array.concat(other_array)   ->  array
- *
- *  Appends the elements in other_array to _self_.
- *  
- *     [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
- */
-
-
 VALUE
 rb_ary_concat(x, y)
     VALUE x, y;
 {
     y = to_ary(y);
     if (RARRAY(y)->len > 0) {
-	rb_ary_splice(x, RARRAY(x)->len, 0, y);
+	rb_ary_update(x, RARRAY(x)->len, 0, y);
     }
     return x;
 }
 
-
-/* 
- *  call-seq:
- *     array * int     ->    an_array
- *     array * str     ->    a_string
- *
- *  Repetition---With a String argument, equivalent to
- *  self.join(str). Otherwise, returns a new array
- *  built by concatenating the _int_ copies of _self_.
- *
- *
- *     [ 1, 2, 3 ] * 3    #=> [ 1, 2, 3, 1, 2, 3, 1, 2, 3 ]
- *     [ 1, 2, 3 ] * ","  #=> "1,2,3"
- *
- */
-
 static VALUE
 rb_ary_times(ary, times)
     VALUE ary, times;
@@ -2366,13 +1514,9 @@ rb_ary_times(ary, times)
     }
 
     len = NUM2LONG(times);
-    if (len == 0) return ary_new(rb_obj_class(ary), 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);
@@ -2386,88 +1530,44 @@ rb_ary_times(ary, times)
     return ary2;
 }
 
-/* 
- *  call-seq:
- *     array.assoc(obj)   ->  an_array  or  nil
- *
- *  Searches through an array whose elements are also arrays
- *  comparing _obj_ with the first element of each contained array
- *  using obj.==.
- *  Returns the first contained array that matches (that
- *  is, the first associated array),
- *  or +nil+ if no match is found.
- *  See also <code>Array#rassoc</code>.
- *
- *     s1 = [ "colors", "red", "blue", "green" ]
- *     s2 = [ "letters", "a", "b", "c" ]
- *     s3 = "foo"
- *     a  = [ s1, s2, s3 ]
- *     a.assoc("letters")  #=> [ "letters", "a", "b", "c" ]
- *     a.assoc("foo")      #=> nil
- */
-
 VALUE
 rb_ary_assoc(ary, key)
     VALUE ary, key;
 {
-    long i;
-    VALUE v;
+    VALUE *p, *pend;
 
-    for (i = 0; i < RARRAY(ary)->len; ++i) {
-	v = RARRAY(ary)->ptr[i];
-	if (TYPE(v) == T_ARRAY &&
-	    RARRAY(v)->len > 0 &&
-	    rb_equal(RARRAY(v)->ptr[0], key))
-	    return v;
+    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))
+	    return *p;
+	p++;
     }
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     array.rassoc(key) -> an_array or nil
- *  
- *  Searches through the array whose elements are also arrays. Compares
- *  <em>key</em> with the second element of each contained array using
- *  <code>==</code>. Returns the first contained array that matches. See
- *  also <code>Array#assoc</code>.
- *     
- *     a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
- *     a.rassoc("two")    #=> [2, "two"]
- *     a.rassoc("four")   #=> nil
- */
-
 VALUE
 rb_ary_rassoc(ary, value)
     VALUE ary, value;
 {
-    long i;
-    VALUE v;
+    VALUE *p, *pend;
 
-    for (i = 0; i < RARRAY(ary)->len; ++i) {
-	v = RARRAY(ary)->ptr[i];
-	if (TYPE(v) == T_ARRAY &&
-	    RARRAY(v)->len > 1 &&
-	    rb_equal(RARRAY(v)->ptr[1], value))
-	    return v;
+    p = RARRAY(ary)->ptr;
+    pend = p + RARRAY(ary)->len;
+
+    while (p < pend) {
+	if (TYPE(*p) == T_ARRAY
+	    && RARRAY(*p)->len > 1
+	    && rb_equal(RARRAY(*p)->ptr[1], value))
+	    return *p;
+	p++;
     }
     return Qnil;
 }
 
-/* 
- *  call-seq:
- *     array == other_array   ->   bool
- *
- *  Equality---Two arrays are equal if they contain the same number
- *  of elements and if each element is equal to (according to
- *  Object.==) the corresponding element in the other array.
- *
- *     [ "a", "c" ]    == [ "a", "c", 7 ]     #=> false
- *     [ "a", "c", 7 ] == [ "a", "c", 7 ]     #=> true
- *     [ "a", "c", 7 ] == [ "a", "d", "f" ]   #=> false
- *
- */
-
 static VALUE
 rb_ary_equal(ary1, ary2)
     VALUE ary1, ary2;
@@ -2483,20 +1583,12 @@ rb_ary_equal(ary1, ary2)
     }
     if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
     for (i=0; i<RARRAY(ary1)->len; i++) {
-	if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+	if (!rb_equal(RARRAY(ary1)->ptr[i], RARRAY(ary2)->ptr[i]))
 	    return Qfalse;
     }
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     array.eql?(other)  -> true or false
- *
- *  Returns <code>true</code> if _array_ and _other_ are the same object,
- *  or are both arrays with the same content.
- */
-
 static VALUE
 rb_ary_eql(ary1, ary2)
     VALUE ary1, ary2;
@@ -2507,20 +1599,12 @@ rb_ary_eql(ary1, ary2)
     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_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+	if (!rb_eql(RARRAY(ary1)->ptr[i], RARRAY(ary2)->ptr[i]))
 	    return Qfalse;
     }
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     array.hash   -> fixnum
- *
- *  Compute a hash-code for this array. Two arrays with the same content
- *  will have the same hash code (and will compare using <code>eql?</code>).
- */
-
 static VALUE
 rb_ary_hash(ary)
     VALUE ary;
@@ -2537,19 +1621,6 @@ rb_ary_hash(ary)
     return LONG2FIX(h);
 }
 
-/*
- *  call-seq:
- *     array.include?(obj)   -> true or false
- *  
- *  Returns <code>true</code> if the given object is present in
- *  <i>self</i> (that is, if any object <code>==</code> <i>anObject</i>),
- *  <code>false</code> otherwise.
- *     
- *     a = [ "a", "b", "c" ]
- *     a.include?("b")   #=> true
- *     a.include?("z")   #=> false
- */
-
 VALUE
 rb_ary_includes(ary, item)
     VALUE ary;
@@ -2565,27 +1636,6 @@ rb_ary_includes(ary, item)
     return Qfalse;
 }
 
-
-/* 
- *  call-seq:
- *     array <=> other_array   ->  -1, 0, +1
- *
- *  Comparison---Returns an integer (-1, 0,
- *  or +1) if this array is less than, equal to, or greater than
- *  other_array.  Each object in each array is compared
- *  (using <=>). If any value isn't
- *  equal, then that inequality is the return value. If all the
- *  values found are equal, then the return is based on a
- *  comparison of the array lengths.  Thus, two arrays are
- *  ``equal'' according to <code>Array#<=></code> if and only if they have
- *  the same length and the value of each element is equal to the
- *  value of the corresponding element in the other array.
- *  
- *     [ "a", "a", "c" ]    <=> [ "a", "b", "c" ]   #=> -1
- *     [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ]            #=> +1
- *
- */
-
 VALUE
 rb_ary_cmp(ary1, ary2)
     VALUE ary1, ary2;
@@ -2598,7 +1648,7 @@ rb_ary_cmp(ary1, ary2)
 	len = RARRAY(ary2)->len;
     }
     for (i=0; i<len; i++) {
-	VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
+	VALUE v = rb_funcall(RARRAY(ary1)->ptr[i], id_cmp, 1, RARRAY(ary2)->ptr[i]);
 	if (v != INT2FIX(0)) {
 	    return v;
 	}
@@ -2627,24 +1677,11 @@ ary_make_hash(ary1, ary2)
     return hash;
 }
 
-/* 
- *  call-seq:
- *     array - other_array    -> an_array
- *
- *  Array Difference---Returns a new array that is a copy of
- *  the original array, removing any items that also appear in
- *  other_array. (If you need set-like behavior, see the
- *  library class Set.)
- *
- *     [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ]  #=>  [ 3, 3, 5 ]
- */
-
 static VALUE
 rb_ary_diff(ary1, ary2)
     VALUE ary1, ary2;
 {
-    VALUE ary3;
-    volatile VALUE hash;
+    VALUE ary3, hash;
     long i;
 
     hash = ary_make_hash(to_ary(ary2), 0);
@@ -2652,27 +1689,16 @@ rb_ary_diff(ary1, ary2)
 
     for (i=0; i<RARRAY(ary1)->len; i++) {
 	if (st_lookup(RHASH(hash)->tbl, RARRAY(ary1)->ptr[i], 0)) continue;
-	rb_ary_push(ary3, rb_ary_elt(ary1, i));
+	rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
     }
     return ary3;
 }
 
-/* 
- *  call-seq:
- *     array & other_array
- *
- *  Set Intersection---Returns a new array
- *  containing elements common to the two arrays, with no duplicates.
- *
- *     [ 1, 1, 3, 5 ] & [ 1, 2, 3 ]   #=> [ 1, 3 ]
- */
-
-
 static VALUE
 rb_ary_and(ary1, ary2)
     VALUE ary1, ary2;
 {
-    VALUE hash, ary3, v, vv;
+    VALUE hash, ary3;
     long i;
 
     ary2 = to_ary(ary2);
@@ -2681,32 +1707,21 @@ rb_ary_and(ary1, ary2)
     hash = ary_make_hash(ary2, 0);
 
     for (i=0; i<RARRAY(ary1)->len; i++) {
-	v = vv = rb_ary_elt(ary1, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
-	    rb_ary_push(ary3, v);
+	VALUE v = RARRAY(ary1)->ptr[i];
+	if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+	    rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
 	}
     }
 
     return ary3;
 }
 
-/* 
- *  call-seq:
- *     array | other_array     ->  an_array
- *
- *  Set Union---Returns a new array by joining this array with
- *  other_array, removing duplicates.
- *
- *     [ "a", "b", "c" ] | [ "c", "d", "a" ]
- *            #=> [ "a", "b", "c", "d" ]
- */
-
 static VALUE
 rb_ary_or(ary1, ary2)
     VALUE ary1, ary2;
 {
     VALUE hash, ary3;
-    VALUE v, vv;
+    VALUE v;
     long i;
 
     ary2 = to_ary(ary2);
@@ -2714,67 +1729,48 @@ rb_ary_or(ary1, ary2)
     hash = ary_make_hash(ary1, ary2);
 
     for (i=0; i<RARRAY(ary1)->len; i++) {
-	v = vv = rb_ary_elt(ary1, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
-	    rb_ary_push(ary3, v);
+	v = RARRAY(ary1)->ptr[i];
+	if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+	    rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
 	}
     }
     for (i=0; i<RARRAY(ary2)->len; i++) {
-	v = vv = rb_ary_elt(ary2, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
-	    rb_ary_push(ary3, v);
+	v = RARRAY(ary2)->ptr[i];
+	if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+	    rb_ary_push(ary3, RARRAY(ary2)->ptr[i]);
 	}
     }
     return ary3;
 }
 
-/*
- *  call-seq:
- *     array.uniq! -> array or nil
- *  
- *  Removes duplicate elements from _self_.
- *  Returns <code>nil</code> if no changes are made (that is, no
- *  duplicates are found).
- *     
- *     a = [ "a", "a", "b", "b", "c" ]
- *     a.uniq!   #=> ["a", "b", "c"]
- *     b = [ "a", "b", "c" ]
- *     b.uniq!   #=> nil
- */
-
 static VALUE
 rb_ary_uniq_bang(ary)
     VALUE ary;
 {
-    VALUE hash, v, vv;
-    long i, j;
+    VALUE hash;
+    VALUE *p, *q, *end;
+
+    rb_ary_modify(ary); 
 
     hash = ary_make_hash(ary, 0);
 
     if (RARRAY(ary)->len == RHASH(hash)->tbl->num_entries) {
 	return Qnil;
     }
-    for (i=j=0; i<RARRAY(ary)->len; i++) {
-	v = vv = rb_ary_elt(ary, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
-	    rb_ary_store(ary, j++, v);
+    p = q = RARRAY(ary)->ptr;
+    end = p + RARRAY(ary)->len;
+    while (p < end) {
+	VALUE v = *p;
+	if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+	    *q++ = *p;
 	}
+	p++;
     }
-    RARRAY(ary)->len = j;
+    RARRAY(ary)->len = (q - RARRAY(ary)->ptr);
 
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.uniq   -> an_array
- *  
- *  Returns a new array by removing duplicate values in <i>self</i>.
- *     
- *     a = [ "a", "a", "b", "b", "c" ]
- *     a.uniq   #=> ["a", "b", "c"]
- */
-
 static VALUE
 rb_ary_uniq(ary)
     VALUE ary;
@@ -2784,17 +1780,6 @@ rb_ary_uniq(ary)
     return ary;
 }
 
-/* 
- *  call-seq:
- *     array.compact!    ->   array  or  nil
- *
- *  Removes +nil+ elements from array.
- *  Returns +nil+ if no changes were made.
- *
- *     [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
- *     [ "a", "b", "c" ].compact!           #=> nil
- */
-
 static VALUE
 rb_ary_compact_bang(ary)
     VALUE ary;
@@ -2818,16 +1803,6 @@ rb_ary_compact_bang(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.compact     ->  an_array
- *
- *  Returns a copy of _self_ with all +nil+ elements removed.
- *
- *     [ "a", nil, "b", nil, "c", nil ].compact
- *                       #=> [ "a", "b", "c" ]
- */
-
 static VALUE
 rb_ary_compact(ary)
     VALUE ary;
@@ -2837,16 +1812,6 @@ rb_ary_compact(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.nitems -> int
- *  
- *  Returns the number of non-<code>nil</code> elements in _self_.
- *  May be zero.
- *     
- *     [ 1, nil, 3, nil, 5 ].nitems   #=> 3
- */
-
 static VALUE
 rb_ary_nitems(ary)
     VALUE ary;
@@ -2879,13 +1844,10 @@ flatten(ary, idx, ary2, memo)
 	rb_raise(rb_eArgError, "tried to flatten recursive array");
     }
     rb_ary_push(memo, id);
-    rb_ary_splice(ary, idx, 1, ary2);
+    rb_ary_update(ary, idx, 1, ary2);
     while (i < lim) {
-	VALUE tmp;
-
-	tmp = rb_check_array_type(rb_ary_elt(ary, i));
-	if (!NIL_P(tmp)) {
-	    n = flatten(ary, i, tmp, memo);
+	if (TYPE(RARRAY(ary)->ptr[i]) == T_ARRAY) {
+	    n = flatten(ary, i, RARRAY(ary)->ptr[i], memo);
 	    i += n; lim += n;
 	}
 	i++;
@@ -2895,20 +1857,6 @@ flatten(ary, idx, ary2, memo)
     return lim - idx - 1;	/* returns number of increased items */
 }
 
-/*
- *  call-seq:
- *     array.flatten! -> array or nil
- *  
- *  Flattens _self_ in place.
- *  Returns <code>nil</code> if no modifications were made (i.e.,
- *  <i>array</i> contains no subarrays.)
- *     
- *     a = [ 1, 2, [3, [4, 5] ] ]
- *     a.flatten!   #=> [1, 2, 3, 4, 5]
- *     a.flatten!   #=> nil
- *     a            #=> [1, 2, 3, 4, 5]
- */
-
 static VALUE
 rb_ary_flatten_bang(ary)
     VALUE ary;
@@ -2917,16 +1865,15 @@ rb_ary_flatten_bang(ary)
     int mod = 0;
     VALUE memo = Qnil;
 
+    rb_ary_modify(ary);
     while (i<RARRAY(ary)->len) {
 	VALUE ary2 = RARRAY(ary)->ptr[i];
-	VALUE tmp;
 
-	tmp = rb_check_array_type(ary2);
-	if (!NIL_P(tmp)) {
+	if (TYPE(ary2) == T_ARRAY) {
 	    if (NIL_P(memo)) {
 		memo = rb_ary_new();
 	    }
-	    i += flatten(ary, i, tmp, memo);
+	    i += flatten(ary, i, ary2, memo);
 	    mod = 1;
 	}
 	i++;
@@ -2935,20 +1882,6 @@ rb_ary_flatten_bang(ary)
     return ary;
 }
 
-/*
- *  call-seq:
- *     array.flatten -> an_array
- *  
- *  Returns a new array that is a one-dimensional flattening of this
- *  array (recursively). That is, for every element that is an array,
- *  extract its elements into the new array.
- *     
- *     s = [ 1, 2, 3 ]           #=> [1, 2, 3]
- *     t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
- *     a = [ s, t, 9, 10 ]       #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
- *     a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10
- */
-
 static VALUE
 rb_ary_flatten(ary)
     VALUE ary;
@@ -2958,14 +1891,6 @@ rb_ary_flatten(ary)
     return ary;
 }
 
-
-/* Arrays are ordered, integer-indexed collections of any object. 
- * Array indexing starts at 0, as in C or Java.  A negative index is 
- * assumed to be relative to the end of the array---that is, an index of -1 
- * indicates the last element of the array, -2 is the next to last 
- * element in the array, and so on. 
- */
-
 void
 Init_Array()
 {
@@ -2975,8 +1900,6 @@ Init_Array()
     rb_define_alloc_func(rb_cArray, ary_alloc);
     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);
@@ -2991,8 +1914,8 @@ Init_Array()
     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, "first", rb_ary_first, 0);
+    rb_define_method(rb_cArray, "last", rb_ary_last, 0);
     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);
@@ -3010,6 +1933,7 @@ 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, "copy_object", rb_ary_replace, 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);
@@ -3017,10 +1941,9 @@ Init_Array()
     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, "select", rb_ary_select, -1);
     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, 0);
-    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_if", rb_ary_delete_if, 0);
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index de7a2beeb8..c16430cd22 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -1,7 +1,4 @@
-# -*- makefile -*-
-
 SHELL = $(COMSPEC)
-MKFILES = Makefile
 
 #### Start of system configuration section. ####
 OS = bccwin32
@@ -57,7 +54,6 @@ AR = tlib
 
 PURIFY =
 AUTOCONF = autoconf
-RM = $(srcdir:/=\)\win32\rm.bat
 
 !if !defined(PROCESSOR_ARCHITECTURE)
 PROCESSOR_ARCHITECTURE = x86
@@ -87,34 +83,14 @@ OPTFLAGS = -O
 !ifndef prefix
 prefix = /usr
 !endif
-!ifndef exec_prefix
-exec_prefix = $(prefix)
-!endif
-!ifndef libdir
-libdir = $(exec_prefix)/lib
-!endif
-!if !defined(datadir)
-datadir = /share
-!endif
-!ifndef EXTOUT
-EXTOUT = .ext
-!endif
-!ifndef RIDATADIR
-RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
-!endif
-!ifndef TESTUI
-TESTUI = console
-!endif
-!ifndef TESTS
-TESTS =
-!endif
-!ifndef RDOCTARGET
-RDOCTARGET = install-nodoc
+!ifndef DESTDIR
+DESTDIR = $(prefix)
 !endif
-
-OUTFLAG       = -o
 !ifndef CFLAGS
-CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
+CFLAGS = -q $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w-
+!endif
+!ifndef CPPFLAGS
+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)missing
 !endif
 !ifndef LDFLAGS
 LDFLAGS = -S:$(STACK)
@@ -125,23 +101,20 @@ RFLAGS = $(iconinc)
 !ifndef EXTLIBS
 EXTLIBS =
 !endif
-!ifndef MEMLIB
-MEMLIB =
-!endif
-LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
-MISSING = acosh.obj crypt.obj erf.obj win32.obj
+LIBS = cw32.lib import32.lib ws2_32.lib $(EXTLIBS)
+MISSING = acosh.obj crypt.obj win32.obj
 
 !ifndef STACK
 STACK = 0x2000000
 !endif
 
-XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing
+XCFLAGS = 
 
 ARFLAGS = /a
 LD = ilink32 -q -Gn
 LDSHARED  = $(LD)
 XLDFLAGS  = -Tpe c0x32.obj
-WLDFLAGS  = -aa -Tpe c0w32.obj
+WLDFLAGS  = -Tpe c0w32.obj
 DLDFLAGS  = -Tpd c0d32.obj
 LIBRUBY_LDSHARED = $(LDSHARED)
 LIBRUBY_DLDFLAGS = -Gi $(DLDFLAGS) $(EXTLDFLAGS)
@@ -154,7 +127,6 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
 RUBYDEF = $(RUBY_SO_NAME).def
 MINIRUBY = .\miniruby$(EXEEXT)
-RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
 
 ORGLIBPATH = $(LIB)
 
@@ -165,132 +137,158 @@ LIBRUBY_SO    = $(RUBY_SO_NAME).dll
 LIBRUBY       = $(RUBY_SO_NAME).lib
 LIBRUBYARG    = $(LIBRUBY)
 
-PREP          = miniruby$(EXEEXT)
-
-OBJEXT        = obj
-
-WINMAINOBJ    = winmain.$(OBJEXT)
-MINIOBJS      = dmydln.$(OBJEXT)
-
-.path.c = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
-.path.h = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
-.path.y = $(srcdir)
-.path. = $(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
-
-all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
+!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)
 
-!include $(srcdir)/common.mk
-
-PHONY: Makefile
-
-CONFIG_H = ./.config.h.time
-
-config: config.status
+config: config.h config.status
 
-config.status: $(CONFIG_H)
-
-$(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
-	@$(srcdir:/=\)\win32\ifchange.bat config.h &&|
-\#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_OFF_T 1
-\#define SIZEOF_INT 4
-\#define SIZEOF_SHORT 2
-\#define SIZEOF_LONG 4
-\#define SIZEOF_LONG_LONG 0
-\#define SIZEOF___INT64 8
-\#define SIZEOF_OFF_T 4
-\#define SIZEOF_VOIDP 4
-\#define SIZEOF_FLOAT 4
-\#define SIZEOF_DOUBLE 8
-\#define SIZEOF_TIME_T 4
+config.h:
+	@echo Creating $(@:.\=)
+	@type > $@ &&|
 \#define HAVE_PROTOTYPES 1
-\#define TOKEN_PASTE(x,y) x\#\#y
 \#define HAVE_STDARG_PROTOTYPES 1
+/* \#define HAVE_ATTR_NORETURN 1 */
 \#define NORETURN(x) x
-\#define RUBY_EXTERN extern __declspec(dllimport)
-\#define HAVE_DECL_SYS_NERR 1
+\#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_FLOAT_H 1
-\#define rb_uid_t uid_t
-\#define rb_gid_t gid_t
-\#define rb_pid_t int
-\#define HAVE_STRUCT_STAT_ST_RDEV 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 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_STRTOD 1
-\#define HAVE_STRTOL 1
-\#define HAVE_STRTOUL 1
-\#define HAVE_ISNAN 1
-\#define HAVE_FINITE 1
-\#define HAVE_HYPOT 1
+\#define vfork fork
 \#define HAVE_FMOD 1
+/* \#define HAVE_RANDOM 1    */
 \#define HAVE_WAITPID 1
-\#define HAVE_FSYNC 1
 \#define HAVE_GETCWD 1
+/* \#define HAVE_TRUNCATE 1  */
 \#define HAVE_CHSIZE 1
 \#define HAVE_TIMES 1
-\#define HAVE_FCNTL 1
-\#define HAVE_LINK 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 RSHIFT(x,y) ((x)>>(int)y)
+
+\#define NEED_IO_SEEK_BETWEEN_RW 1
+\#define RSHIFT(x,y) ((x)>>y)
 \#define FILE_COUNT level
 \#define FILE_READPTR curp
-\#define inline __inline
-\#define NEED_IO_SEEK_BETWEEN_RW 1
-\#define STACK_GROW_DIRECTION -1
 \#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
 |
-	@exit > $@
 
-config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
+config.status: Makefile $(srcdir)bcc32/Makefile.sub
 	@echo Creating $@
 	@type > $@ &&|
 # Generated automatically by Makefile.sub.
 s,@SHELL@,$$(COMSPEC),;t t
-s,@BUILD_FILE_SEPARATOR@,\,;t t
-s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
@@ -335,33 +333,23 @@ 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,@CP@,copy > nul,;t t
-s,@INSTALL@,copy > nul,;t t
-s,@INSTALL_PROG@,$$(INSTALL),;t t
-s,@INSTALL_DATA@,$$(INSTALL),;t t
-s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
+s,@LIBOBJS@, acosh.obj crypt.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,@XCFLAGS@,$(XCFLAGS),;t t
 s,@XLDFLAGS@,$(XLDFLAGS),;t t
 s,@DLDFLAGS@,$(DLDFLAGS),;t t
-s,@ARCH_FLAG@,$(ARCH_FLAG),;t t
 s,@STATIC@,$(STATIC),;t t
-s,@CCDLFLAGS@,,;t t
+s,@CCDLFLAGS@,-DIMPORT,;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,@PREP@,miniruby$(EXEEXT),;t t
-s,@RUNRUBY@,$(RUNRUBY),;t t
-s,@EXTOUT@,$(EXTOUT),;t t
-s,@ARCHFILE@,,;t t
-s,@RDOCTARGET@,,;t t
 s,@LIBRUBY_LDSHARED@,$$(LDSHARED),;t t
 s,@LIBRUBY_DLDFLAGS@,-Gi $$(DLDFLAGS),;t t
 s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
@@ -378,18 +366,16 @@ s,@LIBRUBYARG_SHARED@,$$(LIBRUBY),;t t
 s,@SOLIBS@,$(SOLIBS),;t t
 s,@DLDLIBS@,$(DLDLIBS),;t t
 s,@ENABLE_SHARED@,yes,;t t
-s,@OUTFLAG@,$(OUTFLAG),;t t
+s,@OUTFLAG@,-o,;t t
 s,@CPPOUTFILE@,,;t t
-s,@LIBPATHFLAG@, -L"%s",;t t
-s,@RPATHFLAG@,,;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) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t
-s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
-s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
-s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t
-s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t
-s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;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
@@ -402,9 +388,9 @@ s,@srcdir@,$(srcdir),;t t
 s,@top_srcdir@,$(srcdir),;t t
 |
 
-miniruby$(EXEEXT):
+miniruby$(EXEEXT):	$(LIBRUBY_A) $(MAINOBJ) dmyext.obj
 		@echo $(LIBS)
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS),$@,nul,$(LIBRUBY_A) $(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
@@ -412,79 +398,189 @@ $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(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)
+$(LIBRUBY_A):	$(OBJS) dmyext.obj
 		@-if exist $@ del $@
-		$(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
+		$(AR) $(ARFLAGS) "$@" $(OBJS) dmyext.obj
 
 # $(LIBRUBY):	$(LIBRUBY_SO)
 #		implib $@ $(LIBRUBY_SO)
 
-$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
-		@echo $(DLDOBJS)
-		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
-
-$(LIBRUBY): $(LIBRUBY_SO)
-
-$(RUBYDEF):	$(LIBRUBY_A) $(PREP)
-		$(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A)
+$(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)
+		@$(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 \
+		@$(MINIRUBY) $(srcdir)win32/resource.rb \
 			-ruby_name=$(RUBY_INSTALL_NAME) \
 			-rubyw_name=$(RUBYW_INSTALL_NAME) \
 			-so_name=$(RUBY_SO_NAME) \
-			. $(icondirs) $(srcdir)/win32
+			. $(icondirs) $(srcdir)win32
+
+#config.status:	$(srcdir)configure
+#		$(SHELL) .config.status --recheck
 
-post-install-ext::
-	$(MINIRUBY) -I$(srcdir)lib -rrbconfig -rfileutils \
-		-e "FileUtils.rm_f(Dir[ARGV[0]+Config::CONFIG['archdir']+'/**/*.tds'])" "$(DESTDIR:\=/)"
+.path.c = .;$(srcdir);$(srcdir)win32;$(srcdir)missing
+.path.h = .;$(srcdir);$(srcdir)win32;$(srcdir)missing
+.path.y = $(srcdir)
 
-clean-local::
-		@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
-		@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
+.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
 
-distclean-local::
-		@$(RM) ext\config.cache $(RBCONFIG:/=\)
-		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
-		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+parse.c: parse.y
 
 ext/extinit.obj: ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
 
-main.$(OBJEXT): win32.h
-array.$(OBJEXT): win32.h
-bignum.$(OBJEXT): win32.h
-class.$(OBJEXT): win32.h
-compar.$(OBJEXT): win32.h
-dir.$(OBJEXT): dir.h win32.h
-dln.$(OBJEXT): win32.h
-enum.$(OBJEXT): win32.h
-error.$(OBJEXT): win32.h
-eval.$(OBJEXT): win32.h
-file.$(OBJEXT): win32.h
-gc.$(OBJEXT): win32.h
-hash.$(OBJEXT): win32.h
-inits.$(OBJEXT): win32.h
-io.$(OBJEXT): win32.h
-marshal.$(OBJEXT): win32.h
-math.$(OBJEXT): win32.h
-numeric.$(OBJEXT): win32.h
-object.$(OBJEXT): win32.h
-pack.$(OBJEXT): win32.h
-parse.$(OBJEXT): win32.h
-process.$(OBJEXT): win32.h
-prec.$(OBJEXT): win32.h
-random.$(OBJEXT): win32.h
-range.$(OBJEXT): win32.h
-re.$(OBJEXT): win32.h
-regex.$(OBJEXT): win32.h
-ruby.$(OBJEXT): win32.h
-signal.$(OBJEXT): win32.h
-sprintf.$(OBJEXT): win32.h
-st.$(OBJEXT): win32.h
-string.$(OBJEXT): win32.h
-struct.$(OBJEXT): win32.h
-time.$(OBJEXT): win32.h
-util.$(OBJEXT): win32.h
-variable.$(OBJEXT): win32.h
-version.$(OBJEXT): win32.h
+acosh.obj: acosh.c win32.h
+alloca.obj: alloca.c win32.h
+crypt.obj: crypt.c win32.h
+dup2.obj: dup2.c win32.h
+finite.obj: finite.c win32.h
+flock.obj: flock.c win32.h
+isinf.obj: isinf.c win32.h
+isnan.obj: isnan.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
+
+###
+parse.obj: parse.c ruby.h config.h defines.h intern.h env.h node.h st.h regex.h util.h lex.c win32.h
+###
+array.obj: array.c ruby.h config.h defines.h intern.h win32.h
+bignum.obj: bignum.c ruby.h config.h defines.h intern.h win32.h
+class.obj: class.c ruby.h config.h defines.h intern.h node.h st.h win32.h
+compar.obj: compar.c ruby.h config.h defines.h intern.h win32.h
+dir.obj: dir.c ruby.h config.h defines.h intern.h win32.h
+dln.obj: dln.c config.h defines.h dln.h win32.h
+dmyext.obj: dmyext.c win32.h
+enum.obj: enum.c ruby.h config.h defines.h intern.h win32.h
+error.obj: error.c ruby.h config.h defines.h intern.h env.h win32.h
+eval.obj: eval.c ruby.h config.h defines.h intern.h node.h env.h rubysig.h st.h dln.h win32.h
+file.obj: file.c ruby.h config.h defines.h intern.h rubyio.h rubysig.h win32.h
+gc.obj: gc.c ruby.h config.h defines.h intern.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 st.h rubysig.h util.h win32.h
+inits.obj: inits.c ruby.h config.h defines.h intern.h win32.h
+io.obj: io.c ruby.h config.h defines.h intern.h rubyio.h rubysig.h env.h win32.h
+main.obj: main.c ruby.h config.h defines.h intern.h win32.h
+marshal.obj: marshal.c ruby.h config.h defines.h intern.h rubyio.h st.h win32.h
+prec.obj: prec.c ruby.h config.h defines.h intern.h win32.h
+math.obj: math.c ruby.h config.h defines.h intern.h win32.h
+numeric.obj: numeric.c ruby.h config.h defines.h intern.h win32.h
+object.obj: object.c ruby.h config.h defines.h intern.h st.h win32.h
+pack.obj: pack.c ruby.h config.h defines.h intern.h win32.h
+process.obj: process.c ruby.h config.h defines.h intern.h rubysig.h st.h win32.h
+random.obj: random.c ruby.h config.h defines.h intern.h win32.h
+range.obj: range.c ruby.h config.h defines.h intern.h win32.h
+re.obj: re.c ruby.h config.h defines.h intern.h re.h regex.h win32.h
+regex.obj: regex.c config.h regex.h util.h win32.h
+ruby.obj: ruby.c ruby.h config.h defines.h intern.h dln.h util.h win32.h
+signal.obj: signal.c ruby.h config.h defines.h intern.h rubysig.h win32.h
+sprintf.obj: sprintf.c ruby.h config.h defines.h intern.h win32.h
+st.obj: st.c config.h st.h win32.h
+string.obj: string.c ruby.h config.h defines.h intern.h re.h regex.h win32.h
+struct.obj: struct.c ruby.h config.h defines.h intern.h win32.h
+time.obj: time.c ruby.h config.h defines.h intern.h win32.h
+util.obj: util.c ruby.h config.h defines.h intern.h util.h win32.h
+variable.obj: variable.c ruby.h config.h defines.h intern.h env.h node.h st.h win32.h
+version.obj: version.c ruby.h config.h defines.h intern.h version.h win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
index c27a1261f1..a699d34a4e 100644
--- a/bcc32/README.bcc32
+++ b/bcc32/README.bcc32
@@ -6,26 +6,18 @@
 
 (1) Borland C++ 5.0 or later.
 
-(2) Please set environment variable (({PATH}))
+(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
-     * bcc32
+     * bcc
      * tlib
-     * ilink32
-
-(3) If you want to build from CVS source, following commands are required.
-     * byacc ((<URL:http://gnuwin32.sourceforge.net/packages/byacc.htm>))
-     * sed   ((<URL:http://gnuwin32.sourceforge.net/packages/sed.htm>))
-
-(4) We strongly recommend to build ruby on C++Builder, to link following files.
-     * usebormm.lib
-     * memmgr.lib
-
-    RTL's internal memory manager cannot handle large memory block properly,
-    so we should use borlndmm.dll instead.
-     10000.times { "" << "." * 529671; GC.start } # crash
+     * ilink
 
 == How to compile and install
 
@@ -56,10 +48,6 @@
     If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
     The ((|<PLATFORM>|)) is usually `(({i586-bccwin32}))'.
 
-(6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with
-    usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin
-    directory.
-
 == Icons
 
 Any icon files(*.ico) in the build directory, directories specified with
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 123a3f23c8..449b6e25b5 100755..100644
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -8,85 +8,25 @@ 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" == "--prefix" goto :prefix
 if "%1" == "--srcdir" goto :srcdir
 if "%1" == "srcdir" goto :srcdir
 if "%1" == "--target" goto :target
 if "%1" == "target" goto :target
-if "%1" == "--with-static-linked-ext" goto :extstatic
-if "%1" == "--program-suffix" goto :suffix
-if "%1" == "--program-name" goto :progname
-if "%1" == "--enable-install-doc" goto :enable-rdoc
-if "%1" == "--disable-install-doc" goto :disable-rdoc
-if "%1" == "--extout" goto :extout
-if "%1" == "-h" goto :help
-if "%1" == "--help" goto :help
-  echo>> ~tmp~.mak 	"%1" \
+  echo>> ~tmp~.mak 	"%1" 
   shift
 goto :loop
 :srcdir
-  echo>> ~tmp~.mak 	-D"srcdir=%2" \
-  shift
-  shift
-goto :loop
-:prefix
-  echo>> ~tmp~.mak 	-D"prefix=%2" \
-  shift
-  shift
-goto :loop
-:suffix
-  echo>> ~tmp~.mak 	-D"RUBY_SUFFIX=%2" \
-  shift
-  shift
-goto :loop
-:installname
-  echo>> ~tmp~.mak 	-D"RUBY_INSTALL_NAME=%2" \
-  shift
-  shift
-goto :loop
-:soname
-  echo>> ~tmp~.mak 	-D"RUBY_SO_NAME=%2" \
+  echo>> ~tmp~.mak 	"srcdir=%2" 
   shift
   shift
 goto :loop
 :target
-  echo>> ~tmp~.mak 	"%2" \
-  shift
-  shift
-goto :loop
-:extstatic
-  echo>> ~tmp~.mak 	-D"EXTSTATIC=static" \
-  shift
-goto :loop
-:enable-rdoc
-  echo>> ~tmp~.mak 	-D"RDOCTARGET=install-doc" \
-  shift
-goto :loop
-:disable-rdoc
-  echo>> ~tmp~.mak 	-D"RDOCTARGET=install-nodoc" \
-  shift
-goto :loop
-:extout
-  echo>> ~tmp~.mak 	"EXTOUT=%2" \
+  echo>> ~tmp~.mak 	%2 
   shift
   shift
 goto :loop
-:help
-  echo Configuration:
-  echo   --help                  display this help
-  echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']
-  echo Installation directories:
-  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)
-  echo System types:
-  echo   --target=TARGET         configure for TARGET [i386-bccwin32]
-  echo Optional Package:
-  echo   --with-static-linked-ext link external modules statically
-  echo   --enable-install-doc    install rdoc indexes during install
-  del ~tmp~.mak
-goto :exit
 :end
-echo>> ~tmp~.mak 	bcc32dir="$(@D)"
 make -s -f ~tmp~.mak
-:exit
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index b7a2539d0a..c81eaf2020 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -1,20 +1,18 @@
 # -*- makefile -*-
 
 !if "$(srcdir)" != ""
-bcc32dir = $(srcdir)/bcc32
+bcc32dir = $(srcdir)bcc32/
 !elseif "$(bcc32dir)" == "bcc32/"
-srcdir = .
+srcdir = ./
 !elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)"
-srcdir = $(bcc32dir:/bcc32/=)
+srcdir = $(bcc32dir:/bcc32/=/)
 !else
-srcdir = $(bcc32dir)/..
-!endif
-!ifndef prefix
-prefix = /usr
+srcdir = $(bcc32dir)../
 !endif
+
 OS = bccwin32
 RT = $(OS)
-BANG = !
+INCLUDE = !include
 APPEND = echo>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
@@ -34,34 +32,8 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
 	@echo Creating $(MAKEFILE)
 	@type > $(MAKEFILE) &&|
 \#\#\# Makefile for ruby $(OS) \#\#\#
-$(BANG)ifndef srcdir
 srcdir = $(srcdir:\=/)
-$(BANG)endif
-$(BANG)ifndef prefix
-prefix = $(prefix:\=/)
-$(BANG)endif
-$(BANG)ifndef EXTSTATIC
-EXTSTATIC = $(EXTSTATIC)
-$(BANG)endif
-!if defined(RDOCTARGET)
-$(BANG)ifndef RDOCTARGET
-RDOCTARGET = $(RDOCTARGET)
-$(BANG)endif
-!endif
-!if defined(EXTOUT)
-$(BANG)ifndef EXTOUT
-EXTOUT = $(EXTOUT)
-$(BANG)endif
-!endif
-|
-	@type > usebormm.bat &&|
-@echo off
-ilink32 -Gn -x usebormm.lib > nul
-if exist usebormm.tds echo MEMLIB = usebormm.lib
 |
-	@usebormm.bat >> $(MAKEFILE)
-	@del usebormm.*
-
 	@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
 \#include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
@@ -75,44 +47,28 @@ TEENY = RUBY_VERSION_TEENY
 !if defined(PROCESSOR_ARCHITECTURE) ||  defined(PROCESSOR_LEVEL)
 	@type >> $(MAKEFILE) &&|
 !if defined(PROCESSOR_ARCHITECTURE)
-$(BANG)ifndef PROCESSOR_ARCHITECTURE
 PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
-$(BANG)endif
 !endif
 !if defined(PROCESSOR_LEVEL)
-$(BANG)ifndef PROCESSOR_LEVEL
 PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
-$(BANG)endif
 !endif
 
 |
 !endif
 
 -alpha-: nul
-	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
 	@$(APPEND) PROCESSOR_ARCHITECTURE = alpha
-	@$(APPEND) !endif
 -ix86-: nul
-	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
 	@$(APPEND) PROCESSOR_ARCHITECTURE = x86
-	@$(APPEND) !endif
 
 -i386-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 3
-	@$(APPEND) !endif
 -i486-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 4
-	@$(APPEND) !endif
 -i586-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 5
-	@$(APPEND) !endif
 -i686-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 6
-	@$(APPEND) !endif
 
 -epilogue-: nul
 	@type >> $(MAKEFILE) &&|
@@ -121,13 +77,13 @@ $(BANG)endif
 \# RT = $(RT)
 \# RUBY_INSTALL_NAME = ruby
 \# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
-\# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
-\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
+\# 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
-$(BANG)include $$(srcdir)/bcc32/Makefile.sub
+$(INCLUDE) $$(srcdir)bcc32/Makefile.sub
 |
-	@$(srcdir:/=\)\win32\rm.bat config.h config.status
 	@echo type "`$(MAKE)'" to make ruby for $(OS).
diff --git a/bignum.c b/bignum.c
index cbcea24818..577f072ee3 100644
--- a/bignum.c
+++ b/bignum.c
@@ -2,8 +2,8 @@
 
   bignum.c -
 
-  $Author: shyouhei $
-  $Date: 2006/12/06 10:14:12 $
+  $Author$
+  $Date$
   created at: Fri Jun 10 00:48:55 JST 1994
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -14,9 +14,6 @@
 
 #include <math.h>
 #include <ctype.h>
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
 
 VALUE rb_cBignum;
 
@@ -36,17 +33,15 @@ VALUE rb_cBignum;
 #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))
-
 static VALUE
 bignew_1(klass, len, sign)
     VALUE klass;
     long len;
-    int sign;
+    char sign;
 {
     NEWOBJ(big, struct RBignum);
     OBJSETUP(big, klass, T_BIGNUM);
-    big->sign = sign?1:0;
+    big->sign = sign;
     big->len = len;
     big->digits = ALLOC_N(BDIGIT, len);
 
@@ -65,16 +60,15 @@ rb_big_clone(x)
     return z;
 }
 
-/* modify a bignum by 2's complement */
 static void
-get2comp(x)
+get2comp(x, carry)		/* get 2's complement */
     VALUE x;
+    int carry;
 {
     long i = RBIGNUM(x)->len;
     BDIGIT *ds = BDIGITS(x);
     BDIGIT_DBL num;
 
-    if (!i) return;
     while (i--) ds[i] = ~ds[i];
     i = 0; num = 1;
     do {
@@ -82,10 +76,11 @@ get2comp(x)
 	ds[i++] = BIGLO(num);
 	num = BIGDN(num);
     } while (i < RBIGNUM(x)->len);
-    if (num != 0) {
+    if (!carry) return;
+    if ((ds[RBIGNUM(x)->len-1] & (1<<(BITSPERDIG-1))) == 0) {
 	REALLOC_N(RBIGNUM(x)->digits, BDIGIT, ++RBIGNUM(x)->len);
 	ds = BDIGITS(x);
-	ds[RBIGNUM(x)->len-1] = RBIGNUM(x)->sign ? ~0 : 1;
+	ds[RBIGNUM(x)->len-1] = ~0;
     }
 }
 
@@ -93,21 +88,18 @@ void
 rb_big_2comp(x)			/* get 2's complement */
     VALUE x;
 {
-    get2comp(x);
+    get2comp(x, Qtrue);
 }
 
 static VALUE
 bignorm(x)
     VALUE x;
 {
-    if (FIXNUM_P(x)) {
-      return x;
-    }
-    else if (TYPE(x) == T_BIGNUM) {
+    if (!FIXNUM_P(x)) {
 	long len = RBIGNUM(x)->len;
 	BDIGIT *ds = BDIGITS(x);
 
-	while (--len && !ds[len]) ;
+	while (len-- && !ds[len]) ;
 	RBIGNUM(x)->len = ++len;
 
 	if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) {
@@ -206,15 +198,12 @@ rb_quad_pack(buf, val)
 	long len = RBIGNUM(val)->len;
 	BDIGIT *ds;
 
-	if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
-	    rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
 	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);
 }
@@ -277,9 +266,7 @@ rb_quad_pack(buf, val)
 	val = rb_int2big(FIX2LONG(val));
     }
     len = RBIGNUM(val)->len * SIZEOF_BDIGITS;
-    if (len > QUAD_SIZE) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
-    }
+    if (len > QUAD_SIZE) len = QUAD_SIZE;
     memcpy(buf, (char*)BDIGITS(val), len);
     if (!RBIGNUM(val)->sign) {
 	len = QUAD_SIZE;
@@ -324,21 +311,13 @@ rb_cstr_to_inum(str, base, badcheck)
 {
     const char *s = str;
     char *end;
-    char sign = 1, nondigit = 0;
-    int c;
+    char sign = 1, c, nondigit = 0;
     BDIGIT_DBL num;
     long len, blen = 1;
     long i;
     VALUE z;
     BDIGIT *zds;
 
-#define conv_digit(c) \
-    (!ISASCII(c) ? -1 : \
-     isdigit(c) ? ((c) - '0') : \
-     islower(c) ? ((c) - 'a' + 10) : \
-     isupper(c) ? ((c) - 'A' + 10) : \
-     -1)
-
     if (!str) {
 	if (badcheck) goto bad;
 	return INT2FIX(0);
@@ -394,22 +373,17 @@ rb_cstr_to_inum(str, base, badcheck)
 	    str += 2;
 	}
 	break;
-      case 3:
-	len = 2;
-	break;
       case 8:
+	len = 3;
 	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:
+	len = 4;
 	if (str[0] == '0' && (str[1] == 'd'||str[1] == 'D')) {
 	    str += 2;
 	}
-      case 9: case 11: case 12: case 13: case 14: case 15:
-	len = 4;
 	break;
       case 16:
 	len = 4;
@@ -417,27 +391,10 @@ rb_cstr_to_inum(str, base, badcheck)
 	    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');
-	if (!*str) --str;
-    }
-    c = *str;
-    c = conv_digit(c);
-    if (c < 0 || c >= base) {
-	if (badcheck) goto bad;
-	return INT2FIX(0);
+	--str;
     }
     len *= strlen(str)*sizeof(char);
 
@@ -448,7 +405,10 @@ rb_cstr_to_inum(str, base, badcheck)
 	if (badcheck) {
 	    if (end == str) goto bad; /* no number */
 	    while (*end && ISSPACE(*end)) end++;
-	    if (*end) goto bad;	      /* trailing garbage */
+	    if (*end) {		      /* trailing garbage */
+	      bad:
+		rb_invalid_str(s, "Integer");
+	    }
 	}
 
 	if (POSFIXABLE(val)) {
@@ -471,19 +431,43 @@ rb_cstr_to_inum(str, base, badcheck)
     z = bignew(len, sign);
     zds = BDIGITS(z);
     for (i=len;i--;) zds[i]=0;
-    while ((c = *str++) != 0) {
-	if (c == '_') {
+    while (c = *str++) {
+	switch (c) {
+	  case '8': case '9':
+	    if (base == 8) {
+		c = base;
+		break;
+	    }
+	  case '0': case '1': case '2': case '3': case '4':
+	  case '5': case '6': case '7': 
+	    c = c - '0';
+	    nondigit = 0;
+	    break;
+	  case 'a': case 'b': case 'c':
+	  case 'd': case 'e': case 'f':
+	    c -= 'a' - 'A';
+	  case 'A': case 'B': case 'C':
+	  case 'D': case 'E': case 'F':
+	    if (base != 16) {
+		nondigit = c;
+		c = base;
+	    }
+	    else {
+		c = c - 'A' + 10;
+		nondigit = 0;
+	    }
+	    break;
+	  case '_':
 	    if (badcheck) {
 		if (nondigit) goto bad;
 		nondigit = c;
 	    }
 	    continue;
-	}
-	else if ((c = conv_digit(c)) < 0) {
+	  default:
+	    c = base;
 	    break;
 	}
 	if (c >= base) break;
-	nondigit = 0;
 	i = 0;
 	num = c;
 	for (;;) {
@@ -503,10 +487,7 @@ rb_cstr_to_inum(str, base, badcheck)
 	str--;
 	if (s+1 < str && str[-1] == '_') goto bad;
 	while (*str && ISSPACE(*str)) str++;
-	if (*str) {
-	  bad:
-	    rb_invalid_str(s, "Integer");
-	}
+	if (*str) goto bad;
     }
 
     return bignorm(z);
@@ -522,12 +503,7 @@ rb_str_to_inum(str, base, badcheck)
     long len;
 
     StringValue(str);
-    if (badcheck) {
-	s = StringValueCStr(str);
-    }
-    else {
-	s = RSTRING(str)->ptr;
-    }
+    s = RSTRING(str)->ptr;
     if (s) {
 	len = RSTRING(str)->len;
 	if (s[len]) {		/* no sentinel somehow */
@@ -537,6 +513,9 @@ rb_str_to_inum(str, base, badcheck)
 	    p[len] = '\0';
 	    s = p;
 	}
+	if (badcheck && len != strlen(s)) {
+	    rb_raise(rb_eArgError, "string for Integer contains null byte");
+	}
     }
     return rb_cstr_to_inum(s, base, badcheck); 
 }
@@ -617,7 +596,7 @@ rb_str2inum(str, 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;
@@ -633,42 +612,28 @@ rb_big2str(x, base)
 	return rb_fix2str(x, base);
     }
     i = RBIGNUM(x)->len;
-    if (BIGZEROP(x)) {
+    if (i == 0 || (i == 1 && BDIGITS(x)[0] == 0)) {
 	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:
+    if (base == 10) {
+	j = (SIZEOF_BDIGITS/sizeof(char)*CHAR_BIT*i*241L)/800+2;
+	hbase = 10000;
+    }
+    else if (base == 16) {
+	j = (SIZEOF_BDIGITS/sizeof(char)*CHAR_BIT*i)/4+2;
+	hbase = 0x10000;
+    }
+    else if (base == 8) {
+	j = (SIZEOF_BDIGITS/sizeof(char)*CHAR_BIT*i)+2;
+	hbase = 010000;
+    }
+    else if (base == 2) {
+	j = (SIZEOF_BDIGITS*CHAR_BIT*i)+2;
+	hbase = 020;
+    }
+    else {
 	rb_raise(rb_eArgError, "illegal radix %d", base);
-	break;
     }
-    j += 2;
-
-    hbase = base * base;
-#if SIZEOF_BDIGITS > 2
-    hbase *= hbase;
-#endif
 
     t = rb_big_clone(x);
     ds = BDIGITS(t);
@@ -686,10 +651,10 @@ rb_big2str(x, base)
 	    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;
 	}
@@ -702,20 +667,6 @@ rb_big2str(x, base)
     return ss;
 }
 
-/*
- *  call-seq:
- *     big.to_s(base=10)   =>  string
- *  
- *  Returns a string containing the representation of <i>big</i> radix
- *  <i>base</i> (2 through 36).
- *     
- *     12345654321.to_s         #=> "12345654321"
- *     12345654321.to_s(2)      #=> "1011011111110110111011110000110001"
- *     12345654321.to_s(8)      #=> "133766736061"
- *     12345654321.to_s(16)     #=> "2dfdbbc31"
- *     78546939656932.to_s(36)  #=> "rubyrules"
- */
-
 static VALUE
 rb_big_to_s(argc, argv, x)
     int argc;
@@ -752,28 +703,12 @@ big2ulong(x, type)
 }
 
 unsigned long
-rb_big2ulong_pack(x)   
-    VALUE x;  
-{   
-    unsigned long num = big2ulong(x, "unsigned long");
-    if (!RBIGNUM(x)->sign) {
-	return -num;
-    }
-    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;
-    }
+    if (!RBIGNUM(x)->sign) return -num;
     return num;
 }
 
@@ -781,10 +716,10 @@ long
 rb_big2long(x)
     VALUE x;
 {
-    unsigned long num = big2ulong(x, "long");
+    unsigned long num = big2ulong(x, "int");
 
     if ((long)num < 0 && (RBIGNUM(x)->sign || (long)num != LONG_MIN)) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
+	rb_raise(rb_eRangeError, "bignum too big to convert into `int'");
     }
     if (!RBIGNUM(x)->sign) return -(long)num;
     return num;
@@ -889,23 +824,11 @@ rb_big2dbl(x)
     while (i--) {
 	d = ds[i] + BIGRAD*d;
     }
-    if (isinf(d)) {
-	rb_warn("Bignum out of Float range");
-	d = HUGE_VAL;
-    }
+    if (isinf(d)) d = HUGE_VAL;
     if (!RBIGNUM(x)->sign) d = -d;
     return d;
 }
 
-/*
- *  call-seq:
- *     big.to_f -> float
- *  
- *  Converts <i>big</i> to a <code>Float</code>. If <i>big</i> doesn't
- *  fit in a <code>Float</code>, the result is infinity.
- *     
- */
-
 static VALUE
 rb_big_to_f(x)
     VALUE x;
@@ -913,16 +836,6 @@ rb_big_to_f(x)
     return rb_float_new(rb_big2dbl(x));
 }
 
-/*
- *  call-seq:
- *     big <=> numeric   => -1, 0, +1
- *  
- *  Comparison---Returns -1, 0, or +1 depending on whether <i>big</i> is
- *  less than, equal to, or greater than <i>numeric</i>. This is the
- *  basis for the tests in <code>Comparable</code>.
- *     
- */
-
 static VALUE
 rb_big_cmp(x, y)
     VALUE x, y;
@@ -958,17 +871,6 @@ rb_big_cmp(x, y)
 	    (RBIGNUM(x)->sign ? INT2FIX(-1) : INT2FIX(1));
 }
 
-/*
- *  call-seq:
- *     big == obj  => true or false
- *  
- *  Returns <code>true</code> only if <i>obj</i> has the same value
- *  as <i>big</i>. Contrast this with <code>Bignum#eql?</code>, which
- *  requires <i>obj</i> to be a <code>Bignum</code>.
- *     
- *     68719476736 == 68719476736.0   #=> true
- */
-
 static VALUE
 rb_big_eq(x, y)
     VALUE x, y;
@@ -980,14 +882,10 @@ rb_big_eq(x, y)
       case T_BIGNUM:
 	break;
       case T_FLOAT:
-        {
-	    volatile double a, b;
-
-	    a = RFLOAT(y)->value;
-	    if (isnan(a)) return Qfalse;
-	    b = rb_big2dbl(x);
-	    return (a == b)?Qtrue:Qfalse;
-	}
+	if (rb_big2dbl(x) == RFLOAT(y)->value)
+	    return Qtrue;
+	else
+	    return Qfalse;
       default:
 	return rb_equal(y, x);
     }
@@ -997,17 +895,6 @@ rb_big_eq(x, y)
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     big.eql?(obj)   => true or false
- *  
- *  Returns <code>true</code> only if <i>obj</i> is a
- *  <code>Bignum</code> with the same value as <i>big</i>. Contrast this
- *  with <code>Bignum#==</code>, which performs type conversions.
- *     
- *     68719476736.eql?(68719476736.0)   #=> false
- */
-
 static VALUE
 rb_big_eql(x, y)
     VALUE x, y;
@@ -1019,13 +906,6 @@ rb_big_eql(x, y)
     return Qtrue;
 }
 
-/*
- * call-seq:
- *    -big   =>  other_big
- *
- * Unary minus (returns a new Bignum whose value is 0-big)
- */
-
 static VALUE
 rb_big_uminus(x)
     VALUE x;
@@ -1037,33 +917,18 @@ rb_big_uminus(x)
     return bignorm(z);
 }
 
-/*
- * call-seq:
- *     ~big  =>  integer
- *
- * Inverts the bits in big. As Bignums are conceptually infinite
- * length, the result acts as if it had an infinite number of one
- * bits to the left. In hex representations, this is displayed
- * as two periods to the left of the digits.
- *  
- *   sprintf("%X", ~0x1122334455)    #=> "..FEEDDCCBBAA"
- */
-
 static VALUE
 rb_big_neg(x)
     VALUE x;
 {
     VALUE z = rb_big_clone(x);
-    long i;
-    BDIGIT *ds;
+    long i = RBIGNUM(x)->len;
+    BDIGIT *ds = BDIGITS(z);
 
-    if (!RBIGNUM(x)->sign) get2comp(z);
-    ds = BDIGITS(z);
-    i = RBIGNUM(x)->len;
-    if (!i) return INT2FIX(~0);
+    if (!RBIGNUM(x)->sign) get2comp(z, Qtrue);
     while (i--) ds[i] = ~ds[i];
+    if (RBIGNUM(x)->sign) get2comp(z, Qfalse);
     RBIGNUM(z)->sign = !RBIGNUM(z)->sign;
-    if (RBIGNUM(x)->sign) get2comp(z);
 
     return bignorm(z);
 }
@@ -1094,7 +959,7 @@ bigsub(x, y)
 	}
     }
 
-    z = bignew(RBIGNUM(x)->len, z==0);
+    z = bignew(RBIGNUM(x)->len, (z == 0)?1:0);
     zds = BDIGITS(z);
 
     for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) { 
@@ -1118,7 +983,7 @@ bigsub(x, y)
 static VALUE
 bigadd(x, y, sign)
     VALUE x, y;
-    int sign;
+    char sign;
 {
     VALUE z;
     BDIGIT_DBL num;
@@ -1160,13 +1025,6 @@ bigadd(x, y, sign)
     return z;
 }
 
-/*
- *  call-seq:
- *     big + other  => Numeric
- *
- *  Adds big and other, returning the result.
- */
-
 VALUE
 rb_big_plus(x, y)
     VALUE x, y;
@@ -1186,13 +1044,6 @@ rb_big_plus(x, y)
     }
 }
 
-/*
- *  call-seq:
- *     big - other  => Numeric
- *
- *  Subtracts other from big, returning the result.
- */
-
 VALUE
 rb_big_minus(x, y)
     VALUE x, y;
@@ -1212,13 +1063,6 @@ rb_big_minus(x, y)
     }
 }
 
-/*
- *  call-seq:
- *     big * other  => Numeric
- *
- *  Multiplies big and other, returning the result.
- */
-
 VALUE
 rb_big_mul(x, y)
     VALUE x, y;
@@ -1279,8 +1123,8 @@ bigdivrem(x, y, divp, modp)
     BDIGIT_DBL_SIGNED num;
     BDIGIT dd, q;
 
-    if (BIGZEROP(y)) rb_num_zerodiv();
     yds = BDIGITS(y);
+    if (ny == 0 && yds[0] == 0) rb_num_zerodiv();
     if (nx < ny || (nx == ny && BDIGITS(x)[nx - 1] < BDIGITS(y)[ny - 1])) {
 	if (divp) *divp = rb_int2big(0);
 	if (modp) *modp = x;
@@ -1404,7 +1248,8 @@ bigdivmod(x, y, divp, modp)
     VALUE mod;
 
     bigdivrem(x, y, divp, &mod);
-    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign && !BIGZEROP(mod)) {
+    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign &&
+	!(RBIGNUM(mod)->len == 1 && BDIGITS(mod)[0] == 0)) {
 	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
 	if (modp) *modp = bigadd(mod, y, 1);
     }
@@ -1414,14 +1259,6 @@ bigdivmod(x, y, divp, modp)
     }
 }
 
-/*
- *  call-seq:
- *     big / other     => Numeric
- *     big.div(other)  => Numeric
- *
- *  Divides big by other, returning the result.
- */
-
 static VALUE
 rb_big_div(x, y)
     VALUE x, y;
@@ -1447,15 +1284,6 @@ rb_big_div(x, y)
     return bignorm(z);
 }
 
-/*
- *  call-seq:
- *     big % other         => Numeric
- *     big.modulo(other)   => Numeric
- *
- *  Returns big modulo other. See Numeric.divmod for more
- *  information.
- */
-
 static VALUE
 rb_big_modulo(x, y)
     VALUE x, y;
@@ -1478,15 +1306,6 @@ rb_big_modulo(x, y)
     return bignorm(z);
 }
 
-/*
- *  call-seq:
- *     big.remainder(numeric)    => number
- *  
- *  Returns the remainder after dividing <i>big</i> by <i>numeric</i>.
- *     
- *     -1234567890987654321.remainder(13731)      #=> -6966
- *     -1234567890987654321.remainder(13731.24)   #=> -9906.22531493148
- */
 static VALUE
 rb_big_remainder(x, y)
     VALUE x, y;
@@ -1509,27 +1328,6 @@ rb_big_remainder(x, y)
     return bignorm(z);
 }
 
-static VALUE big_lshift _((VALUE, unsigned long));
-static VALUE big_rshift _((VALUE, unsigned long));
-
-static VALUE big_shift(x, n)
-    VALUE x;
-    int n;
-{
-    if (n < 0)
-	return big_lshift(x, (unsigned int)n);
-    else if (n > 0)
-	return big_rshift(x, (unsigned int)n);
-    return x;
-}
-
-/*
- *  call-seq:
- *     big.divmod(numeric)   => array
- *  
- *  See <code>Numeric#divmod</code>.
- *     
- */
 VALUE
 rb_big_divmod(x, y)
     VALUE x, y;
@@ -1552,18 +1350,6 @@ rb_big_divmod(x, y)
     return rb_assoc_new(bignorm(div), bignorm(mod));
 }
 
-/*
- *  call-seq:
- *     big.quo(numeric) -> float
- *  
- *  Returns the floating point result of dividing <i>big</i> by
- *  <i>numeric</i>.
- *     
- *     -1234567890987654321.quo(13731)      #=> -89910996357705.5
- *     -1234567890987654321.quo(13731.24)   #=> -89909424858035.7
- *     
- */
-
 static VALUE
 rb_big_quo(x, y)
     VALUE x, y;
@@ -1590,19 +1376,6 @@ rb_big_quo(x, y)
     return rb_float_new(dx / dy);
 }
 
-/*
- *  call-seq:
- *     big ** exponent   #=> numeric
- *
- *  Raises _big_ to the _exponent_ power (which may be an integer, float,
- *  or anything that will coerce to a number). The result may be
- *  a Fixnum, Bignum, or Float
- *
- *    123456789 ** 2      #=> 15241578750190521
- *    123456789 ** 1.2    #=> 5126464716.09932
- *    123456789 ** -2     #=> 6.5610001194102e-17
- */
-
 VALUE
 rb_big_pow(x, y)
     VALUE x, y;
@@ -1622,17 +1395,10 @@ rb_big_pow(x, y)
 	break;
 
       case T_FIXNUM:
-	yy = FIX2LONG(y);
+	yy = NUM2LONG(y);
 	if (yy > 0) {
 	    VALUE z = x;
-	    const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
 
-	    if ((RBIGNUM(x)->len > BIGLEN_LIMIT) ||
-		(RBIGNUM(x)->len > BIGLEN_LIMIT / yy)) {
-		rb_warn("in a**b, b may be too big");
-		d = (double)yy;
-		break;
-	    }
 	    for (;;) {
 		yy -= 1;
 		if (yy == 0) break;
@@ -1653,34 +1419,29 @@ rb_big_pow(x, y)
     return rb_float_new(pow(rb_big2dbl(x), d));
 }
 
-/*
- * call-seq:
- *     big & numeric   =>  integer
- *
- * Performs bitwise +and+ between _big_ and _numeric_.
- */
-
 VALUE
-rb_big_and(xx, yy)
-    VALUE xx, yy;
+rb_big_and(x, y)
+    VALUE x, y;
 {
-    volatile VALUE x, y, z;
+    VALUE z;
     BDIGIT *ds1, *ds2, *zds;
     long i, l1, l2;
     char sign;
 
-    x = xx;
-    y = rb_to_int(yy);
     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);
+	get2comp(y, Qtrue);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x);
+	get2comp(x, Qtrue);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1705,38 +1466,33 @@ rb_big_and(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?0:ds2[i];
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
     return bignorm(z);
 }
 
-/*
- * call-seq:
- *     big | numeric   =>  integer
- *
- * Performs bitwise +or+ between _big_ and _numeric_.
- */
-
 VALUE
-rb_big_or(xx, yy)
-    VALUE xx, yy;
+rb_big_or(x, y)
+    VALUE x, y;
 {
-    volatile VALUE x, y, z;
+    VALUE z;
     BDIGIT *ds1, *ds2, *zds;
     long i, l1, l2;
     char sign;
 
-    x = xx;
-    y = rb_to_int(yy);
     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);
+	get2comp(y, Qtrue);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x);
+	get2comp(x, Qtrue);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1761,40 +1517,34 @@ rb_big_or(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:(BIGRAD-1);
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
 
     return bignorm(z);
 }
 
-/*
- * call-seq:
- *     big ^ numeric   =>  integer
- *
- * Performs bitwise +exclusive or+ between _big_ and _numeric_.
- */
-
 VALUE
-rb_big_xor(xx, yy)
-    VALUE xx, yy;
+rb_big_xor(x, y)
+    VALUE x, y;
 {
-    volatile VALUE x, y;
     VALUE z;
     BDIGIT *ds1, *ds2, *zds;
     long i, l1, l2;
     char sign;
 
-    x = xx;
-    y = rb_to_int(yy);
     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);
+	get2comp(y, Qtrue);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x);
+	get2comp(x, Qtrue);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1821,72 +1571,26 @@ rb_big_xor(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:~ds2[i];
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
 
     return bignorm(z);
 }
 
-static VALUE
-check_shiftdown(VALUE y, VALUE x)
-{
-    if (!RBIGNUM(x)->len) return INT2FIX(0);
-    if (RBIGNUM(y)->len > SIZEOF_LONG / SIZEOF_BDIGITS) {
-	return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(-1);
-    }
-    return Qnil;
-}
-
-/*
- * call-seq:
- *     big << numeric   =>  integer
- *
- * Shifts big left _numeric_ positions (right if _numeric_ is negative).
- */
+static VALUE rb_big_rshift _((VALUE,VALUE));
 
 VALUE
 rb_big_lshift(x, y)
     VALUE x, y;
 {
-    long shift;
-    int neg = 0;
-
-    for (;;) {
-	if (FIXNUM_P(y)) {
-	    shift = FIX2LONG(y);
-	    if (shift < 0) {
-		neg = 1;
-		shift = -shift;
-	    }
-	    break;
-	}
-	else if (TYPE(y) == T_BIGNUM) {
-	    if (!RBIGNUM(y)->sign) {
-		VALUE t = check_shiftdown(y, x);
-		if (!NIL_P(t)) return t;
-		neg = 1;
-	    }
-	    shift = big2ulong(y, "long", Qtrue);
-	    break;
-	}
-	y = rb_to_int(y);
-    }
-
-    if (neg) return big_rshift(x, shift);
-    return big_lshift(x, shift);
-}
-
-static VALUE
-big_lshift(x, shift)
-    VALUE x;
-    unsigned long shift;
-{
     BDIGIT *xds, *zds;
-    long s1 = shift/BITSPERDIG;
+    int shift = NUM2INT(y);
+    int s1 = shift/BITSPERDIG;
     int s2 = shift%BITSPERDIG;
     VALUE z;
     BDIGIT_DBL num = 0;
     long len, i;
 
+    if (shift < 0) return rb_big_rshift(x, INT2FIX(-shift));
     len = RBIGNUM(x)->len;
     z = bignew(len+s1+1, RBIGNUM(x)->sign);
     zds = BDIGITS(z);
@@ -1903,59 +1607,19 @@ big_lshift(x, shift)
     return bignorm(z);
 }
 
-/*
- * call-seq:
- *     big >> numeric   =>  integer
- *
- * Shifts big right _numeric_ positions (left if _numeric_ is negative).
- */
-
-VALUE
+static VALUE
 rb_big_rshift(x, y)
     VALUE x, y;
 {
-    long shift;
-    int neg = 0;
-
-    for (;;) {
-	if (FIXNUM_P(y)) {
-	    shift = FIX2LONG(y);
-	    if (shift < 0) {
-		neg = 1;
-		shift = -shift;
-	    }
-	    break;
-	}
-	else if (TYPE(y) == T_BIGNUM) {
-	    if (RBIGNUM(y)->sign) {
-		VALUE t = check_shiftdown(y, x);
-		if (!NIL_P(t)) return t;
-	    }
-	    else {
-		neg = 1;
-	    }
-	    shift = big2ulong(y, "long", Qtrue);
-	    break;
-	}
-	y = rb_to_int(y);
-    }
-
-    if (neg) return big_lshift(x, shift);
-    return big_rshift(x, shift);
-}
-
-static VALUE
-big_rshift(x, shift)
-    VALUE x;
-    unsigned long shift;
-{
     BDIGIT *xds, *zds;
+    int shift = NUM2INT(y);
     long s1 = shift/BITSPERDIG;
-    int s2 = shift%BITSPERDIG;
+    long s2 = shift%BITSPERDIG;
     VALUE z;
     BDIGIT_DBL num = 0;
     long i, j;
-    volatile VALUE save_x;
+
+    if (shift < 0) return rb_big_lshift(x, INT2FIX(-shift));
 
     if (s1 > RBIGNUM(x)->len) {
 	if (RBIGNUM(x)->sign)
@@ -1964,8 +1628,8 @@ big_rshift(x, shift)
 	    return INT2FIX(-1);
     }
     if (!RBIGNUM(x)->sign) {
-	save_x = x = rb_big_clone(x);
-	get2comp(x);
+	x = rb_big_clone(x);
+	get2comp(x, Qtrue);
     }
     xds = BDIGITS(x);
     i = RBIGNUM(x)->len; j = i - s1;
@@ -1980,30 +1644,11 @@ big_rshift(x, shift)
 	num = BIGUP(xds[i]);
     }
     if (!RBIGNUM(x)->sign) {
-	get2comp(z);
+	get2comp(z, Qfalse);
     }
     return bignorm(z);
 }
 
-/*
- *  call-seq:
- *     big[n] -> 0, 1
- *  
- *  Bit Reference---Returns the <em>n</em>th bit in the (assumed) binary
- *  representation of <i>big</i>, where <i>big</i>[0] is the least
- *  significant bit.
- *     
- *     a = 9**15
- *     50.downto(0) do |n|
- *       print a[n]
- *     end
- *     
- *  <em>produces:</em>
- *     
- *     000101110110100000111000011110010100111100010111001
- *     
- */
-
 static VALUE
 rb_big_aref(x, y)
     VALUE x, y;
@@ -2025,7 +1670,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);
+	get2comp(x, Qtrue);
     }
     else {
 	if (s1 >= RBIGNUM(x)->len) return INT2FIX(0);
@@ -2036,13 +1681,6 @@ rb_big_aref(x, y)
     return INT2FIX(0);
 }
 
-/*
- * call-seq:
- *   big.hash   => fixnum
- *
- * Compute a hash based on the value of _big_.
- */
-
 static VALUE
 rb_big_hash(x)
     VALUE x;
@@ -2057,10 +1695,6 @@ rb_big_hash(x)
     return LONG2FIX(key);
 }
 
-/*
- * MISSING: documentation
- */
-
 static VALUE
 rb_big_coerce(x, y)
     VALUE x, y;
@@ -2068,26 +1702,14 @@ rb_big_coerce(x, y)
     if (FIXNUM_P(y)) {
 	return rb_assoc_new(rb_int2big(FIX2LONG(y)), x);
     }
-    else if (TYPE(y) == T_BIGNUM) {
-       return rb_assoc_new(y, x);
-    }
     else {
-	rb_raise(rb_eTypeError, "can't coerce %s to Bignum",
+	rb_raise(rb_eTypeError, "Can't coerce %s to Bignum",
 		 rb_obj_classname(y));
     }
     /* not reached */
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     big.abs -> aBignum
- *  
- *  Returns the absolute value of <i>big</i>.
- *     
- *     -1234567890987654321.abs   #=> 1234567890987654321
- */
-
 static VALUE
 rb_big_abs(x)
     VALUE x;
@@ -2106,32 +1728,18 @@ rb_big_rand(max, rand_buf)
 {
     VALUE v;
     long len = RBIGNUM(max)->len;
-
-    if (BIGZEROP(max)) {
+    
+    if (len == 0 && BDIGITS(max)[0] == 0) {
 	return rb_float_new(rand_buf[0]);
     }
     v = bignew(len,1);
-    len--;
-    BDIGITS(v)[len] = BDIGITS(max)[len] * rand_buf[len];    
     while (len--) {
 	BDIGITS(v)[len] = ((BDIGIT)~0) * rand_buf[len];
     }
 
-    return v;
+    return rb_big_modulo((VALUE)v, max);
 }
 
-/*
- *  call-seq:
- *     big.size -> integer
- *  
- *  Returns the number of bytes in the machine representation of
- *  <i>big</i>.
- *     
- *     (256**10 - 1).size   #=> 12
- *     (256**20 - 1).size   #=> 20
- *     (256**40 - 1).size   #=> 40
- */
-
 static VALUE
 rb_big_size(big)
     VALUE big;
@@ -2139,24 +1747,6 @@ rb_big_size(big)
     return LONG2FIX(RBIGNUM(big)->len*SIZEOF_BDIGITS);
 }
 
-/*
- *  Bignum objects hold integers outside the range of
- *  Fixnum. Bignum objects are created
- *  automatically when integer calculations would otherwise overflow a
- *  Fixnum. When a calculation involving
- *  Bignum objects returns a result that will fit in a
- *  Fixnum, the result is automatically converted.
- *     
- *  For the purposes of the bitwise operations and <code>[]</code>, a
- *  Bignum is treated as if it were an infinite-length
- *  bitstring with 2's complement representation.
- *     
- *  While Fixnum values are immediate, Bignum
- *  objects are not---assignment and parameter passing work with
- *  references to objects, not the objects themselves.
- *     
- */
-
 void
 Init_Bignum()
 {
diff --git a/bin/erb b/bin/erb
index a6fcd5370c..bfc86f56c8 100755
--- a/bin/erb
+++ b/bin/erb
@@ -12,13 +12,13 @@ class ERB
       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}"
+	return arg if $1 == '-'
+	raise 'unknown switch "-"' if $2.index('-')
+	self.unshift "-#{$2}" if $2.size > 0
+	"-#{$1}"
       else
-        self.unshift arg
-        nil
+	self.unshift arg
+	nil
       end
     end
     
@@ -30,13 +30,11 @@ class ERB
       return trim_mode if disable_percent
       case trim_mode
       when 0
-        return '%'
+	return '%'
       when 1
-        return '%>'
+	return '%>'
       when 2
-        return '%<>'
-      when '-'
-        return '%-'
+	return '%<>'
       end
     end
     module_function :trim_mode_opt
@@ -45,91 +43,85 @@ class 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'                        # security 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
+	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
+	    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 $DEBUG to true
+  -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               ignore lines which start with "%"
+  -T [trim_mode]   specify trim_mode (0..2)
+  -P               disregard the lin which starts in "%" 
 EOU
-        exit 1
+	exit 1
       end
 
       src = $<.read
-      filename = $FILENAME
       exit 2 unless src
       trim = trim_mode_opt(trim_mode, disable_percent)
       erb = factory.new(src.untaint, safe_level, trim)
-      erb.filename = filename
       if output
-        if number
-          l = 1
-          for line in erb.src
-            puts "%3d %s"%[l, line]
-            l += 1
-          end
-        else
-          puts erb.src
-        end
+	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)
+	erb.run(TOPLEVEL_BINDING.taint)
       end
     end
     module_function :run
diff --git a/bin/irb b/bin/irb
index 13474a932b..309da52161 100644
--- a/bin/irb
+++ b/bin/irb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 #   irb.rb - intaractive ruby
-#   	$Release Version: 0.9.5 $
-#   	$Revision: 1.2.2.1 $
-#   	$Date: 2005/04/19 19:24:56 $
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	$Release Version: 0.7.3 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 
 require "irb"
diff --git a/bin/rdoc b/bin/rdoc
deleted file mode 100644
index d08ce838f6..0000000000
--- a/bin/rdoc
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  RDoc: Documentation tool for source code
-#        (see lib/rdoc/rdoc.rb for more information)
-#
-#  Copyright (c) 2003 Dave Thomas
-#  Released under the same terms as Ruby
-#
-#  $Revision: 1.1 $
-
-## Transitional Hack ####
-#
-#  RDoc was initially distributed independently, and installed
-#  itself into <prefix>/lib/ruby/site_ruby/<ver>/rdoc...
-#
-#  Now that RDoc is part of the distribution, it's installed into
-#  <prefix>/lib/ruby/<ver>, which unfortunately appears later in the
-#  search path. This means that if you have previously installed RDoc,
-#  and then install from ruby-lang, you'll pick up the old one by
-#  default. This hack checks for the condition, and readjusts the
-#  search path if necessary.
-
-def adjust_for_existing_rdoc(path)
-  
-  $stderr.puts %{
-  It seems as if you have a previously-installed RDoc in
-  the directory #{path}.
-
-  Because this is now out-of-date, you might want to consider
-  removing the directories:
-
-    #{File.join(path, "rdoc")}
-
-  and
-
-    #{File.join(path, "markup")}
-
-  }
-
-  # Move all the site_ruby directories to the end
-  p $:
-  $:.replace($:.partition {|path| /site_ruby/ !~ path}.flatten)
-  p $:
-end
-
-$:.each do |path|
-  if /site_ruby/ =~ path 
-    rdoc_path = File.join(path, 'rdoc', 'rdoc.rb')
-    if File.exists?(rdoc_path)
-      adjust_for_existing_rdoc(path)
-      break
-    end
-  end
-end
-
-## End of Transitional Hack ##
-
-
-require 'rdoc/rdoc'
-
-begin
-  r = RDoc::RDoc.new
-  r.document(ARGV)
-rescue RDoc::RDocError => e
-  $stderr.puts e.message
-  exit(1)
-end
diff --git a/bin/ri b/bin/ri
deleted file mode 100755
index fb3e00eda3..0000000000
--- a/bin/ri
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env ruby
-# usage:
-#
-#   ri  name...
-#
-# where name can be 
-#
-#   Class | Class::method | Class#method | Class.method | method
-#
-# All names may be abbreviated to their minimum unbiguous form. If a name
-# _is_ ambiguous, all valid options will be listed.
-#
-# The form '.' method matches either class or instance methods, while 
-# #method matches only instance and ::method matches only class methods.
-#
-#
-# == Installing Documentation
-#
-# 'ri' uses a database of documentation built by the RDoc utility.
-# 
-# So, how do you install this documentation on your system?
-# It depends on how you installed Ruby.
-#
-# <em>If you installed Ruby from source files</em> (that is, if it some point
-# you typed 'make' during the process :), you can install the RDoc
-# documentation yourself. Just go back to the place where you have 
-# your Ruby source and type
-#
-#    make install-doc
-#
-# You'll probably need to do this as a superuser, as the documentation
-# is installed in the Ruby target tree (normally somewhere under 
-# <tt>/usr/local</tt>.
-#
-# <em>If you installed Ruby from a binary distribution</em> (perhaps
-# using a one-click installer, or using some other packaging system),
-# then the team that produced the package probably forgot to package
-# the documentation as well. Contact them, and see if they can add
-# it to the next release.
-#
-
-
-require 'rdoc/ri/ri_driver'
-
-######################################################################
-
-ri = RiDriver.new
-ri.process_args
-
diff --git a/bin/testrb b/bin/testrb
deleted file mode 100755
index ff49cb5466..0000000000
--- a/bin/testrb
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-require 'test/unit'
-(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
-  abort r.options.banner + " tests..."
-exit r.run
diff --git a/class.c b/class.c
index 9e41b1e260..f2122a32e2 100644
--- a/class.c
+++ b/class.c
@@ -2,8 +2,8 @@
 
   class.c -
 
-  $Author: nobu $
-  $Date: 2005/09/28 14:42:46 $
+  $Author$
+  $Date$
   created at: Tue Aug 10 15:05:44 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -58,46 +58,40 @@ clone_method(mid, body, tbl)
     return ST_CONTINUE;
 }
 
-/* :nodoc: */
 VALUE
-rb_mod_init_copy(clone, orig)
-    VALUE clone, orig;
+rb_mod_clone(module)
+    VALUE module;
 {
-    rb_obj_init_copy(clone, orig);
-    if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
-	RBASIC(clone)->klass = rb_singleton_class_clone(orig);
-    }
-    RCLASS(clone)->super = RCLASS(orig)->super;
-    if (RCLASS(orig)->iv_tbl) {
+    NEWOBJ(clone, struct RClass);
+    CLONESETUP(clone, module);
+
+    RCLASS(clone)->super = RCLASS(module)->super;
+    if (RCLASS(module)->iv_tbl) {
 	ID id;
 
-	RCLASS(clone)->iv_tbl = st_copy(RCLASS(orig)->iv_tbl);
+	RCLASS(clone)->iv_tbl = st_copy(RCLASS(module)->iv_tbl);
 	id = rb_intern("__classpath__");
-	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
+	st_delete(RCLASS(clone)->iv_tbl, &id, 0);
 	id = rb_intern("__classid__");
-	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
+	st_delete(RCLASS(clone)->iv_tbl, &id, 0);
     }
-    if (RCLASS(orig)->m_tbl) {
+    if (RCLASS(module)->m_tbl) {
 	RCLASS(clone)->m_tbl = st_init_numtable();
-	st_foreach(RCLASS(orig)->m_tbl, clone_method,
+	st_foreach(RCLASS(module)->m_tbl, clone_method,
 	  (st_data_t)RCLASS(clone)->m_tbl);
     }
 
-    return clone;
+    return (VALUE)clone;
 }
 
-/* :nodoc: */
 VALUE
-rb_class_init_copy(clone, orig)
-    VALUE clone, orig;
+rb_mod_dup(mod)
+    VALUE mod;
 {
-    if (RCLASS(clone)->super != 0) {
-	rb_raise(rb_eTypeError, "already initialized class");
-    }
-    if (FL_TEST(orig, FL_SINGLETON)) {
-	rb_raise(rb_eTypeError, "can't copy singleton class");
-    }
-    return rb_mod_init_copy(clone, orig);
+    VALUE dup = rb_mod_clone(mod);
+
+    RBASIC(dup)->flags = RBASIC(mod)->flags & (T_MASK|FL_TAINT|FL_SINGLETON);
+    return dup;
 }
 
 VALUE
@@ -180,24 +174,12 @@ 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);
 
     return klass;
 }
 
-void
-rb_check_inheritable(super)
-    VALUE super;
-{
-    if (TYPE(super) != T_CLASS) {
-	rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
-		 rb_obj_classname(super));
-    }
-    if (RBASIC(super)->flags & FL_SINGLETON) {
-	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
-    }
-}
-
 VALUE
 rb_class_inherited(super, klass)
     VALUE super, klass;
@@ -215,6 +197,9 @@ rb_define_class(name, super)
     ID id;
 
     id = rb_intern(name);
+    if (rb_autoload_defined(id)) {
+	rb_autoload_load(id);
+    }
     if (rb_const_defined(rb_cObject, id)) {
 	klass = rb_const_get(rb_cObject, id);
 	if (TYPE(klass) != T_CLASS) {
@@ -230,8 +215,6 @@ rb_define_class(name, super)
     }
     klass = rb_define_class_id(id, super);
     st_add_direct(rb_class_tbl, id, klass);
-    rb_name_class(klass, id);
-    rb_const_set(rb_cObject, id, klass);
     rb_class_inherited(super, klass);
 
     return klass;
@@ -248,7 +231,7 @@ rb_define_class_under(outer, name, super)
 
     id = rb_intern(name);
     if (rb_const_defined_at(outer, id)) {
-	klass = rb_const_get_at(outer, id);
+	klass = rb_const_get(outer, id);
 	if (TYPE(klass) != T_CLASS) {
 	    rb_raise(rb_eTypeError, "%s is not a class", name);
 	}
@@ -303,6 +286,9 @@ rb_define_module(name)
     ID id;
 
     id = rb_intern(name);
+    if (rb_autoload_defined(id)) {
+	rb_autoload_load(id);
+    }
     if (rb_const_defined(rb_cObject, id)) {
 	module = rb_const_get(rb_cObject, id);
 	if (TYPE(module) == T_MODULE)
@@ -311,7 +297,6 @@ rb_define_module(name)
     }
     module = rb_define_module_id(id);
     st_add_direct(rb_class_tbl, id, module);
-    rb_const_set(rb_cObject, id, module);
 
     return module;
 }
@@ -326,7 +311,7 @@ rb_define_module_under(outer, name)
 
     id = rb_intern(name);
     if (rb_const_defined_at(outer, id)) {
-	module = rb_const_get_at(outer, id);
+	module = rb_const_get(outer, id);
 	if (TYPE(module) == T_MODULE)
 	    return module;
 	rb_raise(rb_eTypeError, "%s::%s is not a module",
@@ -417,23 +402,6 @@ rb_include_module(klass, module)
     if (changed) rb_clear_cache();
 }
 
-/*
- *  call-seq:
- *     mod.included_modules -> array
- *  
- *  Returns the list of modules included in <i>mod</i>.
- *     
- *     module Mixin
- *     end
- *     
- *     module Outer
- *       include Mixin
- *     end
- *     
- *     Mixin.included_modules   #=> []
- *     Outer.included_modules   #=> [Mixin]
- */
-
 VALUE
 rb_mod_included_modules(mod)
     VALUE mod;
@@ -449,25 +417,6 @@ rb_mod_included_modules(mod)
     return ary;
 }
 
-/*
- *  call-seq:
- *     mod.include?(module)    => true or false
- *  
- *  Returns <code>true</code> if <i>module</i> is included in
- *  <i>mod</i> or one of <i>mod</i>'s ancestors.
- *     
- *     module A
- *     end
- *     class B
- *       include A
- *     end
- *     class C < B
- *     end
- *     B.include?(A)   #=> true
- *     C.include?(A)   #=> true
- *     A.include?(A)   #=> false
- */
-
 VALUE
 rb_mod_include_p(mod, mod2)
     VALUE mod;
@@ -484,27 +433,12 @@ rb_mod_include_p(mod, mod2)
     return Qfalse;
 }
 
-/*
- *  call-seq:
- *     mod.ancestors -> array
- *  
- *  Returns a list of modules included in <i>mod</i> (including
- *  <i>mod</i> itself).
- *     
- *     module Mod
- *       include Math
- *       include Comparable
- *     end
- *     
- *     Mod.ancestors    #=> [Mod, Comparable, Math]
- *     Math.ancestors   #=> [Math]
- */
-
 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))
@@ -519,164 +453,146 @@ rb_mod_ancestors(mod)
     return ary;
 }
 
-#define VISI(x) ((x)&NOEX_MASK)
-#define VISI_CHECK(x,f) (VISI(x) == (f))
+#define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (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 (key == ID_ALLOCATOR) return ST_CONTINUE;
+    if (!body->nd_body) {
+	rb_ary_push(ary, Qnil);
+	rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+    }
+    else if (!VISI_CHECK(body->nd_noex, NOEX_PRIVATE)) {
+	VALUE name = rb_str_new2(rb_id2name(key));
+
+	if (!rb_ary_includes(ary, name)) {
+	    rb_ary_push(ary, name);
+	}
     }
-    if (visi) {
-	rb_ary_push(ary, rb_str_new2(rb_id2name(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
-ins_methods_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, -1); /* everything but private */
-}
+    if (key == ID_ALLOCATOR) return ST_CONTINUE;
+    if (!body->nd_body) {
+	rb_ary_push(ary, Qnil);
+	rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+    }
+    else if (VISI_CHECK(body->nd_noex, NOEX_PROTECTED)) {
+	VALUE name = rb_str_new2(rb_id2name(key));
 
-static int
-ins_methods_prot_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
-{
-    return ins_methods_push(name, type, ary, NOEX_PROTECTED);
+	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
-ins_methods_priv_i(name, type, ary)
-    ID name;
-    long type;
+ins_methods_priv_i(key, body, ary)
+    ID key;
+    NODE *body;
     VALUE ary;
 {
-    return ins_methods_push(name, type, ary, NOEX_PRIVATE);
-}
+    if (key == ID_ALLOCATOR) return ST_CONTINUE;
+    if (!body->nd_body) {
+	rb_ary_push(ary, Qnil);
+	rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+    }
+    else if (VISI_CHECK(body->nd_noex, NOEX_PRIVATE)) {
+	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_pub_i(key, body, ary)
     ID key;
     NODE *body;
-    st_table *list;
+    VALUE ary;
 {
-    long type;
-
     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 (!body->nd_body) {
+	rb_ary_push(ary, Qnil);
+	rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+    }
+    else if (VISI_CHECK(body->nd_noex, NOEX_PUBLIC)) {
+	VALUE name = rb_str_new2(rb_id2name(key));
+
+	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) {
-	recur = Qtrue;
-    }
-    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;
-    }
     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;
 }
 
-/*
- *  call-seq:
- *     mod.instance_methods(include_super=true)   => array
- *  
- *  Returns an array containing the names of public instance methods in
- *  the receiver. For a module, these are the public methods; for a
- *  class, they are the instance (not singleton) methods. With no
- *  argument, or with an argument that is <code>false</code>, the
- *  instance methods in <i>mod</i> are returned, otherwise the methods
- *  in <i>mod</i> and <i>mod</i>'s superclasses are returned.
- *     
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       def method2()  end
- *     end
- *     class C < B
- *       def method3()  end
- *     end
- *     
- *     A.instance_methods                #=> ["method1"]
- *     B.instance_methods(false)         #=> ["method2"]
- *     C.instance_methods(false)         #=> ["method3"]
- *     C.instance_methods(true).length   #=> 43
- */
-
 VALUE
 rb_class_instance_methods(argc, argv, mod)
     int argc;
     VALUE *argv;
     VALUE mod;
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_i);
-}
+    VALUE option;
 
-/*
- *  call-seq:
- *     mod.protected_instance_methods(include_super=true)   => array
- *  
- *  Returns a list of the protected instance methods defined in
- *  <i>mod</i>. If the optional parameter is not <code>false</code>, the
- *  methods of any ancestors are included.
- */
+    rb_scan_args(argc, argv, "01", &option);
+    return method_list(mod, RTEST(option), ins_methods_i);
+}
 
 VALUE
 rb_class_protected_instance_methods(argc, argv, mod)
@@ -684,25 +600,11 @@ 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;
 
-/*
- *  call-seq:
- *     mod.private_instance_methods(include_super=true)    => array
- *  
- *  Returns a list of the private instance methods defined in
- *  <i>mod</i>. If the optional parameter is not <code>false</code>, the
- *  methods of any ancestors are included.
- *     
- *     module Mod
- *       def method1()  end
- *       private :method1
- *       def method2()  end
- *     end
- *     Mod.instance_methods           #=> ["method2"]
- *     Mod.private_instance_methods   #=> ["method1"]
- */
+    rb_scan_args(argc, argv, "01", &option);
+    return method_list(mod, RTEST(option), ins_methods_prot_i);
+}
 
 VALUE
 rb_class_private_instance_methods(argc, argv, mod)
@@ -710,17 +612,11 @@ 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;
 
-/*
- *  call-seq:
- *     mod.public_instance_methods(include_super=true)   => array
- *  
- *  Returns a list of the public instance methods defined in <i>mod</i>.
- *  If the optional parameter is not <code>false</code>, the methods of
- *  any ancestors are included.
- */
+    rb_scan_args(argc, argv, "01", &option);
+    return method_list(mod, RTEST(option), ins_methods_priv_i);
+}
 
 VALUE
 rb_class_public_instance_methods(argc, argv, mod)
@@ -728,40 +624,11 @@ rb_class_public_instance_methods(argc, argv, mod)
     VALUE *argv;
     VALUE mod;
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_pub_i);
-}
+    VALUE option;
 
-/*
- *  call-seq:
- *     obj.singleton_methods(all=true)    => array
- *  
- *  Returns an array of the names of singleton methods for <i>obj</i>.
- *  If the optional <i>all</i> parameter is true, the list will include
- *  methods in modules included in <i>obj</i>.
- *     
- *     module Other
- *       def three() end
- *     end
- *     
- *     class Single
- *       def Single.four() end
- *     end
- *     
- *     a = Single.new
- *     
- *     def a.one()
- *     end
- *     
- *     class << a
- *       include Other
- *       def two()
- *       end
- *     end
- *     
- *     Single.singleton_methods    #=> ["four"]
- *     a.singleton_methods(false)  #=> ["two", "one"]
- *     a.singleton_methods         #=> ["two", "one", "three"]
- */
+    rb_scan_args(argc, argv, "01", &option);
+    return method_list(mod, RTEST(option), ins_methods_pub_i);
+}
 
 VALUE
 rb_obj_singleton_methods(argc, argv, obj)
@@ -769,28 +636,33 @@ rb_obj_singleton_methods(argc, argv, obj)
     VALUE *argv;
     VALUE obj;
 {
-    VALUE recur, ary, klass;
-    st_table *list;
+    VALUE all;
+    VALUE ary;
+    VALUE klass;
+    VALUE *p, *q, *pend;
 
-    rb_scan_args(argc, argv, "01", &recur);
-    if (argc == 0) {
-	recur = Qtrue;
-    }
+    rb_scan_args(argc, argv, "01", &all);
+    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);
+    if (RTEST(all)) {
+	while (klass && TYPE(klass) == T_ICLASS) {
+	    st_foreach(RCLASS(klass)->m_tbl, ins_methods_i, ary);
 	    klass = RCLASS(klass)->super;
 	}
     }
-    ary = rb_ary_new();
-    st_foreach(list, ins_methods_i, ary);
-    st_free_table(list);
+    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;
 }
@@ -802,7 +674,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
@@ -816,6 +688,9 @@ rb_define_method(klass, name, func, argc)
     int ex = NOEX_PUBLIC;
 
 
+    if (BUILTIN_TYPE(klass) == T_CLASS) {
+	ex |= NOEX_CFUNC;
+    }
     rb_add_method(klass, id, NEW_CFUNC(func, argc), ex);
 }
 
@@ -826,7 +701,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
@@ -836,7 +712,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
@@ -1008,7 +885,7 @@ rb_scan_args(argc, argv, fmt, va_alist)
     if (*p == '&') {
 	var = va_arg(vargs, VALUE*);
 	if (rb_block_given_p()) {
-	    *var = rb_block_proc();
+	    *var = rb_f_lambda();
 	}
 	else {
 	    *var = Qnil;
@@ -1022,7 +899,7 @@ rb_scan_args(argc, argv, fmt, va_alist)
     }
 
     if (argc > i) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, i);
+	rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)", argc, i);
     }
 
     return argc;
diff --git a/common.mk b/common.mk
deleted file mode 100644
index 3584b83e35..0000000000
--- a/common.mk
+++ /dev/null
@@ -1,305 +0,0 @@
-bin: $(PROGRAM) $(WPROGRAM)
-lib: $(LIBRUBY);
-dll: $(LIBRUBY_SO);
-
-RUBYOPT       =
-
-STATIC_RUBY   = static-ruby
-
-EXTCONF       = extconf.rb
-RBCONFIG      = ./.rbconfig.time
-
-DMYEXT	      = dmyext.$(OBJEXT)
-MAINOBJ	      = main.$(OBJEXT)
-EXTOBJS	      = 
-DLDOBJS	      = $(DMYEXT)
-
-OBJS	      = array.$(OBJEXT) \
-		bignum.$(OBJEXT) \
-		class.$(OBJEXT) \
-		compar.$(OBJEXT) \
-		dir.$(OBJEXT) \
-		dln.$(OBJEXT) \
-		enum.$(OBJEXT) \
-		error.$(OBJEXT) \
-		eval.$(OBJEXT) \
-		file.$(OBJEXT) \
-		gc.$(OBJEXT) \
-		hash.$(OBJEXT) \
-		inits.$(OBJEXT) \
-		io.$(OBJEXT) \
-		marshal.$(OBJEXT) \
-		math.$(OBJEXT) \
-		numeric.$(OBJEXT) \
-		object.$(OBJEXT) \
-		pack.$(OBJEXT) \
-		parse.$(OBJEXT) \
-		process.$(OBJEXT) \
-		prec.$(OBJEXT) \
-		random.$(OBJEXT) \
-		range.$(OBJEXT) \
-		re.$(OBJEXT) \
-		regex.$(OBJEXT) \
-		ruby.$(OBJEXT) \
-		signal.$(OBJEXT) \
-		sprintf.$(OBJEXT) \
-		st.$(OBJEXT) \
-		string.$(OBJEXT) \
-		struct.$(OBJEXT) \
-		time.$(OBJEXT) \
-		util.$(OBJEXT) \
-		variable.$(OBJEXT) \
-		version.$(OBJEXT) \
-		$(MISSING)
-
-SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
-		--make="$(MAKE)" \
-		--mflags="$(MFLAGS)" \
-		--make-flags="$(MAKEFLAGS)"
-EXTMK_ARGS    =	$(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
-
-all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
-	@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
-prog: $(PROGRAM) $(WPROGRAM)
-
-miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT)
-
-$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
-
-$(LIBRUBY_A):	$(OBJS) $(DMYEXT) $(ARCHFILE)
-
-$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP)
-
-$(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
-	@$(RM) $@
-	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
-
-ruby.imp: $(OBJS)
-	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
-
-install: install-nodoc $(RDOCTARGET)
-install-all: install-nodoc install-doc
-
-install-nodoc: install-local install-ext
-install-local: pre-install-local do-install-local post-install-local
-install-ext: pre-install-ext do-install-ext post-install-ext
-
-do-install-local: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --mantype="$(MANTYPE)"
-do-install-ext: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) install
-
-install-bin: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --install=bin
-install-lib: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --install=lib
-install-man: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --install=man --mantype="$(MANTYPE)"
-
-what-where-all no-install-all: no-install no-install-doc
-what-where no-install: no-install-local no-install-ext
-what-where-local: no-install-local
-no-install-local: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(SCRIPT_ARGS) --mantype="$(MANTYPE)"
-what-where-ext: no-install-ext
-no-install-ext: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/ext/extmk.rb -n $(EXTMK_ARGS) install
-
-install-doc: pre-install-doc do-install-doc post-install-doc
-do-install-doc: $(PROGRAM)
-	@echo Generating RDoc documentation
-	$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RIDATADIR)" "$(srcdir)"
-
-pre-install: pre-install-local pre-install-ext
-pre-install-local:: PHONY
-	$(PREINSTALL)
-pre-install-ext:: PHONY
-pre-install-doc:: PHONY
-
-post-install: post-install-local post-install-ext
-post-install-local:: PHONY
-post-install-ext:: PHONY
-post-install-doc:: PHONY
-
-clean: clean-ext clean-local
-clean-local::
-	@$(RM) $(OBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
-	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE)
-clean-ext:
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) clean
-
-distclean: distclean-ext distclean-local
-distclean-local:: clean-local
-	@$(RM) $(MKFILES) config.h rbconfig.rb
-	@$(RM) config.cache config.log config.status
-	@$(RM) *~ *.bak *.stackdump core *.core gmon.out y.tab.c y.output $(PREP)
-distclean-ext:
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) distclean
-
-realclean:: distclean
-	@$(RM) parse.c lex.c
-
-check: test test-all
-
-test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
-	@$(MINIRUBY) $(srcdir)/rubytest.rb
-
-test-all:
-	$(RUNRUBY) -C "$(srcdir)/test" runner.rb --runner=$(TESTUI) $(TESTS)
-
-extconf:
-	$(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)"
-	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
-
-$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
-	@$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
-		-install_name=$(RUBY_INSTALL_NAME) \
-		-so_name=$(RUBY_SO_NAME) rbconfig.rb
-
-.PRECIOUS: $(MKFILES)
-
-.PHONY: test install install-nodoc install-doc dist
-
-PHONY:
-
-{$(VPATH)}parse.c: parse.y
-
-acosh.$(OBJEXT): {$(VPATH)}acosh.c
-alloca.$(OBJEXT): {$(VPATH)}alloca.c
-crypt.$(OBJEXT): {$(VPATH)}crypt.c
-dup2.$(OBJEXT): {$(VPATH)}dup2.c
-erf.$(OBJEXT): {$(VPATH)}erf.c
-finite.$(OBJEXT): {$(VPATH)}finite.c
-flock.$(OBJEXT): {$(VPATH)}flock.c
-memcmp.$(OBJEXT): {$(VPATH)}memcmp.c
-memmove.$(OBJEXT): {$(VPATH)}memmove.c
-mkdir.$(OBJEXT): {$(VPATH)}mkdir.c
-vsnprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c
-strcasecmp.$(OBJEXT): {$(VPATH)}strcasecmp.c
-strncasecmp.$(OBJEXT): {$(VPATH)}strncasecmp.c
-strchr.$(OBJEXT): {$(VPATH)}strchr.c
-strdup.$(OBJEXT): {$(VPATH)}strdup.c
-strerror.$(OBJEXT): {$(VPATH)}strerror.c
-strftime.$(OBJEXT): {$(VPATH)}strftime.c
-strstr.$(OBJEXT): {$(VPATH)}strstr.c
-strtod.$(OBJEXT): {$(VPATH)}strtod.c
-strtol.$(OBJEXT): {$(VPATH)}strtol.c
-strtoul.$(OBJEXT): {$(VPATH)}strtoul.c
-nt.$(OBJEXT): {$(VPATH)}nt.c
-x68.$(OBJEXT): {$(VPATH)}x68.c
-os2.$(OBJEXT): {$(VPATH)}os2.c
-dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c
-
-# when I use -I., there is confliction at "OpenFile" 
-# so, set . into environment varible "include"
-win32.$(OBJEXT): {$(VPATH)}win32.c
-
-###
-
-array.$(OBJEXT): {$(VPATH)}array.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h {$(VPATH)}st.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}st.h
-compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-dir.$(OBJEXT): {$(VPATH)}dir.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h
-dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h
-dmydln.$(OBJEXT): {$(VPATH)}dmydln.c {$(VPATH)}dln.c {$(VPATH)}ruby.h \
-  config.h {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h
-dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}node.h {$(VPATH)}util.h
-error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}st.h
-eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}node.h {$(VPATH)}env.h {$(VPATH)}util.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h
-file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \
-  {$(VPATH)}dln.h
-gc.$(OBJEXT): {$(VPATH)}gc.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}node.h \
-  {$(VPATH)}env.h {$(VPATH)}re.h {$(VPATH)}regex.h
-hash.$(OBJEXT): {$(VPATH)}hash.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}rubysig.h
-inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-io.$(OBJEXT): {$(VPATH)}io.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h  {$(VPATH)}util.h \
-  {$(VPATH)}env.h
-main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-marshal.$(OBJEXT): {$(VPATH)}marshal.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}st.h {$(VPATH)}util.h
-math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-numeric.$(OBJEXT): {$(VPATH)}numeric.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}env.h {$(VPATH)}defines.h {$(VPATH)}intern.h \
-  {$(VPATH)}missing.h
-object.$(OBJEXT): {$(VPATH)}object.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}st.h {$(VPATH)}util.h
-pack.$(OBJEXT): {$(VPATH)}pack.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h \
-  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c
-prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-process.$(OBJEXT): {$(VPATH)}process.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h
-random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-range.$(OBJEXT): {$(VPATH)}range.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-re.$(OBJEXT): {$(VPATH)}re.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}re.h {$(VPATH)}regex.h
-regex.$(OBJEXT): {$(VPATH)}regex.c config.h {$(VPATH)}regex.h
-ruby.$(OBJEXT): {$(VPATH)}ruby.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h {$(VPATH)}node.h {$(VPATH)}util.h
-signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h
-sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h
-string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}re.h {$(VPATH)}regex.h
-struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h
-variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h
-version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}version.h
-
-dist: $(PROGRAM)
-	$(RUNRUBY) $(srcdir)/distruby.rb
diff --git a/compar.c b/compar.c
index 3cd3216b77..42258d59cb 100644
--- a/compar.c
+++ b/compar.c
@@ -2,8 +2,8 @@
 
   compar.c -
 
-  $Author: dave $
-  $Date: 2003/12/19 00:01:18 $
+  $Author$
+  $Date$
   created at: Thu Aug 26 14:39:48 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -17,12 +17,9 @@ VALUE rb_mComparable;
 static ID cmp;
 
 int
-rb_cmpint(val, a, b)
-    VALUE val, a, b;
+rb_cmpint(val)
+    VALUE val;
 {
-    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;
@@ -33,155 +30,64 @@ rb_cmpint(val, a, b)
     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;
-}
-
-/*
- *  call-seq:
- *     obj == other    => true or false
- *  
- *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns 0. Also returns true if
- *  _obj_ and _other_ are the same object.
- */
-
 static VALUE
 cmp_equal(x, y)
     VALUE x, y;
 {
-    VALUE a[2];
+    int c;
 
     if (x == y) return Qtrue;
-
-    a[0] = x; a[1] = y;
-    return rb_rescue(cmp_eq, (VALUE)a, cmp_failed, 0);
+    c  = rb_funcall(x, cmp, 1, y);
+    if (NIL_P(c)) return Qfalse;
+    if (c == INT2FIX(0)) return Qtrue;
+    if (rb_cmpint(c) == 0) return Qtrue;
+    return Qfalse;
 }
 
-/*
- *  call-seq:
- *     obj > other    => true or false
- *  
- *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns 1.
- */
-
 static VALUE
 cmp_gt(x, y)
     VALUE x, y;
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
-    if (rb_cmpint(c, x, y) > 0) return Qtrue;
+    if (NIL_P(c)) return Qnil;
+    if (rb_cmpint(c) > 0) return Qtrue;
     return Qfalse;
 }
 
-/*
- *  call-seq:
- *     obj >= other    => true or false
- *  
- *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns 0 or 1.
- */
-
 static VALUE
 cmp_ge(x, y)
     VALUE x, y;
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
-    if (rb_cmpint(c, x, y) >= 0) return Qtrue;
+    if (NIL_P(c)) return Qnil;
+    if (rb_cmpint(c) >= 0) return Qtrue;
     return Qfalse;
 }
 
-/*
- *  call-seq:
- *     obj < other    => true or false
- *  
- *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns -1.
- */
-
 static VALUE
 cmp_lt(x, y)
     VALUE x, y;
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
-    if (rb_cmpint(c, x, y) < 0) return Qtrue;
+    if (NIL_P(c)) return Qnil;
+    if (rb_cmpint(c) < 0) return Qtrue;
     return Qfalse;
 }
 
-
-/*
- *  call-seq:
- *     obj <= other    => true or false
- *  
- *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns -1 or 0.
- */
-
 static VALUE
 cmp_le(x, y)
     VALUE x, y;
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
-    if (rb_cmpint(c, x, y) <= 0) return Qtrue;
+    if (NIL_P(c)) return Qnil;
+    if (rb_cmpint(c) <= 0) return Qtrue;
     return Qfalse;
 }
 
-/*
- *  call-seq:
- *     obj.between?(min, max)    => true or false
- *  
- *  Returns <code>false</code> if <i>obj</i> <code><=></code>
- *  <i>min</i> is less than zero or if <i>anObject</i> <code><=></code>
- *  <i>max</i> is greater than zero, <code>true</code> otherwise.
- *     
- *     3.between?(1, 5)               #=> true
- *     6.between?(1, 5)               #=> false
- *     'cat'.between?('ant', 'dog')   #=> true
- *     'gnu'.between?('ant', 'dog')   #=> false
- *     
- */
-
 static VALUE
 cmp_between(x, min, max)
     VALUE x, min, max;
@@ -191,43 +97,6 @@ cmp_between(x, min, max)
     return Qtrue;
 }
 
-/*
- *  The <code>Comparable</code> mixin is used by classes whose objects
- *  may be ordered. The class must define the <code><=></code> operator,
- *  which compares the receiver against another object, returning -1, 0,
- *  or +1 depending on whether the receiver is less than, equal to, or
- *  greater than the other object. <code>Comparable</code> uses
- *  <code><=></code> to implement the conventional comparison operators
- *  (<code><</code>, <code><=</code>, <code>==</code>, <code>>=</code>,
- *  and <code>></code>) and the method <code>between?</code>.
- *     
- *     class SizeMatters
- *       include Comparable
- *       attr :str
- *       def <=>(anOther)
- *         str.size <=> anOther.str.size
- *       end
- *       def initialize(str)
- *         @str = str
- *       end
- *       def inspect
- *         @str
- *       end
- *     end
- *     
- *     s1 = SizeMatters.new("Z")
- *     s2 = SizeMatters.new("YY")
- *     s3 = SizeMatters.new("XXX")
- *     s4 = SizeMatters.new("WWWW")
- *     s5 = SizeMatters.new("VVVVV")
- *     
- *     s1 < s2                       #=> true
- *     s4.between?(s1, s3)           #=> false
- *     s4.between?(s3, s5)           #=> true
- *     [ s3, s2, s5, s4, s1 ].sort   #=> [Z, YY, XXX, WWWW, VVVVV]
- *     
- */
-
 void
 Init_Comparable()
 {
diff --git a/config.guess b/config.guess
index dd1688b7b5..d7e236f92c 100644
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /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.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
 
-timestamp='2004-06-11'
+timestamp='2001-07-13'
 
 # 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
@@ -24,9 +24,8 @@ timestamp='2004-06-11'
 # 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>.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -53,7 +52,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -78,7 +77,7 @@ while test $# -gt 0 ; do
     -* )
        echo "$me: invalid option $1$help" >&2
        exit 1 ;;
-    * )
+*)
        break ;;
   esac
 done
@@ -88,83 +87,80 @@ if test $# != 0; then
   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.
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 
+# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# Portable tmp directory creation inspired by the Autoconf team.
-
-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) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { 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 ;
+ ,,)    echo "int dummy(){}" > $dummy.c
+	for c in cc gcc c89 ; do
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+	  if test $? = 0 ; then
+	     CC_FOR_BUILD="$c"; break
+	  fi
+	done
+	rm -f $dummy.c $dummy.o $dummy.rel
 	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
+	  CC_FOR_BUILD=no_compiler_found
 	fi
-	;;
+  ;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac
+
+# Modified for Human68k by K.Okabe 1997.07.09
+# Last change: 1997.07.09
+
+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
 
 # 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
+	# 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 ;;
+	# Determine the machine/vendor (is the vendor relevant).
+	case "${UNAME_MACHINE}" in
+	    amiga) machine=m68k-unknown ;;
+	    arm32) machine=arm-unknown ;;
+	    atari*) machine=m68k-atari ;;
+	    sun3*) machine=m68k-sun ;;
+	    mac68k) machine=m68k-apple ;;
+	    macppc) machine=powerpc-apple ;;
+	    hp3[0-9][05]) machine=m68k-hp ;;
+	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    *) machine=${UNAME_MACHINE}-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
+	case "${UNAME_MACHINE}" in
+	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
 		then
@@ -180,135 +176,70 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		;;
 	esac
 	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-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 ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit 0;;
     alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
+	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
+	fi
 	# A Vn.n version is a released version.
 	# 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.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
+	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
+	.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
+	.end main
+EOF
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		case `./$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+		esac
+	fi
+	rm -f $dummy.s $dummy
+	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?
@@ -321,19 +252,34 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+      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 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -351,13 +297,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	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 ;;
@@ -386,7 +325,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	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)
@@ -400,9 +339,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${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
+    # "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
@@ -426,12 +368,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
+    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 ;;
     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 ;;
@@ -445,7 +405,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	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 */
@@ -467,20 +426,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm -f $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 ;;
@@ -502,12 +456,12 @@ EOF
 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
 	    then
 		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
+	else
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
+	fi
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
+        fi
  	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
@@ -541,7 +495,6 @@ EOF
 	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
 		#include <sys/systemcfg.h>
 
@@ -553,7 +506,8 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $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
@@ -562,7 +516,7 @@ EOF
 	fi
 	exit 0 ;;
     *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
@@ -602,8 +556,10 @@ EOF
 	    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`
+              case "${HPUX_REV}" in
+                11.[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
@@ -612,13 +568,12 @@ EOF
                         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
+                  fi ;;
+              esac
+              if [ "${HP_ARCH}" = "" ]; then
+              sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -651,21 +606,11 @@ EOF
                   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 ;;
+	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+	rm -f $dummy.c $dummy
+	fi ;;
 	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:*:*)
@@ -673,7 +618,6 @@ EOF
 	echo ia64-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
-	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
@@ -699,7 +643,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $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:*:* )
@@ -708,7 +653,7 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -727,6 +672,9 @@ EOF
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
+    hppa*:OpenBSD:*:*)
+	echo hppa-unknown-openbsd
+	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
@@ -745,37 +693,40 @@ 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*T3D:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	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 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        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/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -787,21 +738,10 @@ EOF
 	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=`
-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -812,17 +752,11 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	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
+	echo i386-pc-interix
 	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
@@ -834,175 +768,206 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
-	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	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-gnu" && 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
+	cat >$dummy.c <<EOF
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+int main (int argc, char *argv[]) {
+#else
+int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux\n", argv[1]);
+#endif
+  return 0;
+}
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+		# Determine Lib Version
+		cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#if defined(__GLIBC__)
+  printf("%s %s\n", __libc_version, __libc_release);
+#else
+  printf("unknown\n");
+#endif
+  return 0;
+}
+EOF
+		LIBC=""
+		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./$dummy | grep 1\.99 > /dev/null
+		if test "$?" = 0 ; then LIBC="-libc1" ; fi
+		fi	
+		rm -f $dummy.c $dummy
+	echo powerpc-unknown-linux${LIBC}
 	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-gnu${LIBC}
+	cat <<EOF >$dummy.s
+	  .data
+	  \$Lformat:
+		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+	   .text
+		.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
+		.end main
+EOF
+		LIBC=""
+		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+		case `./$dummy` in
+		0-0)	UNAME_MACHINE="alpha" ;;
+		1-0)	UNAME_MACHINE="alphaev5" ;;
+		1-1)    UNAME_MACHINE="alphaev56" ;;
+		1-101)	UNAME_MACHINE="alphapca56" ;;
+		2-303)	UNAME_MACHINE="alphaev6" ;;
+		2-307)	UNAME_MACHINE="alphaev67" ;;
+			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 ;;
     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-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux ;;
+	  PA8*) echo hppa2.0-unknown-linux ;;
+	  *)    echo hppa-unknown-linux ;;
 	esac
 	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux
 	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	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
+	ld_supported_emulations=`cd /; ld --help 2>&1 \
+			 | 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-gnu"
+        case "$ld_supported_emulations" in
+	  i*86linux)
+		echo "${UNAME_MACHINE}-pc-linux-aout"
+		exit 0
+		;;
+	  elf_i*86)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux"
+		;;
+	  i*86coff)
+		echo "${UNAME_MACHINE}-pc-linux-coff"
+		exit 0
 		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
 	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
+	# Either a pre-BFD a.out linker (linux-oldld)
+	  # or one that does not give us useful --help.
+	# GCC wants to distinguish between linux-oldld and linux-aout.
+	  # If ld does not provide *any* "supported emulations:"
+	# that means it is gnuoldld.
+	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-oldld" && exit 0
+	  case "${UNAME_MACHINE}" in
+	i*86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
+	  # Determine whether the default compiler is a.out or elf
+	  cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-libc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-libc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-${VENDOR}-linux-aout\n", argv[1]);
+#endif
+  return 0;
+}
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
+# 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*:*)
-	# 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.
 	echo i386-sequent-sysv4
 	exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
@@ -1013,26 +978,6 @@ 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:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	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$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1041,32 +986,36 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	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}
+    i*86:*:5:7*)
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+	else
+	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
 	exit 0 ;;
     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) \
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|egrep '^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:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1090,15 +1039,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[5678]*:*)
+    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*: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 | SHG2:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*: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`
@@ -1115,6 +1058,9 @@ EOF
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1141,8 +1087,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*)
@@ -1154,10 +1100,6 @@ 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 ;;
@@ -1186,9 +1128,6 @@ EOF
     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 ;;
@@ -1196,24 +1135,18 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
+	if test "${UNAME_MACHINE}" = "x86pc"; then
 		UNAME_MACHINE=pc
 	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-[KW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1236,6 +1169,11 @@ EOF
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	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 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
 	exit 0 ;;
@@ -1254,18 +1192,11 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	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
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1352,7 +1283,7 @@ main ()
 #endif
 
 #if defined (vax)
-# if !defined (ultrix)
+#if !defined (ultrix)
 #  include <sys/param.h>
 #  if defined (BSD)
 #   if BSD == 43
@@ -1365,11 +1296,11 @@ main ()
 #    endif
 #   endif
 #  else
-    printf ("vax-dec-bsd\n"); exit (0);
+  printf ("vax-dec-bsd\n"); exit (0);
 #  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
 #endif
 
 #if defined (alliant) && defined (i860)
@@ -1380,7 +1311,8 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
 
diff --git a/config.sub b/config.sub
index 506d3ab77f..914903cfed 100644
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
 
-timestamp='2004-06-11'
+timestamp='2001-04-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,8 +29,7 @@ timestamp='2004-06-11'
 # 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.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -81,7 +80,7 @@ Try \`$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
-  case $1 in
+case $1 in
     --time-stamp | --time* | -t )
        echo "$timestamp" ; exit 0 ;;
     --version | -v )
@@ -96,12 +95,12 @@ while test $# -gt 0 ; do
        echo "$me: invalid option $1$help"
        exit 1 ;;
 
-    *local*)
+	*local*)
        # First pass through any local machine types.
-       echo $1
+		echo $1
        exit 0;;
 
-    * )
+	*)
        break ;;
   esac
 done
@@ -118,8 +117,7 @@ esac
 # 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* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-libc1 | storm-chaos* | os2-emx*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -159,14 +157,9 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
+	-hiuxmpp)
+		os=-hiuxmpp
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -225,50 +218,26 @@ esac
 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] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| 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 \
-	| mipsisa64r2 | mipsisa64r2el \
-	| 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] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+		| pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 \
+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
+		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+		| hppa64 \
+		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+		| alphaev6[78] \
+		| we32k | ns16k | clipper | i370 | sh | sh[34] \
+		| powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp10 | pdp11 \
+		| mips16 | mips64 | mipsel | mips64el \
+		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
+		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
+		| v850 | c4x \
+		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
+		| pj | pjl | h8500)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -276,7 +245,7 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
 		;;
 
 	# We use `pc' rather than `unknown'
@@ -291,61 +260,31 @@ case $basic_machine in
 		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-* | c55x-* | c6x-* \
-	| 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-* | iq2000-* \
-	| 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-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| 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]-* | sh[23]e-* | 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-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
+	# FIXME: clean up the formatting here.
+	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+	      | xmp-* | ymp-* \
+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+	      | hppa2.0n-* | hppa64-* \
+	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+	      | alphaev6[78]-* \
+	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+	      | clipper-* | orion-* \
+	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
+	      | mips16-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-* \
+	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+	      | mipstx39-* | mipstx39el-* | mcore-* \
+	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+	      | [cjt]90-* \
+	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
+	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -377,12 +316,6 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -414,10 +347,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
@@ -438,8 +367,16 @@ 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
+		;;
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -454,14 +391,6 @@ case $basic_machine in
 	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
@@ -642,6 +571,14 @@ case $basic_machine in
 		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/'`
 		;;
@@ -656,10 +593,6 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -732,10 +665,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -743,14 +672,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -773,58 +694,42 @@ 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 | k6 | nexgen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
+	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-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
 		;;
@@ -842,26 +747,10 @@ case $basic_machine in
 	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
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -869,10 +758,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
+	sparclite-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -939,42 +825,22 @@ case $basic_machine in
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
+		basic_machine=t3e-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-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
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -996,8 +862,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
@@ -1018,13 +884,13 @@ case $basic_machine in
 		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
 		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -1045,6 +911,13 @@ case $basic_machine in
 	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
 		;;
@@ -1064,16 +937,13 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1088,6 +958,10 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
+		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1143,19 +1017,15 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -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* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1167,10 +1037,8 @@ case $os in
 			;;
 		esac
 		;;
-	-nto-qnx*)
-		;;
 	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		os=-nto-qnx
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1179,12 +1047,6 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=-linux
-		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
@@ -1194,9 +1056,6 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
-		os=-os400
-		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1215,23 +1074,14 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
 	-ns2 )
-		os=-nextstep2
+	        os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1243,9 +1093,6 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
-		os=-tpf
-		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1273,14 +1120,16 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	        os=-mint
+		;;
+	-uxpds)
+		os=-uxpds
 		;;
-	-aros*)
-		os=-aros
+	-human)
 		;;
-	-kaos*)
-		os=-kaos
+	-beos)
+	        os=-beos
 		;;
 	-none)
 		;;
@@ -1313,14 +1162,10 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1347,9 +1192,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or32-*)
-		os=-coff
-		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1413,19 +1255,19 @@ 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)
@@ -1494,16 +1336,10 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			-os400*)
-				vendor=ibm
-				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
 			-aux*)
@@ -1518,9 +1354,6 @@ case $basic_machine in
 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
-			-vos*)
-				vendor=stratus
-				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
diff --git a/configure.in b/configure.in
index 3dbb527849..0ea68cca99 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT()
 
-AC_PREREQ(2.58)
+AC_PREREQ(2.50)
 
-AC_DEFUN([RUBY_MINGW32],
+AC_DEFUN(RUBY_MINGW32,
 [case "$host_os" in
 cygwin*)
 AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
@@ -17,7 +17,7 @@ test "$rb_cv_mingw32" = yes && target_os="mingw32"
   ;;
 esac])
 
-AC_DEFUN([RUBY_CPPOUTFILE],
+AC_DEFUN(RUBY_CPPOUTFILE,
 [AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
 [cppflags=$CPPFLAGS
 CPPFLAGS='-o conftest.i'
@@ -33,9 +33,9 @@ elif test -n "$rb_cv_cppoutfile"; then
 fi
 AC_SUBST(CPPOUTFILE)])
 
-AC_DEFUN([RUBY_PROG_GNU_LD],
+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
+[if `$CC $CFLAGS $CPPFLAGS $LDFLAGS --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null; then
   rb_cv_prog_gnu_ld=yes
 else
   rb_cv_prog_gnu_ld=no
@@ -72,62 +72,51 @@ if test "$program_prefix" = NONE; then
   program_prefix=
 fi
 AC_CANONICAL_TARGET
-target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
-ac_install_sh='' # unusable for extension libraries.
 
 dnl checks for fat-binary
+fat_binary=no
 AC_ARG_ENABLE(fat-binary,
-       [  --enable-fat-binary=ARCHS
-                          build an Apple/NeXT Multi Architecture Binary (MAB);
-                          ARCHS is a comma-delimited list of architectures for
-                          which to build; if ARCHS is omitted, then the package
-                          will be built for all architectures supported by the
-                          platform ("ppc" for MacOS/X and Darwin; "ppc,i386"
-                          for Rhapsody; "m68k,i386,sparc" for OpenStep;
-                          "m68k,i386,sparc,hppa" for NextStep); if this option
-                          is disabled or omitted entirely, then the package
-                          will be built only for the target platform],
-       [fat_binary=$enableval], [fat_binary=no])
-if test "$fat_binary" != no; then
-
-    AC_MSG_CHECKING([target architectures])
-
-    # Respect TARGET_ARCHS setting from environment if available.
-    if test -z "$TARGET_ARCHS"; then
-	# Respect ARCH given to --enable-fat-binary if present.
-	if test "$fat_binary" != yes; then
-	    TARGET_ARCHS=`echo "$fat_binary" | tr ',' ' '`
-	else
-	    # Choose a default set of architectures based upon platform.
-	    case "$target_os" in
-	    darwin*)
-		TARGET_ARCHS="ppc"
-		;;
-	    rhapsody*)
-		TARGET_ARCHS="ppc i386"
-		;;
-	    openstep*)
-		TARGET_ARCHS="m68k i386 sparc"
-		;;
-	    nextstep*)
-		TARGET_ARCHS="m68k i386 sparc hppa"
-		;;
-	    *)
-		TARGET_ARCHS=`arch`
-	    esac
-	fi
-    fi
+       [  --enable-fat-binary     build a NeXT/Apple Multi Architecture Binary. ],
+       [fat_binary=$enableval])
+ if test "$fat_binary" = yes ; then
 
-    AC_MSG_RESULT([$TARGET_ARCHS])
+    AC_MSG_CHECKING(target architecture)
 
+    case "$target_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
+	# 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
-    ARCH_FLAG=
     for archs in $TARGET_ARCHS 
     do
-        ARCH_FLAG="$ARCH_FLAG -arch $archs"
+        ARCH_FLAG="$ARCH_FLAG -arch $archs "
+        echo -n " $archs"
     done
     AC_DEFINE(NEXT_FAT_BINARY)
-fi
+    echo "."
+fi 
 
 case $target_cpu in
   i?86) frame_address=yes;;
@@ -153,81 +142,45 @@ AC_PROG_GCC_TRADITIONAL
 RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
 
-: ${OUTFLAG='-o '}
+OUTFLAG='-o '
 AC_SUBST(OUTFLAG)
 
 RUBY_MINGW32
 
 AC_PROG_YACC
-if test "$YACC" = "yacc"; then
-  AC_DEFINE([OLD_YACC])
-fi
-
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(AR, ar)
 if test -z "$AR"; then
   AC_CHECK_PROGS(AR, aal, ar)
 fi
 
-AC_CHECK_TOOL(AS, as)
-ASFLAGS=$ASFLAGS
-AC_SUBST(ASFLAGS)
-
 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/`
-    case "$target_os" in
-    mingw*)
-	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
-	AC_CHECK_TOOL(OBJDUMP, objdump)
-	AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
-	AC_TRY_LINK([#include <stdio.h>],
-		    [FILE* volatile f = stdin; return 0;],
-		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
-				   tr A-Z a-z |
-				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
-		    [rb_cv_msvcrt=msvcrt])
-	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
-	AC_ARG_WITH(winsock2,
-		[  --with-winsock2         link winsock2 (MinGW only)], [
-		case $withval in
-		yes) with_winsock2=yes;;
-		*)   with_winsock2=no;;
-		esac], [with_winsock2=no])
-	if test "$with_winsock2" = yes; then
-	  AC_DEFINE(USE_WINSOCK2)
-	fi
-    esac
     : ${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*)
-    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
     AC_DEFINE(__HIUX_MPP__)
     ;;
 esac
 
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_INSTALL
 
 # checks for UNIX variants that set C preprocessor variables
 AC_AIX
 AC_MINIX
 
-AC_SUBST(RM, ['rm -f'])
-AC_SUBST(CP, ['cp'])
-if $as_mkdir_p; then
-  AC_SUBST(MAKEDIRS, ['mkdir -p'])
-else
-  AC_SUBST(MAKEDIRS, ['install -d'])
-fi
-
 dnl check for large file stuff
 AC_SYS_LARGEFILE
 
@@ -242,12 +195,6 @@ AC_CHECK_SIZEOF(off_t, 0)
 AC_CHECK_SIZEOF(void*, 4)
 AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_SIZEOF(time_t, 0)
-
-for id in pid_t gid_t uid_t; do
-    AC_CHECK_TYPE($id, [typ=$id], [typ=int])
-    AC_DEFINE_UNQUOTED(rb_$id, $typ)
-done
 
 AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
   [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
@@ -287,7 +234,7 @@ if test "$rb_cv_stdarg" = yes; then
 fi
 
 AC_CACHE_CHECK([for noreturn], rb_cv_noreturn,
-[rb_cv_noreturn=x
+[rb_cv_noreturn=no
 for mac in "x __attribute__ ((noreturn))" "__declspec(noreturn) x" x; do
   AC_TRY_COMPILE(
     [#define NORETURN(x) $mac
@@ -297,17 +244,6 @@ NORETURN(void exit(int x));],
 done])
 AC_DEFINE_UNQUOTED([NORETURN(x)], $rb_cv_noreturn)
 
-AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern,
-[rb_cv_ruby_extern=no
-for mac in "__attribute__((dllimport))" "__declspec(dllimport)"; do
-  AC_TRY_COMPILE(
-    [extern $mac void conftest(void);],
-    [rb_cv_ruby_extern="extern $mac"; break])
-done])
-test "x$rb_cv_ruby_extern" = xno || AC_DEFINE_UNQUOTED(RUBY_EXTERN, $rb_cv_ruby_extern)
-
-XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
-
 dnl Check whether we need to define sys_nerr locally
 AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
 #include <errno.h>])
@@ -320,33 +256,20 @@ AC_ARG_WITH(libc_r,
 	*)   with_libc_r=no;;
 	esac], [with_libc_r=no])
 
-AC_ARG_ENABLE(pthread,
-       [  --enable-pthread        use pthread library.],
-       [enable_pthread=$enableval], [enable_pthread=no])
-
 dnl Checks for libraries.
 case "$target_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
-		ac_cv_func_setitimer=no
-		;;
-beos*)		ac_cv_func_link=no;;
+human*)		ac_cv_func_getpgrp_void=yes;;
+beos*)		;;
 cygwin*)	rb_cv_have_daylight=no
 		ac_cv_var_tzname=no
 		ac_cv_func__setjmp=no
 		ac_cv_func_setitimer=no
 		;;
-mingw*)		if test "$with_winsock2" = yes; then
-		  LIBS="-lws2_32 $LIBS"
-		else
-		  LIBS="-lwsock32 $LIBS"
-		fi
-		LIBS="-lshell32 $LIBS"
+mingw*)		LIBS="-lwsock32 $LIBS"
 		ac_cv_header_a_out_h=no
 		ac_cv_header_pwd_h=no
 		ac_cv_header_utime_h=no
@@ -354,36 +277,18 @@ mingw*)		if test "$with_winsock2" = yes; then
 		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_time_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_func_isinf=yes
-		ac_cv_func_isnan=yes
-		ac_cv_func_finite=yes
-		ac_cv_func_link=yes
 		ac_cv_lib_crypt_crypt=no
-		ac_cv_func_getpgrp_void=no
-		ac_cv_func_setpgrp_void=yes
-		ac_cv_func_memcmp_working=yes
-		ac_cv_lib_dl_dlopen=no
-		rb_cv_binary_elf=no
-		rb_cv_negative_time_t=no
-		enable_pthread=no
 		;;
-os2-emx*)	LIBS="-lm $LIBS"
+os2_emx*)	LIBS="-lm $LIBS"
 		ac_cv_lib_dir_opendir=no;;
 msdosdjgpp*)	LIBS="-lm $LIBS"
-		ac_cv_func_getpgrp_void=yes
-		ac_cv_func_setitimer=no
-                ac_cv_sizeof_rlim_t=4
-		;;
-bsdi*)          LIBS="-lm $LIBS"
-                ac_cv_sizeof_rlim_t=8;;
+		ac_cv_func_getpgrp_void=yes;;
 freebsd*)	LIBS="-lm $LIBS"
 		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
 		  rb_cv_lib_xpg4_needed,
@@ -413,62 +318,42 @@ freebsd*)	LIBS="-lm $LIBS"
 			   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"
+				MAINLIBS="-lc_r $MAINLIBS"			
+			else
+				MAINLIBS="-pthread $MAINLIBS"			
+				CFLAGS="-D_THREAD_SAFE $CFLAGS"
 			fi
 		fi
 		;;
-dragonfly*)	LIBS="-lm $LIBS"
-		;;
-bow)		ac_cv_func_setitimer=no
-		;;
-superux*)     ac_cv_func_setitimer=no
-              ;;
-solaris*2.1*) if test -z "$GCC"; then
-	           ac_cv_func_isinf=yes
-              fi
-              LIBS="-lm $LIBS"
-              ;;
+linux*)		LIBS="-lm $LIBS"
+		case "$target_cpu" in
+		alpha*)
+		    CFLAGS="-mieee $CFLAGS" ;;
+		esac ;;
+osf*)		LIBS="-lm $LIBS"
+		case "$target_cpu"::"$GCC" in
+		alpha*::yes)
+		    CFLAGS="-mieee $CFLAGS" ;;
+		alpha*::no|alpha*::)
+		    CFLAGS="-ieee $CFLAGS" ;;
+		esac ;;
 *) 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
-
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.h\
+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 netinet/in_systm.h float.h ieeefp.h pthread.h \
-		 ucontext.h intrinsics.h)
-
-dnl Check additional types.
-AC_CHECK_SIZEOF(rlim_t, 0, [
-  #ifdef HAVE_SYS_TYPES_H
-  # include <sys/types.h>
-  #endif
-  #ifdef HAVE_SYS_TIME_H
-  # include <sys/time.h>
-  #endif
-  #ifdef HAVE_SYS_RESOURCE_H
-  # include <sys/resource.h>
-  #endif
-  #ifdef HAVE_UNISTD_H
-  # include <unistd.h>
-  #endif
-  #include <stdio.h>
-])
+		 syscall.h pwd.h a.out.h utime.h memory.h direct.h sys/resource.h \
+		 sys/mkdev.h sys/utime.h float.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_UID_T
 AC_TYPE_SIZE_T
 AC_STRUCT_ST_BLKSIZE
 AC_STRUCT_ST_BLOCKS
@@ -481,25 +366,16 @@ AC_FUNC_ALLOCA
 AC_FUNC_MEMCMP
 AC_FUNC_FSEEKO
 AC_CHECK_FUNCS(ftello)
-AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\
+AC_REPLACE_FUNCS(dup2 memmove mkdir strcasecmp strncasecmp strerror strftime\
 		 strchr strstr strtoul crypt flock vsnprintf\
-		 isnan finite isinf hypot acosh erf)
-AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\
-	      truncate chsize times utimes fcntl lockf lstat symlink link\
-	      readlink setitimer setruid seteuid setreuid setresuid\
-	      setproctitle setrgid setegid setregid setresgid issetugid pause\
-	      lchown lchmod getpgrp setpgrp getpgid setpgid initgroups\
-	      getgroups setgroups getpriority getrlimit setrlimit sysconf\
-	      group_member dlopen sigprocmask\
-	      sigaction _setjmp setsid telldir seekdir fchmod mktime timegm\
-	      cosh sinh tanh setuid setgid setenv unsetenv)
-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
+		 isinf isnan finite hypot acosh)
+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 pause lchown lchmod\
+	      getpgrp setpgrp getpgid setpgid getgroups getpriority getrlimit\
+	      dlopen sigprocmask sigaction _setjmp setsid telldir seekdir fchmod\
+	      mktime timegm cosh sinh tanh)
 AC_STRUCT_TIMEZONE
 AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
   [AC_TRY_COMPILE([#include <time.h>],
@@ -594,7 +470,6 @@ AC_C_BIGENDIAN
 AC_C_CONST
 AC_C_CHAR_UNSIGNED
 AC_C_INLINE
-AC_C_VOLATILE
 
 AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
     [AC_TRY_RUN([
@@ -680,7 +555,7 @@ else
   fi
 fi
 
-AC_DEFUN([RUBY_CHECK_IO_NEED],
+AC_DEFUN(RUBY_CHECK_IO_NEED,
 [AC_CACHE_CHECK(whether need to [$1], [$2],
     [AC_TRY_RUN([
 #include <stdio.h>
@@ -738,99 +613,9 @@ 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
-dnl RUBY_CHECK_IO_NEED(flush before seek, rb_cv_need_io_flush_before_seek, no)
-dnl if test "$rb_cv_need_io_flush_before_seek" = yes; then
-dnl   AC_DEFINE(NEED_IO_FLUSH_BEFORE_SEEK, 1)
-dnl 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
-
-if test "$ac_cv_func_sysconf" = yes; then
-  AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl
-  AC_CACHE_CHECK([whether _SC_$1 is supported], rb_cv_have_sc_[]m4_tolower($1),
-    [AC_TRY_COMPILE([#include <unistd.h>
-      ],
-      [_SC_$1 >= 0],
-      rb_cv_have_sc_[]m4_tolower($1)=yes,
-      rb_cv_have_sc_[]m4_tolower($1)=no)
-    ])
-  if test "$rb_cv_have_sc_[]m4_tolower($1)" = yes; then
-    AC_DEFINE(HAVE__SC_$1)
-  fi
-  ])
-  RUBY_CHECK_SYSCONF(CLK_TCK)
-fi
-
-case "$target_cpu" in
-m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
-hppa*) 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)
-
-if test x"$enable_pthread" = xyes; then
-    for pthread_lib in pthread pthreads c c_r; do
- 	AC_CHECK_LIB($pthread_lib, pthread_kill,
-		     rb_with_pthread=yes, rb_with_pthread=no)
-	if test "$rb_with_pthread" = "yes"; then break; fi
-    done
-    if test x"$rb_with_pthread" = xyes; then
-	AC_DEFINE(_REENTRANT)
-	AC_DEFINE(_THREAD_SAFE)
-	AC_DEFINE(HAVE_LIBPTHREAD)
-	case $pthread_lib in
-	c)
-	    ;;
-	c_r)
-	    MAINLIBS="-pthread $MAINLIBS"
-	    ;;
-	*)
-      	    LIBS="-l$pthread_lib $LIBS"
-	    ;;
-	esac
-    else
-	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
-    fi
-    AC_CHECK_FUNCS(nanosleep)
-    if test x"$ac_cv_func_nanosleep" = xno; then
-       AC_CHECK_LIB(rt, nanosleep)
-       if test x"$ac_cv_lib_rt_nanosleep" = xyes; then
-           AC_DEFINE(HAVE_NANOSLEEP)
-       fi
-    fi
-fi
-if test x"$ac_cv_header_ucontext_h" = xyes; then
-    if test x"$target_cpu" = xia64 -o x"$rb_with_pthread" = xyes; then
-	AC_CHECK_FUNCS(getcontext setcontext)
-    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
 
 dnl default value for $KANJI
@@ -855,6 +640,9 @@ AC_ARG_WITH(dln-a-out,
 	*)   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([
 /* Test for whether ELF binaries are produced */
@@ -882,17 +670,25 @@ if test "$rb_cv_binary_elf" = yes; then
 fi
 
 case "$target_os" in
-linux* | gnu* | k*bsd*-gnu | bsdi*)
+linux*)
     if test "$rb_cv_binary_elf" = no; then
 	with_dln_a_out=yes
+	target_os=${target_os}-a_out
     else
-	LDFLAGS="$LDFLAGS -rdynamic"
+	LDFLAGS="-rdynamic"
     fi;;
+netbsd*|openbsd*)
+    if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
+    then
+	netbsd_elf=yes
+    else
+	netbsd_elf=no
+    fi
+    ;;
 esac
 LIBEXT=a
 
 AC_SUBST(DLDFLAGS)dnl
-AC_SUBST(ARCH_FLAG)dnl
 
 AC_SUBST(STATIC)dnl
 AC_SUBST(CCDLFLAGS)dnl
@@ -902,164 +698,149 @@ AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
 
 STATIC=
-: ${LIBPATHFLAG=' -L"%s"'}
-: ${PATHFLAG=''}
+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
-    nextstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    openstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    rhapsody*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    darwin*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
-    *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
+    nextstep*)	;;
+    openstep*)	;;
+    rhapsody*)	;;
+    darwin*)	CCDLFLAGS=-fno-common;;
+    human*)	;;
+    bsdi*)	;;
+    beos*)	;;
+    cygwin*)	;;
+    mingw*)	;;
+    netbsd*) CCDLFLAGS=-fPIC;;
+    *) CCDLFLAGS=-fPIC;;
     esac
   else
     case "$target_os" in
-	hpux*)		CCDLFLAGS="$CCDLFLAGS +Z";;
-	solaris*|irix*)	CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
-	sunos*)		CCDLFLAGS="$CCDLFLAGS -PIC" ;;
-	esix*|uxpds*)   CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
-	*)		: ${CCDLFLAGS=""} ;;
+	hpux*)		CCDLFLAGS='+z';;
+	solaris*|irix*)	CCDLFLAGS='-KPIC' ;;
+	sunos*)		CCDLFLAGS='-PIC' ;;
+	esix*|uxpds*)   CCDLFLAGS='-KPIC' ;;
+	*)		CCDLFLAGS='' ;;
     esac
   fi
 
   case "$target_os" in
-	hpux*)		DLDFLAGS="$DLDFLAGS -E"
-			: ${LDSHARED='ld -b'}
-			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			: ${LIBPATHENV=SHLIB_PATH}
+	hpux*)		DLDFLAGS="-E"
+			LDSHARED='ld -b'
+			LDFLAGS="-Wl,-E"
 			rb_cv_dlopen=yes;;
 	solaris*) 	if test "$GCC" = yes; then
-                          : ${LDSHARED='$(CC) -shared'}
+			   LDSHARED='$(CC) -Wl,-G'
 			   if test "$rb_cv_prog_gnu_ld" = yes; then
-	 		       LDFLAGS="$LDFLAGS -Wl,-E"
+	 		       LDFLAGS="-Wl,-E"
+			       LDSHARED="$LDSHARED -shared"
 			   fi
 			else
-			   : ${LDSHARED='ld -G'}
+			   LDSHARED='ld -G'
 			fi
 			rb_cv_dlopen=yes;;
-	sunos*) 	: ${LDSHARED='ld -assert nodefinitions'}
+	sunos*) 	LDSHARED='ld -assert nodefinitions'
 			rb_cv_dlopen=yes;;
-	irix*)		: ${LDSHARED='ld -shared'}
+	irix*)		LDSHARED='ld -shared'
 			rb_cv_dlopen=yes;;
-	sysv4*) 	: ${LDSHARED='ld -G'}
+	sysv4*) 	LDSHARED='ld -G'
 			rb_cv_dlopen=yes;;
-        nto-qnx*)       : ${LDSHARED="qcc -shared"}
+        nto-qnx*)       LDSHARED="qcc -shared"
                         rb_cv_dlopen=yes ;;
-	esix*|uxpds*) 	: ${LDSHARED="ld -G"}
+	esix*|uxpds*) 	LDSHARED="ld -G"
 			rb_cv_dlopen=yes ;;
-	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
-			rb_cv_dlopen=yes ;;
-	bsdi3*) 	case "$CC" in
-			*shlicc*)	: ${LDSHARED="$CC -r"}
-					rb_cv_dlopen=yes ;;
-			esac ;;
-	linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
-			: ${LDSHARED='${CC} -shared'}
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-			fi
+	osf*) 		LDSHARED="$CC -shared"
 			rb_cv_dlopen=yes ;;
-	interix*) 	: ${LDSHARED="$CC -shared"}
-			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			LIBPATHFLAG=" -L'%1\$-s'"
+	linux*) 	LDSHARED="$CC -shared"
 			rb_cv_dlopen=yes ;;
-	freebsd*|dragonfly*)       : ${LDSHARED="$CC -shared"}
+	gnu*)   	LDSHARED="$CC -shared"
+			rb_cv_dlopen=yes
+			LDFLAGS="-rdynamic" ;;
+	freebsd*)       LDSHARED="$CC -shared"
 			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -rdynamic"
-			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
+			    LDFLAGS="-rdynamic"
+			    DLDFLAGS='-Wl,-soname,$(.TARGET)'
 			else
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
 			fi
 			rb_cv_dlopen=yes ;;
-	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
+	netbsd*)	LDSHARED='${CC} -shared'
 			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -Wl,-E"
+			    LDFLAGS="-Wl,-export-dynamic"
+			    LIBPATHFLAG=' -L%1$-s -Wl,-R%1$-s'
 			fi
 			rb_cv_dlopen=yes ;;
-	nextstep*)	: ${LDSHARED='cc -r -nostdlib'}
-			LDFLAGS="$LDFLAGS -u libsys_s"
+	openbsd*) 	LDSHARED="\$(CC) -shared ${CCDLFLAGS}"
+			if test "$rb_cv_binary_elf" = yes; then
+			    LDFLAGS="-Wl,-E"
+			fi
 			rb_cv_dlopen=yes ;;
-	openstep*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
-			: ${LDFLAGS=""}
+	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 ;;
-	rhapsody*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
-			: ${LDFLAGS=""}
+	nextstep*)	LDSHARED='cc -r -nostdlib'
+			LDFLAGS="-u libsys_s"
+			DLDFLAGS="$ARCH_FLAG" 
 			rb_cv_dlopen=yes ;;
-	darwin*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'}
-			: ${LDFLAGS=""}
-			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
+	openstep*)	LDSHARED='cc -dynamic -bundle -undefined suppress'
+			LDFLAGS=""
+			DLDFLAGS="$ARCH_FLAG"
 			rb_cv_dlopen=yes ;;
-        aix*)           if test "$GCC" = yes; then
-                           : ${LDSHARED='gcc -shared'}
-                           DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
-                           LDFLAGS='-Wl,-brtl -Wl,-bE:ruby.imp'
-                        else
-                          : ${LDSHARED='/usr/ccs/bin/ld'}
-                          DLDFLAGS='-G -eInit_$(TARGET)'
-                          LDFLAGS="-brtl -bE:ruby.imp"
-                        fi
-                        : ${ARCHFILE="ruby.imp"}
-                        TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
-                        TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
-                        : ${LIBPATHENV=SHLIB_PATH}
-                        rb_cv_dlopen=yes ;;
-	human*)		: ${DLDFLAGS=''}
-			: ${LDSHARED=''}
-			: ${LDFLAGS=''}
-			: ${LINK_SO='ar cru $@ $(OBJS)'}
+	rhapsody*)	LDSHARED='cc -dynamic -bundle -undefined suppress'
+			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"
+			test $GCC = yes || ARCHFILE="ruby.imp"
+			rb_cv_dlopen=yes ;;
+
+	human*)		DLDFLAGS=''
+			LDSHARED=''
+			LDFLAGS=''
+			LINK_SO='ar cru $@ $(OBJS)'
 			rb_cv_dlopen=yes ;;
 	beos*) 		case "$target_cpu" in
 			  powerpc*)
-			    : ${LDSHARED="ld -xms"}
-			    DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+			    LDSHARED="ld -xms"
+			    DLDFLAGS='-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
                             ;;
 			  i586*)
-			    : ${LDSHARED="ld -shared"}
-			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
+			    LDSHARED="ld -shared"
+			    DLDFLAGS="-L/boot/develop/lib/x86 -lbe -lroot"
 			    ;;
 			esac
-			: ${LIBPATHENV=LIBRARY_PATH}
 			rb_cv_dlopen=yes ;;
-	nto-qnx*)	DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
-			: ${LDSHARED='ld -Bshareable -x'}
-			LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
+	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="$XLDFLAGS -Wl,--stack,0x02000000"
-			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-import,--export-all"
-			: ${LIBPATHENV=""}
+			XLDFLAGS='-Wl,--stack,0x02000000'
+			DLDFLAGS="${DLDFLAGS} "'$(DEFFILE)'
 			rb_cv_dlopen=yes ;;
-	hiuxmpp)	: ${LDSHARED='ld -r'} ;;
-	atheos*) 	: ${LDSHARED="$CC -shared"}
+	hiuxmpp)	LDSHARED='ld -r' ;;
+	atheos*) 	LDSHARED="$CC -shared"
 			rb_cv_dlopen=yes ;;
-	os2-emx*)	LDFLAGS="$LDFLAGS -Zbsd-signals"
-			;;
-	*) 		: ${LDSHARED='ld'} ;;
+	*) 		LDSHARED='ld' ;;
   esac
   AC_MSG_RESULT($rb_cv_dlopen)
-
-  AC_ARG_ENABLE(rpath,
-       [  --disable-rpath         embed run path into extension libraries.],
-       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
-  if test "$enable_rpath" = yes; then
-    LIBPATHFLAG=" -L'%1\$-s'"
-    if test "$GCC" = yes; then
-       RPATHFLAG=" -Wl,-R'%1\$-s'"
-    else
-       RPATHFLAG=" -R'%1\$-s'"
-    fi
-  fi
 fi
 AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
-AC_SUBST(RPATHFLAG)
-AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
-AC_SUBST(TRY_LINK)
 
 dln_a_out_works=no
 if test "$ac_cv_header_a_out_h" = yes; then
@@ -1101,7 +882,7 @@ else
 	 	AC_DEFINE(DLEXT, ".bundle");;
     darwin*)	DLEXT=bundle
 	 	AC_DEFINE(DLEXT, ".bundle");;
-    os2-emx*)	DLEXT=dll
+    os2_emx*)	DLEXT=dll
 	 	AC_DEFINE(DLEXT, ".dll");;
     cygwin*|mingw*)	DLEXT=so
 	 	AC_DEFINE(DLEXT, ".so")
@@ -1120,7 +901,9 @@ else
 fi
 
 case "$target_os" in
-  linux* | gnu* | k*bsd*-gnu)
+  linux*)
+	STRIP='strip -S -x';;
+  gnu*)
 	STRIP='strip -S -x';;
   nextstep*)
 	STRIP='strip -A -n';;
@@ -1186,13 +969,13 @@ rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no
     fi
     AC_LIBOBJ([x68.o])
     CFLAGS="$CFLAGS -fansi-only"
-    XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
+    XCFLAGS="-cc1-stack=262144 -cpp-stack=2694144"
     EXEEXT=.x
     OBJEXT=o
     setup=Setup.x68
     ;;
   dnl OS/2 environment w/ Autoconf 2.1x for EMX
-  os2-emx)
+  os2_emx)
     AC_LIBOBJ([os2])
     setup=Setup.emx
     ;;
@@ -1210,23 +993,19 @@ if test "$prefix" = NONE; then
   prefix=$ac_default_prefix
 fi
 
-#if test "$fat_binary" != no ; then
-#  CFLAGS="$CFLAGS $ARCH_FLAG"
-#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
-  RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
 else
   MINIRUBY='./miniruby$(EXEEXT)'
-  PREP='miniruby$(EXEEXT)'
-  RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT) --'
+  PREP=''
 fi
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)
-AC_SUBST(RUNRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
 
 FIRSTMAKEFILE=""
 LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
@@ -1236,11 +1015,11 @@ LIBRUBYARG='$(LIBRUBYARG_STATIC)'
 SOLIBS=
 
 case "$target_os" in
-  cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*)
-    : ${DLDLIBS=""}
+  cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|darwin*|os2_emx*)
+    DLDLIBS=""
     ;;
   *)
-    DLDLIBS="$DLDLIBS -lc"
+    DLDLIBS="-lc"
     ;;
 esac
 
@@ -1267,11 +1046,15 @@ if test "$enable_shared" = 'yes'; then
     sunos4*)
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	;;
-    linux* | gnu* | k*bsd*-gnu | atheos*)
+    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'
 	;;
-    freebsd*|dragonfly*)
+    freebsd*)
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
 	if test "$rb_cv_binary_elf" != "yes" ; then
@@ -1283,6 +1066,7 @@ if test "$enable_shared" = 'yes'; then
 	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
@@ -1294,28 +1078,22 @@ if test "$enable_shared" = 'yes'; then
 	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
 	;;
     solaris*)
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
-	if test "$GCC" = yes; then
-	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
-	fi
-	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
+	XLDFLAGS='-R${libdir}'
  	;;
     hpux*)
-	XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
+	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'
 	;;
     aix*)
 	if test "$GCC" = yes; then
 	    LIBRUBY_LDSHARED='$(CC) -shared'
-	    LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bE:ruby.imp -Wl,-bnoentry'
+	    LIBRUBY_DLDFLAGS='-Wl,-bE:ruby.imp'
 	else
 	    LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
-	    LIBRUBY_DLDFLAGS='-G -bE:ruby.imp -bnoentry'
+	    LIBRUBY_DLDFLAGS='-bE:ruby.imp -bM:SRE -bnoentry'
 	fi
-	LIBRUBYARG_SHARED='-L${libdir} -lruby'
+	LIBRUBYARG_SHARED='-L${libdir} -Wl,lib$(RUBY_SO_NAME).so'
 	SOLIBS='-lm -lc'
 	;;
     beos*)
@@ -1331,63 +1109,35 @@ if test "$enable_shared" = 'yes'; then
 	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'
 	;;
-    interix*)
-	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
+    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
-if test "$enable_rpath" = yes; then
-    if test "$GCC" = yes; then
-       LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-    else
-       LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-    fi
-fi
-
 XLDFLAGS="$XLDFLAGS -L."
 AC_SUBST(ARCHFILE)
 
-dnl build rdoc index if requested
-RDOCTARGET=""
-AC_ARG_ENABLE(install-doc,
-       [  --enable-install-doc    build and install rdoc indexes during install ],
-       [install_doc=$enableval], [install_doc=no])
-if test "$install_doc" != no; then
-   RDOCTARGET="install-doc"
-fi
-AC_SUBST(RDOCTARGET)
-
 case "$target_os" in
-    linux*)
-	XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
-	;;
     netbsd*)
     	CFLAGS="$CFLAGS -pipe"
 	;;
-    nextstep*|openstep*)
-	# The -fno-common is needed if we wish to embed the Ruby interpreter
-	# into a plugin module of some project (as opposed to embedding it
-	# within the project's application).  The -I/usr/local/include is
-	# needed because CPP as discovered by configure (cc -E -traditional)
-	# fails to consult /usr/local/include by default.  This causes
-	# mkmf.rb's have_header() to fail if the desired resource happens to be
-	# installed in the /usr/local tree.
-    	CFLAGS="$CFLAGS -pipe -fno-common"
-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+    nextstep*)
+    	CFLAGS="$CFLAGS -pipe"
+	;;
+    openstep*)
+    	CFLAGS="$CFLAGS -pipe"
 	;;
     rhapsody*)
-    	CFLAGS="$CFLAGS -pipe -no-precomp -fno-common"
+    	CFLAGS="$CFLAGS -pipe -no-precomp"
 	;;
     darwin*)
-    	CFLAGS="$CFLAGS -pipe -fno-common"
+    	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//'`
+    os2_emx)
+    	CFLAGS="$CFLAGS -DOS2"
 	;;
     osf*)
 	if test "$GCC" != "yes" ; then
@@ -1413,48 +1163,33 @@ case "$target_os" in
 	esac
 	;;
     cygwin*|mingw*)
+	EXPORT_PREFIX=' '
 	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
+	    RUBY_SO_NAME=$target_os-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
 	    AC_LIBOBJ([strftime])
-	    ;;
+	    CCDLFLAGS=-DUSEIMPORTLIB ;;
 	mingw*)
-	    RUBY_SO_NAME=${rb_cv_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
+	    RUBY_SO_NAME=msvcrt-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
 	    AC_LIBOBJ([win32])
 	    COMMON_LIBS=m
-#	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
+	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
 	    COMMON_HEADERS="windows.h winsock.h"
-	    ;;
+	    CCDLFLAGS=-DIMPORT ;;
 	esac
-	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
-	LIBRUBY_ALIASES=''
-	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
-	SOLIBS='$(LIBS)'
-	if test x"$enable_shared" = xno; then
+	if test x"$enable_shared" = xyes; then
+	    LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
+	    LIBRUBY_DLDFLAGS='-Wl,--out-implib=$(LIBRUBY) $(RUBYDEF)'
+	    LIBRUBY='lib$(LIBRUBY_SO).a'
+	else
 	    LIBRUBY_SO=dummy
+	    LIBRUBY_DLDFLAGS=''
 	    LIBRUBY='lib$(RUBY_SO_NAME).a'
 	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
 	fi
-	MINIOBJS=dmydln.o
-	;;
-    hpux*)
-	case "$YACC" in
-	  *yacc*)
-	    XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
-	    YACC="$YACC -Nl40000 -Nm40000"
-	    ;;
-	esac
-	MINIOBJS=dmydln.o
-	;;
-    aix*)
-	PREINSTALL='@$(RM) -r $(prefix)/lib/$(LIBRUBY_A) $(prefix)/lib/$(LIBRUBY_SO) $(prefix)/lib/ruby/$(MAJOR).$(MINOR)/$(arch)'
+	LIBRUBY_ALIASES=''
+	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
+	SOLIBS='$(LIBS)'
 	;;
     *)
 	;;
@@ -1464,8 +1199,6 @@ case "$build_os" in
   *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
 esac
 
-AC_SUBST(XCFLAGS)dnl
-AC_SUBST(XLDFLAGS)dnl
 AC_SUBST(LIBRUBY_LDSHARED)
 AC_SUBST(LIBRUBY_DLDFLAGS)
 AC_SUBST(RUBY_INSTALL_NAME)
@@ -1487,8 +1220,6 @@ AC_SUBST(COMMON_LIBS)
 AC_SUBST(COMMON_MACROS)
 AC_SUBST(COMMON_HEADERS)
 AC_SUBST(EXPORT_PREFIX)
-AC_SUBST(MINIOBJS)
-AC_SUBST(PREINSTALL)
 
 MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
 MAKEFILES="`echo $MAKEFILES`"
@@ -1510,7 +1241,7 @@ case "$target_os" in
     ;;
 esac
 case "$target_os" in
-  cygwin*|mingw*|*djgpp*|os2-emx*)
+  cygwin*|mingw*|*djgpp*|os2_emx*)
     RUBY_LIB_PREFIX="/lib/ruby"
     ;;
   *)
@@ -1523,9 +1254,9 @@ 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}\\"`
+SITE_DIR="`eval \"echo ${sitedir}\"`"
 case "$target_os" in
-  cygwin*|mingw*|*djgpp*|os2-emx*)
+  cygwin*|mingw*|*djgpp*|os2_emx*)
     RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
     RUBY_SITE_LIB_PATH="$SITE_DIR";;
   *)
@@ -1544,7 +1275,7 @@ AC_SUBST(sitedir)dnl
 configure_args=$ac_configure_args
 AC_SUBST(configure_args)dnl
 
-if test "$fat_binary" != no ; then
+if test "$fat_binary" = yes ; then
     arch="fat-${target_os}"
 
     AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
@@ -1559,7 +1290,7 @@ else
 fi
 
 case "$target_os" in
-  mingw*) sitearch="i386-$rb_cv_msvcrt" ;;
+  mingw*) sitearch="i386-msvcrt" ;;
   *) sitearch="${arch}" ;;
 esac
 
@@ -1603,10 +1334,5 @@ else
 fi
 : > confdefs.h
 
-AC_CONFIG_FILES($FIRSTMAKEFILE)
-AC_CONFIG_FILES(Makefile, [{
-	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
-	test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
-	sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
-} >> Makefile], [RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
+AC_CONFIG_FILES([$FIRSTMAKEFILE Makefile])
 AC_OUTPUT
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 03208df11c..0acb327bbd 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,21 +1,11 @@
 include Makefile
 
 ENABLE_SHARED=@ENABLE_SHARED@
-DLLWRAP = @DLLWRAP@ --target=@target_os@
-
-ifeq (@target_os@,cygwin)
-  DLL_BASE_NAME := $(subst .dll,,$(LIBRUBY_SO))
-else
-  DLL_BASE_NAME := $(RUBY_SO_NAME)
-  DLLWRAP += -mno-cygwin
-  VPATH += $(srcdir)/win32
-endif
 
 ifneq ($(ENABLE_SHARED),yes)
   RUBY_EXP = $(RUBY_INSTALL_NAME).exp
   EXTOBJS = $(RUBY_EXP)
   LIBRUBYARG = $(LIBRUBY_A)
-  LIBRUBY_SO =
 endif
 
 ifeq ($(RUBY_INSTALL_NAME),ruby)
@@ -23,25 +13,21 @@ ifeq ($(RUBY_INSTALL_NAME),ruby)
 else
   RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME))
 endif
-
 WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
-SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
+RUBYDEF = $(RUBY_INSTALL_NAME).def
+SOLIBS := $(RUBY_SO_NAME).res.@OBJEXT@ $(SOLIBS)
 EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
-RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
-
-ruby: $(PROGRAM)
-rubyw: $(WPROGRAM)
 
-$(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
-$(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
+$(LIBRUBY_SO): $(RUBYDEF) $(RUBY_SO_NAME).res.@OBJEXT@ $(RUBY_EXP)
+$(LIBRUBY): $(LIBRUBY_SO)
 
 %.res.@OBJEXT@: %.rc
 	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-$(RCFILES): $(RBCONFIG)
+$(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=$(DLL_BASE_NAME) \
+	  -so_name=$(RUBY_SO_NAME) \
 	  . $(icondirs) $(srcdir)/win32
 
 $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
@@ -50,29 +36,17 @@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
 	$(PURIFY) $(CC) -mwindows -e _mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
 	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
-$(RUBY_EXP): $(LIBRUBY_A)
-	$(DLLWRAP) \
-	  --output-exp=$(RUBY_EXP) \
-	  --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
-	$(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
-	@rm -f $(PROGRAM)
+$(RUBYDEF): $(LIBRUBY_A)
+	echo EXPORTS > $(RUBYDEF)
+	@NM@ --extern-only --defined-only $(LIBRUBY_A) | sed -n 's/.* [CDT] _//p' >> $(RUBYDEF)
+
+$(RUBY_EXP): $(RUBYDEF)
+	@DLLWRAP@ --output-exp=$(RUBY_EXP) --output-lib=$(LIBRUBY) \
+	  --def=$(RUBYDEF) $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
+	rm $(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
-
-clean-local::
-	@$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@)
-
-distclean-local::
-	@$(RM) $(RCFILES)
diff --git a/defines.h b/defines.h
index ef80989925..334be5268f 100644
--- a/defines.h
+++ b/defines.h
@@ -2,8 +2,8 @@
 
   defines.h -
 
-  $Author: nobu $
-  $Date: 2005/10/25 16:59:57 $
+  $Author$
+  $Date$
   created at: Wed May 18 00:21:44 JST 1994
 
 ************************************************/
@@ -12,6 +12,10 @@
 
 #define RUBY
 
+#if !defined(__STDC__) && !defined(_MSC_VER)
+# define volatile
+#endif
+
 #ifdef __cplusplus
 # ifndef  HAVE_PROTOTYPES
 #  define HAVE_PROTOTYPES 1
@@ -82,10 +86,6 @@ void xfree _((void*));
 # define BDIGIT_DBL_SIGNED long
 #endif
 
-#ifdef __CYGWIN__
-#undef _WIN32
-#endif
-
 #if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
 #define DOSISH 1
 #ifndef _WIN32_WCE
@@ -102,138 +102,57 @@ void xfree _((void*));
 #endif
 #endif
 
-#ifdef __NeXT__
-/* NextStep, OpenStep, Rhapsody */
-#ifndef S_IRUSR
-#define S_IRUSR 0000400        /* read permission, owner */
-#endif
-#ifndef S_IRGRP
-#define S_IRGRP 0000040        /* read permission, group */
-#endif
-#ifndef S_IROTH
-#define S_IROTH 0000004        /* read permission, other */
-#endif
-#ifndef S_IWUSR
-#define S_IWUSR 0000200        /* write permission, owner */
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP 0000020        /* write permission, group */
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH 0000002        /* write permission, other */
-#endif
-#ifndef S_IXUSR
-#define S_IXUSR 0000100        /* execute/search permission, owner */
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 0000010        /* execute/search permission, group */
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 0000001        /* execute/search permission, other */
-#endif
-#ifndef S_IRWXU
-#define S_IRWXU 0000700        /* read, write, execute permissions, owner */
-#endif
-#ifndef S_IRWXG
-#define S_IRWXG 0000070        /* read, write, execute permissions, group */
-#endif
-#ifndef S_IRWXO
-#define S_IRWXO 0000007        /* read, write, execute permissions, other */
-#endif
-#ifndef S_ISBLK
-#define S_ISBLK(mode)  (((mode) & (0170000)) == (0060000))
-#endif
-#ifndef S_ISCHR
-#define S_ISCHR(mode)  (((mode) & (0170000)) == (0020000))
-#endif
-#ifndef S_ISDIR
-#define S_ISDIR(mode)  (((mode) & (0170000)) == (0040000))
-#endif
-#ifndef S_ISFIFO
-#define S_ISFIFO(mode) (((mode) & (0170000)) == (0010000))
-#endif
-#ifndef S_ISREG
-#define S_ISREG(mode)  (((mode) & (0170000)) == (0100000))
-#endif
-/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may
-   result in a different endian.  Instead trust __BIG_ENDIAN__ and
-   __LITTLE_ENDIAN__ which are set correctly by -arch. */
-#undef WORDS_BIGENDIAN
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN
-#endif
+#ifdef NeXT
+#define DYNAMIC_ENDIAN		/* determine endian at runtime */
 #ifndef __APPLE__
-/* NextStep, OpenStep (but not Rhapsody) */
-#ifndef GETPGRP_VOID
-#define GETPGRP_VOID 1
-#endif
-#ifndef WNOHANG
-#define WNOHANG 01
+#define S_IXUSR _S_IXUSR        /* execute/search permission, owner */
 #endif
-#ifndef WUNTRACED
-#define WUNTRACED 02
-#endif
-#ifndef X_OK
-#define X_OK 1
-#endif
-#endif /* __APPLE__ */
+#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
 #include "win32/win32.h"
 #endif
 
 #if defined(__VMS)
-#include "vms.h"
-#endif
-
-#if defined(__BEOS__)
-#include <net/socket.h> /* intern.h needs fd_set definition */
+#include "vms/vms.h"
 #endif
 
-#ifdef RUBY_EXPORT
-#undef RUBY_EXTERN
-#endif
-
-#ifndef RUBY_EXTERN
-#define RUBY_EXTERN extern
+#if defined __CYGWIN__
+# undef EXTERN
+# if defined USEIMPORTLIB
+#  define EXTERN extern __declspec(dllimport)
+# else
+#  define EXTERN extern __declspec(dllexport)
+# endif
 #endif
 
 #ifndef EXTERN
-#define EXTERN RUBY_EXTERN	/* deprecated */
-#endif
-
-#ifndef RUBY_MBCHAR_MAXSIZE
-#define RUBY_MBCHAR_MAXSIZE INT_MAX
-        /* MB_CUR_MAX will not work well in C locale */
+#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")
-# else
-	("ta  0x03")
+# if defined(__sparc_v9__) || defined(__arch64__)
+    asm volatile ("flushw" : :);
+# elif defined(linux) || defined(__linux__)
+    asm volatile ("ta  0x83");
+# else /* Solaris, OpenBSD, NetBSD, etc. */
+    asm volatile ("ta  0x03");
 # endif /* trap always to flush register windows if we are on a Sparc system */
-	;
 }
 #  define FLUSH_REGISTER_WINDOWS flush_register_windows()
-#elif defined(__ia64__)
-void flush_register_windows(void)
-#  if defined(__GNUC__) && (( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3)
-__attribute__ ((noinline))
-#  endif
-  ;
-#  define FLUSH_REGISTER_WINDOWS flush_register_windows()
 #else
 #  define FLUSH_REGISTER_WINDOWS ((void)0)
-#endif
+#endif 
 
 #if defined(DOSISH)
 #define PATH_SEP ";"
@@ -245,13 +164,12 @@ __attribute__ ((noinline))
 #define PATH_SEP_CHAR PATH_SEP[0]
 
 #if defined(__human68k__)
-#define PATH_ENV "path"
-#else
-#define PATH_ENV "PATH"
+#undef HAVE_RANDOM
+#undef HAVE_SETITIMER
 #endif
 
-#if defined(DOSISH) && !defined(__human68k__) && !defined(__EMX__)
-#define ENV_IGNORECASE
+#if defined(DJGPP) || defined(__BOW__)
+#undef HAVE_SETITIMER
 #endif
 
 #ifndef RUBY_PLATFORM
diff --git a/dir.c b/dir.c
index 0798b3f76f..e3783b39f3 100644
--- a/dir.c
+++ b/dir.c
@@ -2,8 +2,8 @@
 
   dir.c -
 
-  $Author: shyouhei $
-  $Date: 2006/12/14 14:50:13 $
+  $Author$
+  $Date$
   created at: Wed Jan  5 09:51:01 JST 1994
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -29,12 +29,7 @@
 # define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
 # define dirent direct
-# if !defined __NeXT__
-#  define NAMLEN(dirent) (dirent)->d_namlen
-# else
-#  /* On some versions of NextStep, d_namlen is always zero, so avoid it. */
-#  define NAMLEN(dirent) strlen((dirent)->d_name)
-# endif
+# define NAMLEN(dirent) (dirent)->d_namlen
 # if HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
 # endif
@@ -63,27 +58,14 @@ char *strchr _((char*,char));
 
 #include "util.h"
 
-#if !defined HAVE_LSTAT && !defined lstat
-#define lstat stat
-#endif
-
-#ifndef CASEFOLD_FILESYSTEM
-# if defined DOSISH || defined __VMS
-#   define CASEFOLD_FILESYSTEM 1
-# else
-#   define CASEFOLD_FILESYSTEM 0
-# endif
+#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
-#if CASEFOLD_FILESYSTEM
-#define FNM_SYSCASE	FNM_CASEFOLD
-#else
-#define FNM_SYSCASE	0
-#endif
 
 #define FNM_NOMATCH	1
 #define FNM_ERROR	2
@@ -100,14 +82,26 @@ char *strchr _((char*,char));
 
 #if defined DOSISH
 #define isdirsep(c) ((c) == '/' || (c) == '\\')
+static char *
+find_dirsep(s)
+    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)
-    const char *pat;
-    int test;
+    char *pat;
+    char test;
     int flags;
 {
     int not, ok = 0;
@@ -120,25 +114,25 @@ range(pat, test, flags)
 
     test = downcase(test);
 
-    while (*pat != ']') {
+    while (*pat) {
 	int cstart, cend;
-        if (escape && *pat == '\\')
-	    pat++;
 	cstart = cend = *pat++;
-	if (!cstart)
-	    return NULL;
+	if (cstart == ']')
+	    return ok == not ? 0 : pat;
+        else if (escape && cstart == '\\')
+	    cstart = cend = *pat++;
 	if (*pat == '-' && pat[1] != ']') {
-	    pat++;
-	    if (escape && *pat == '\\')
+	    if (escape && pat[1] == '\\')
 		pat++;
-	    cend = *pat++;
+	    cend = pat[1];
 	    if (!cend)
-		return NULL;
+		return 0;
+	    pat += 2;
 	}
 	if (downcase(cstart) <= test && test <= downcase(cend))
 	    ok = 1;
     }
-    return ok == not ? NULL : (char *)pat + 1;
+    return 0;
 }
 
 #define ISDIRSEP(c) (pathname && isdirsep(c))
@@ -158,7 +152,7 @@ fnmatch(pat, string, flags)
     int period = !(flags & FNM_DOTMATCH);
     int nocase = flags & FNM_CASEFOLD;
 
-    while ((c = *pat++) != '\0') {
+    while (c = *pat++) {
 	switch (c) {
 	case '?':
 	    if (!*s || ISDIRSEP(*s) || PERIOD(s))
@@ -173,14 +167,14 @@ fnmatch(pat, string, flags)
 		return FNM_NOMATCH;
 
 	    if (!c) {
-		if (pathname && *rb_path_next(s))
+		if (pathname && find_dirsep(s))
 		    return FNM_NOMATCH;
 		else
 		    return 0;
 	    }
 	    else if (ISDIRSEP(c)) {
-		s = rb_path_next(s);
-		if (*s) {
+		s = find_dirsep(s);
+		if (s) {
                     s++;
 		    break;
                 }
@@ -191,7 +185,7 @@ fnmatch(pat, string, flags)
 	    test = downcase(test);
 	    pat--;
 	    while (*s) {
-		if ((c == '?' || c == '[' || downcase(*s) == test) &&
+		if ((c == '[' || downcase(*s) == test) &&
 		    !fnmatch(pat, s, flags | FNM_DOTMATCH))
 		    return 0;
 		else if (ISDIRSEP(*s))
@@ -199,12 +193,12 @@ fnmatch(pat, string, flags)
 		s++;
 	    }
 	    return FNM_NOMATCH;
-
+      
 	case '[':
 	    if (!*s || ISDIRSEP(*s) || PERIOD(s))
 		return FNM_NOMATCH;
 	    pat = range(pat, *s, flags);
-	    if (pat == NULL)
+	    if (!pat)
 		return FNM_NOMATCH;
 	    s++;
 	    break;
@@ -212,7 +206,7 @@ fnmatch(pat, string, flags)
 	case '\\':
 	    if (escape
 #if defined DOSISH
-		&& *pat && strchr("*?[]\\", *pat)
+		&& *pat && strchr("*?[\\", *pat)
 #endif
 		) {
 		c = *pat;
@@ -249,11 +243,7 @@ static void
 free_dir(dir)
     struct dir_data *dir;
 {
-    if (dir) {
-	if (dir->dir) closedir(dir->dir);
-	if (dir->path) free(dir->path);
-    }
-    free(dir);
+    if (dir && dir->dir) closedir(dir->dir);
 }
 
 static VALUE dir_close _((VALUE));
@@ -272,12 +262,6 @@ dir_s_alloc(klass)
     return obj;
 }
 
-/*
- *  call-seq:
- *     Dir.new( string ) -> aDir
- *
- *  Returns a new directory object for the named directory.
- */
 static VALUE
 dir_initialize(dir, dirname)
     VALUE dir, dirname;
@@ -305,18 +289,6 @@ dir_initialize(dir, dirname)
     return dir;
 }
 
-/*
- *  call-seq:
- *     Dir.open( string ) => aDir
- *     Dir.open( string ) {| aDir | block } => anObject
- *
- *  With no block, <code>open</code> is a synonym for
- *  <code>Dir::new</code>. If a block is present, it is passed
- *  <i>aDir</i> as a parameter. The directory is closed at the end of
- *  the block, and <code>Dir::open</code> returns the value of the
- *  block.
- */
-
 static VALUE
 dir_s_open(klass, dirname)
     VALUE klass, dirname;
@@ -338,30 +310,11 @@ dir_closed()
     rb_raise(rb_eIOError, "closed directory");
 }
 
-static void
-dir_check(dir)
-    VALUE dir;
-{
-    if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
-    rb_check_frozen(dir);
-}
-
 #define GetDIR(obj, dirp) do {\
-    dir_check(dir);\
     Data_Get_Struct(obj, struct dir_data, dirp);\
     if (dirp->dir == NULL) dir_closed();\
 } while (0)
 
-/*
- *  call-seq:
- *     dir.path => string or nil
- *
- *  Returns the path parameter passed to <em>dir</em>'s constructor.
- *
- *     d = Dir.new("..")
- *     d.path   #=> ".."
- */
 static VALUE
 dir_path(dir)
     VALUE dir;
@@ -373,18 +326,6 @@ dir_path(dir)
     return rb_str_new2(dirp->path);
 }
 
-/*
- *  call-seq:
- *     dir.read => string or nil
- *
- *  Reads the next entry from <em>dir</em> and returns it as a string.
- *  Returns <code>nil</code> at the end of the stream.
- *
- *     d = Dir.new("testdir")
- *     d.read   #=> "."
- *     d.read   #=> ".."
- *     d.read   #=> "config.h"
- */
 static VALUE
 dir_read(dir)
     VALUE dir;
@@ -407,23 +348,6 @@ dir_read(dir)
     return Qnil;		/* not reached */
 }
 
-/*
- *  call-seq:
- *     dir.each { |filename| block }  => dir
- *
- *  Calls the block once for each entry in this directory, passing the
- *  filename of each entry as a parameter to the block.
- *
- *     d = Dir.new("testdir")
- *     d.each  {|x| puts "Got #{x}" }
- *
- *  <em>produces:</em>
- *
- *     Got .
- *     Got ..
- *     Got config.h
- *     Got main.rb
- */
 static VALUE
 dir_each(dir)
     VALUE dir;
@@ -432,7 +356,6 @@ dir_each(dir)
     struct dirent *dp;
 
     GetDIR(dir, dirp);
-    rewinddir(dirp->dir);
     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();
@@ -440,19 +363,6 @@ dir_each(dir)
     return dir;
 }
 
-/*
- *  call-seq:
- *     dir.pos => integer
- *     dir.tell => integer
- *
- *  Returns the current position in <em>dir</em>. See also
- *  <code>Dir#seek</code>.
- *
- *     d = Dir.new("testdir")
- *     d.tell   #=> 0
- *     d.read   #=> "."
- *     d.tell   #=> 12
- */
 static VALUE
 dir_tell(dir)
     VALUE dir;
@@ -469,50 +379,21 @@ dir_tell(dir)
 #endif
 }
 
-/*
- *  call-seq:
- *     dir.seek( integer ) => dir
- *
- *  Seeks to a particular location in <em>dir</em>. <i>integer</i>
- *  must be a value returned by <code>Dir#tell</code>.
- *
- *     d = Dir.new("testdir")   #=> #<Dir:0x401b3c40>
- *     d.read                   #=> "."
- *     i = d.tell               #=> 12
- *     d.read                   #=> ".."
- *     d.seek(i)                #=> #<Dir:0x401b3c40>
- *     d.read                   #=> ".."
- */
 static VALUE
 dir_seek(dir, pos)
     VALUE dir, pos;
 {
     struct dir_data *dirp;
-    off_t p = NUM2OFFT(pos);
 
-    GetDIR(dir, dirp);
 #ifdef HAVE_SEEKDIR
-    seekdir(dirp->dir, p);
+    GetDIR(dir, dirp);
+    seekdir(dirp->dir, NUM2INT(pos));
     return dir;
 #else
     rb_notimplement();
 #endif
 }
 
-/*
- *  call-seq:
- *     dir.pos( integer ) => integer
- *
- *  Synonym for <code>Dir#seek</code>, but returns the position
- *  parameter.
- *
- *     d = Dir.new("testdir")   #=> #<Dir:0x401b3c40>
- *     d.read                   #=> "."
- *     i = d.pos                #=> 12
- *     d.read                   #=> ".."
- *     d.pos = i                #=> 12
- *     d.read                   #=> ".."
- */
 static VALUE
 dir_set_pos(dir, pos)
     VALUE dir, pos;
@@ -521,17 +402,6 @@ dir_set_pos(dir, pos)
     return pos;
 }
 
-/*
- *  call-seq:
- *     dir.rewind => dir
- *
- *  Repositions <em>dir</em> to the first entry.
- *
- *     d = Dir.new("testdir")
- *     d.read     #=> "."
- *     d.rewind   #=> #<Dir:0x401b3fb0>
- *     d.read     #=> "."
- */
 static VALUE
 dir_rewind(dir)
     VALUE dir;
@@ -543,25 +413,12 @@ dir_rewind(dir)
     return dir;
 }
 
-/*
- *  call-seq:
- *     dir.close => nil
- *
- *  Closes the directory stream. Any further attempts to access
- *  <em>dir</em> will raise an <code>IOError</code>.
- *
- *     d = Dir.new("testdir")
- *     d.close   #=> nil
- */
 static VALUE
 dir_close(dir)
     VALUE dir;
 {
     struct dir_data *dirp;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close");
-    }
     GetDIR(dir, dirp);
     closedir(dirp->dir);
     dirp->dir = NULL;
@@ -571,84 +428,27 @@ dir_close(dir)
 
 static void
 dir_chdir(path)
-    VALUE path;
+    const char *path;
 {
-    if (chdir(RSTRING(path)->ptr) < 0)
-	rb_sys_fail(RSTRING(path)->ptr);
+    if (chdir(path) < 0)
+	rb_sys_fail(path);
 }
 
 static int chdir_blocking = 0;
 static VALUE chdir_thread = Qnil;
 
-struct chdir_data {
-    VALUE old_path, new_path;
-    int done;
-};
-
 static VALUE
-chdir_yield(args)
-    struct chdir_data *args;
-{
-    dir_chdir(args->new_path);
-    args->done = Qtrue;
-    chdir_blocking++;
-    if (chdir_thread == Qnil)
-	chdir_thread = rb_thread_current();
-    return rb_yield(args->new_path);
-}
-
-static VALUE
-chdir_restore(args)
-    struct chdir_data *args;
+chdir_restore(path)
+    char *path;
 {
-    if (args->done) {
-	chdir_blocking--;
-	if (chdir_blocking == 0)
-	    chdir_thread = Qnil;
-	dir_chdir(args->old_path);
-    }
+    chdir_blocking--;
+    if (chdir_blocking == 0)
+	chdir_thread = Qnil;
+    dir_chdir(path);
+    free(path);
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     Dir.chdir( [ string] ) => 0
- *     Dir.chdir( [ string] ) {| path | block }  => anObject
- *
- *  Changes the current working directory of the process to the given
- *  string. When called without an argument, changes the directory to
- *  the value of the environment variable <code>HOME</code>, or
- *  <code>LOGDIR</code>. <code>SystemCallError</code> (probably
- *  <code>Errno::ENOENT</code>) if the target directory does not exist.
- *
- *  If a block is given, it is passed the name of the new current
- *  directory, and the block is executed with that as the current
- *  directory. The original working directory is restored when the block
- *  exits. The return value of <code>chdir</code> is the value of the
- *  block. <code>chdir</code> blocks can be nested, but in a
- *  multi-threaded program an error will be raised if a thread attempts
- *  to open a <code>chdir</code> block while another thread has one
- *  open.
- *
- *     Dir.chdir("/var/spool/mail")
- *     puts Dir.pwd
- *     Dir.chdir("/tmp") do
- *       puts Dir.pwd
- *       Dir.chdir("/usr") do
- *         puts Dir.pwd
- *       end
- *       puts Dir.pwd
- *     end
- *     puts Dir.pwd
- *
- *  <em>produces:</em>
- *
- *     /var/spool/mail
- *     /tmp
- *     /usr
- *     /tmp
- *     /var/spool/mail
- */
 static VALUE
 dir_s_chdir(argc, argv, obj)
     int argc;
@@ -656,18 +456,19 @@ dir_s_chdir(argc, argv, obj)
     VALUE obj;
 {
     VALUE path = Qnil;
+    char *dist = "";
 
     rb_secure(2);
     if (rb_scan_args(argc, argv, "01", &path) == 1) {
 	SafeStringValue(path);
+	dist = RSTRING(path)->ptr;
     }
     else {
-	const char *dist = getenv("HOME");
+	dist = getenv("HOME");
 	if (!dist) {
 	    dist = getenv("LOGDIR");
 	    if (!dist) rb_raise(rb_eArgError, "HOME/LOGDIR not set");
 	}
-	path = rb_str_new2(dist);
     }
 
     if (chdir_blocking > 0) {
@@ -676,75 +477,36 @@ dir_s_chdir(argc, argv, obj)
     }
 
     if (rb_block_given_p()) {
-	struct chdir_data args;
 	char *cwd = my_getcwd();
-
-	args.old_path = rb_tainted_str_new2(cwd); free(cwd);
-	args.new_path = path;
-	args.done = Qfalse;
-	return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
+	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(path);
+    dir_chdir(dist);
 
     return INT2FIX(0);
 }
 
-/*
- *  call-seq:
- *     Dir.getwd => string
- *     Dir.pwd => string
- *
- *  Returns the path to the current working directory of this process as
- *  a string.
- *
- *     Dir.chdir("/tmp")   #=> 0
- *     Dir.getwd           #=> "/tmp"
- */
 static VALUE
 dir_s_getwd(dir)
     VALUE dir;
 {
-    char *path;
-    VALUE cwd;
-
-    rb_secure(4);
-    path = my_getcwd();
-    cwd = rb_tainted_str_new2(path);
+    char *path = my_getcwd();
+    VALUE cwd = rb_tainted_str_new2(path);
 
     free(path);
     return cwd;
 }
 
-static void check_dirname _((volatile VALUE *));
-static void
-check_dirname(dir)
-    volatile VALUE *dir;
-{
-    char *path, *pend;
-
-    SafeStringValue(*dir);
-    rb_secure(2);
-    path = RSTRING(*dir)->ptr;
-    if (path && *(pend = rb_path_end(rb_path_skip_prefix(path)))) {
-	*dir = rb_str_new(path, pend - path);
-    }
-}
-
-/*
- *  call-seq:
- *     Dir.chroot( string ) => 0
- *
- *  Changes this process's idea of the file system root. Only a
- *  privileged process may make this call. Not available on all
- *  platforms. On Unix systems, see <code>chroot(2)</code> for more
- *  information.
- */
 static VALUE
 dir_s_chroot(dir, path)
     VALUE dir, path;
 {
 #if defined(HAVE_CHROOT) && !defined(__CHECKER__)
-    check_dirname(&path);
+    rb_secure(2);
+    SafeStringValue(path);
 
     if (chroot(RSTRING(path)->ptr) == -1)
 	rb_sys_fail(RSTRING(path)->ptr);
@@ -756,19 +518,6 @@ dir_s_chroot(dir, path)
 #endif
 }
 
-/*
- *  call-seq:
- *     Dir.mkdir( string [, integer] ) => 0
- *
- *  Makes a new directory named by <i>string</i>, with permissions
- *  specified by the optional parameter <i>anInteger</i>. The
- *  permissions may be modified by the value of
- *  <code>File::umask</code>, and are ignored on NT. Raises a
- *  <code>SystemCallError</code> if the directory cannot be created. See
- *  also the discussion of permissions in the class documentation for
- *  <code>File</code>.
- *
- */
 static VALUE
 dir_s_mkdir(argc, argv, obj)
     int argc;
@@ -785,60 +534,41 @@ dir_s_mkdir(argc, argv, obj)
 	mode = 0777;
     }
 
-    check_dirname(&path);
+    SafeStringValue(path);
+    rb_secure(2);
+#ifndef _WIN32
     if (mkdir(RSTRING(path)->ptr, mode) == -1)
 	rb_sys_fail(RSTRING(path)->ptr);
+#else
+    if (mkdir(RSTRING(path)->ptr) == -1)
+	rb_sys_fail(RSTRING(path)->ptr);
+#endif
 
     return INT2FIX(0);
 }
 
-/*
- *  call-seq:
- *     Dir.delete( string ) => 0
- *     Dir.rmdir( string ) => 0
- *     Dir.unlink( string ) => 0
- *
- *  Deletes the named directory. Raises a subclass of
- *  <code>SystemCallError</code> if the directory isn't empty.
- */
 static VALUE
 dir_s_rmdir(obj, dir)
     VALUE obj, dir;
 {
-    check_dirname(&dir);
+    SafeStringValue(dir);
+    rb_secure(2);
     if (rmdir(RSTRING(dir)->ptr) < 0)
 	rb_sys_fail(RSTRING(dir)->ptr);
 
     return INT2FIX(0);
 }
 
-static void
-sys_warning_1(mesg)
-    const char* mesg;
-{
-    rb_sys_warning("%s", mesg);
-}
-
-#define GLOB_VERBOSE	(1U << (sizeof(int) * CHAR_BIT - 1))
-#define sys_warning(val) \
-    (void)((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)_((VALUE)))sys_warning_1, (VALUE)(val), 0))
-
-#define GLOB_ALLOC(type) (type *)malloc(sizeof(type))
-#define GLOB_ALLOC_N(type, n) (type *)malloc(sizeof(type) * (n))
-#define GLOB_REALLOC_N(var, type, n) (type *)realloc((var), sizeof(type) * (n))
-#define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status))
-
 /* Return nonzero if S has any special globbing chars in it.  */
 static int
 has_magic(s, send, flags)
-    const char *s, *send;
-    int flags;
+     char *s, *send;
+     int flags;
 {
-    register const char *p = s;
+    register char *p = s;
     register char c;
     int open = 0;
-    const int escape = !(flags & FNM_NOESCAPE);
-    const int nocase = flags & FNM_CASEFOLD;
+    int escape = !(flags & FNM_NOESCAPE);
 
     while ((c = *p++) != '\0') {
 	switch (c) {
@@ -857,11 +587,6 @@ has_magic(s, send, flags)
 	  case '\\':
 	    if (escape && *p++ == '\0')
 		return Qfalse;
-	    break;
-
-	  default:
-	    if (!FNM_SYSCASE && ISALPHA(c) && nocase)
-		return Qtrue;
 	}
 
 	if (send && p >= send) break;
@@ -871,14 +596,13 @@ has_magic(s, send, flags)
 
 static char*
 extract_path(p, pend)
-    const char *p, *pend;
+    char *p, *pend;
 {
     char *alloc;
     int len;
 
     len = pend - p;
-    alloc = GLOB_ALLOC_N(char, len+1);
-    if (!alloc) return NULL;
+    alloc = ALLOC_N(char, len+1);
     memcpy(alloc, p, len);
     if (len > 1 && pend[-1] == '/'
 #if defined DOSISH_DRIVE_LETTER
@@ -896,9 +620,9 @@ extract_path(p, pend)
 
 static char*
 extract_elem(path)
-    const char *path;
+    char *path;
 {
-    const char *pend;
+    char *pend;
 
     pend = strchr(path, '/');
     if (!pend) pend = path + strlen(path);
@@ -939,65 +663,63 @@ glob_func_caller(val)
     VALUE val;
 {
     struct glob_args *args = (struct glob_args *)val;
-
     (*args->func)(args->c, args->v);
     return Qnil;
 }
 
-#define glob_call_func(func, path, arg) (*func)(path, arg)
+static int
+glob_call_func(func, path, arg)
+    void (*func) _((const char*, VALUE));
+    const char *path;
+    VALUE arg;
+{
+    int status;
+    struct glob_args args;
 
-static int glob_helper _((const char *path, const char *sub, int flags, int (*func)(const char *,VALUE), VALUE arg));
+    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)
-    const char *path;
-    const char *sub;
+    char *path;
+    char *sub;
     int flags;
-    int (*func) _((const char *, VALUE));
+    void (*func) _((const char*, VALUE));
     VALUE arg;
 {
     struct stat st;
-    const char *p, *m;
+    char *p, *m;
     int status = 0;
-    char *buf = 0;
-    char *newpath = 0;
-    char *newbuf;
 
     p = sub ? sub : path;
     if (!has_magic(p, 0, flags)) {
-#if !defined DOSISH
-	if (!(flags & FNM_NOESCAPE))
+#if defined DOSISH
+	remove_backslashes(path);
+#else
+	if (!(flags & FNM_NOESCAPE)) remove_backslashes(p);
 #endif
-	{
-	    newpath = strdup(path);
-	    if (!newpath) return -1;
-	    if (sub) {
-		p = newpath + (sub - path);
-		remove_backslashes(newpath + (sub - path));
-		sub = p;
-	    }
-	    else {
-		remove_backslashes(newpath);
-		p = path = newpath;
-	    }
-	}
 	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. */
-	    sys_warning(path);
+	    rb_sys_warning(path);
 	}
-	if (newpath) free(newpath);
-	return status;
+	return 0;
     }
 
     while (p && !status) {
 	if (*p == '/') p++;
 	m = strchr(p, '/');
 	if (has_magic(p, m, flags)) {
-	    char *dir, *base, *magic;
+	    char *dir, *base, *magic, *buf;
 	    DIR *dirp;
 	    struct dirent *dp;
 	    int recursive = 0;
@@ -1005,24 +727,15 @@ glob_helper(path, sub, flags, func, arg)
 	    struct d_link {
 		char *path;
 		struct d_link *next;
-	    } *tmp, *link, **tail = &link;
+	    } *tmp, *link = 0;
 
 	    base = extract_path(path, p);
-	    if (!base) {
-		status = -1;
-		break;
-	    }
 	    if (path == p) dir = ".";
 	    else dir = base;
 
 	    magic = extract_elem(p);
-	    if (!magic) {
-		status = -1;
-		break;
-	    }
 	    if (stat(dir, &st) < 0) {
-	        if (errno != ENOENT)
-		    sys_warning(dir);
+	        if (errno != ENOENT) rb_sys_warning(dir);
 	        free(base);
 	        free(magic);
 	        break;
@@ -1031,19 +744,15 @@ glob_helper(path, sub, flags, func, arg)
 		if (m && strcmp(magic, "**") == 0) {
 		    int n = strlen(base);
 		    recursive = 1;
-		    newbuf = GLOB_REALLOC_N(buf, char, n+strlen(m)+3);
-		    if (!newbuf) {
-			status = -1;
-			goto finalize;
-		    }
-		    buf = newbuf;
+		    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) {
-		    sys_warning(dir);
+		    rb_sys_warning(dir);
 		    free(base);
 		    free(magic);
 		    break;
@@ -1054,7 +763,7 @@ glob_helper(path, sub, flags, func, arg)
 		free(magic);
 		break;
 	    }
-
+	    
 #if defined DOSISH_DRIVE_LETTER
 #define BASE (*base && !((isdirsep(*base) && !base[1]) || (base[1] == ':' && isdirsep(base[2]) && !base[3])))
 #else
@@ -1065,18 +774,10 @@ glob_helper(path, sub, flags, func, arg)
 		if (recursive) {
 		    if (strcmp(".", dp->d_name) == 0 || strcmp("..", dp->d_name) == 0)
 			continue;
-		    if (fnmatch("*", dp->d_name, flags) != 0)
-			continue;
-		    newbuf = GLOB_REALLOC_N(buf, char, strlen(base)+NAMLEN(dp)+strlen(m)+6);
-		    if (!newbuf) {
-			status = -1;
-			break;
-		    }
-		    buf = newbuf;
+		    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)
-			    sys_warning(buf);
+			if (errno != ENOENT) rb_sys_warning(buf);
 			continue;
 		    }
 		    if (S_ISDIR(st.st_mode)) {
@@ -1084,38 +785,30 @@ glob_helper(path, sub, flags, func, arg)
 		        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) {
-		    newbuf = GLOB_REALLOC_N(buf, char, strlen(base)+NAMLEN(dp)+2);
-		    if (!newbuf) {
-			status = -1;
-			break;
-		    }
-		    buf = newbuf;
+		    buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+2);
 		    sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name);
 		    if (!m) {
 			status = glob_call_func(func, buf, arg);
+			free(buf);
 			if (status) break;
 			continue;
 		    }
-		    tmp = GLOB_ALLOC(struct d_link);
-		    if (!tmp) {
-			status = -1;
-			break;
-		    }
+		    tmp = ALLOC(struct d_link);
 		    tmp->path = buf;
-		    buf = 0;
-		    *tail = tmp;
-		    tail = &tmp->next;
+		    tmp->next = link;
+		    link = tmp;
 		}
 	    }
 	    closedir(dirp);
 	  finalize:
-	    *tail = 0;
 	    free(base);
 	    free(magic);
 	    if (link) {
@@ -1125,22 +818,17 @@ glob_helper(path, sub, flags, func, arg)
 			    if (S_ISDIR(st.st_mode)) {
 				int len = strlen(link->path);
 				int mlen = strlen(m);
+				char *t = ALLOC_N(char, len+mlen+1);
 
-				newbuf = GLOB_REALLOC_N(buf, char, len+mlen+1);
-				if (!newbuf) {
-				    status = -1;
-				    goto next_elem;
-				}
-				buf = newbuf;
-				sprintf(buf, "%s%s", link->path, m);
-				status = glob_helper(buf, buf+len, flags, func, arg);
+				sprintf(t, "%s%s", link->path, m);
+				status = glob_helper(t, t+len, flags, func, arg);
+				free(t);
 			    }
 			}
 			else {
-			    sys_warning(link->path);
+			    rb_sys_warning(link->path);
 			}
 		    }
-		  next_elem:
 		    tmp = link;
 		    link = link->next;
 		    free(tmp->path);
@@ -1151,81 +839,36 @@ glob_helper(path, sub, flags, func, arg)
 	}
 	p = m;
     }
-    if (buf) free(buf);
-    if (newpath) free(newpath);
-    return status;
-}
-
-int
-ruby_glob(path, flags, func, arg)
-    const char *path;
-    int flags;
-    int (*func) _((const char *, VALUE));
-    VALUE arg;
-{
-    flags |= FNM_SYSCASE;
-    return glob_helper(path, 0, flags & ~GLOB_VERBOSE, func, arg);
-}
-
-int
-ruby_globi(path, flags, func, arg)
-    const char *path;
-    int flags;
-    int (*func) _((const char *, VALUE));
-    VALUE arg;
-{
-    return glob_helper(path, 0, flags | FNM_CASEFOLD, func, arg);
-}
-
-static int rb_glob_caller _((const char *, VALUE));
-
-static int
-rb_glob_caller(path, a)
-    const char *path;
-    VALUE a;
-{
-    int status;
-    struct glob_args *args = (struct glob_args *)a;
-
-    args->c = path;
-    rb_protect(glob_func_caller, a, &status);
     return status;
 }
 
-static int
+static void
 rb_glob2(path, flags, func, arg)
-    const char *path;
+    char *path;
     int flags;
-    void (*func) _((const char *, VALUE));
+    void (*func) _((const char*, VALUE));
     VALUE arg;
 {
-    struct glob_args args;
-
-    args.func = func;
-    args.v = arg;
-
-    flags |= FNM_SYSCASE;
-    return glob_helper(path, 0, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
+    int status = glob_helper(path, 0, flags, func, arg);
+    if (status) rb_jump_tag(status);
 }
 
 void
 rb_glob(path, func, arg)
-    const char *path;
+    char *path;
     void (*func) _((const char*, VALUE));
     VALUE arg;
 {
-    int status = rb_glob2(path, 0, func, arg);
-    if (status) rb_jump_tag(status);
+    rb_glob2(path, 0, func, arg);
 }
 
 void
 rb_globi(path, func, arg)
-    const char *path;
+    char *path;
     void (*func) _((const char*, VALUE));
     VALUE arg;
 {
-    int status = rb_glob2(path, FNM_CASEFOLD, func, arg);
-    if (status) rb_jump_tag(status);
+    rb_glob2(path, FNM_CASEFOLD, func, arg);
 }
 
 static void
@@ -1233,32 +876,37 @@ push_pattern(path, ary)
     const char *path;
     VALUE ary;
 {
-    rb_ary_push(ary, rb_tainted_str_new2(path));
+    VALUE str = rb_tainted_str_new2(path);
+
+    if (ary) {
+	rb_ary_push(ary, str);
+    }
+    else {
+	rb_yield(str);
+    }
 }
 
-static int
+static void
 push_globs(ary, s, flags)
     VALUE ary;
-    const char *s;
+    char *s;
     int flags;
 {
-    return rb_glob2(s, flags, push_pattern, ary);
+    rb_glob2(s, flags, push_pattern, ary);
 }
 
-static int
-push_braces(ary, str, flags)
+static void
+push_braces(ary, s, flags)
     VALUE ary;
-    const char *str;
+    char *s;
     int flags;
 {
-    char *buf = 0;
-    char *b, *newbuf;
-    const char *s, *p, *t;
-    const char *lbrace, *rbrace;
+    char *buf;
+    char *p, *t, *b;
+    char *lbrace, *rbrace;
     int nest = 0;
-    int status = 0;
 
-    s = p = str;
+    p = s;
     lbrace = rbrace = 0;
     while (*p) {
 	if (*p == '{') {
@@ -1276,40 +924,27 @@ push_braces(ary, str, flags)
 	p++;
     }
 
-    if (lbrace && rbrace) {
+    if (lbrace) {
 	int len = strlen(s);
+	buf = xmalloc(len + 1);
+	memcpy(buf, s, lbrace-s);
+	b = buf + (lbrace-s);
 	p = lbrace;
 	while (*p != '}') {
 	    t = p + 1;
 	    for (p = t; *p!='}' && *p!=','; p++) {
 		/* skip inner braces */
-		if (*p == '{') {
-		    nest = 1;
-		    while (*++p != '}' || --nest) {
-			if (*p == '{') nest++;
-		    }
-		}
-	    }
-	    newbuf = GLOB_REALLOC_N(buf, char, len+1);
-	    if (!newbuf) {
-		status = -1;
-		break;
+		if (*p == '{') while (*p!='}') p++;
 	    }
-	    buf = newbuf;
-	    memcpy(buf, s, lbrace-s);
-	    b = buf + (lbrace-s);
 	    memcpy(b, t, p-t);
 	    strcpy(b+(p-t), rbrace+1);
-	    status = push_braces(ary, buf, flags);
-	    if (status) break;
+	    push_braces(ary, buf, flags);
 	}
+	free(buf);
     }
     else {
-	status = push_globs(ary, str, flags);
+	push_globs(ary, s, flags);
     }
-    if (buf) free(buf);
-
-    return status;
 }
 
 #define isdelim(c) ((c)=='\0')
@@ -1319,55 +954,51 @@ rb_push_glob(str, flags)
     VALUE str;
     int flags;
 {
-    const char *p, *pend, *buf;
+    char *p, *pend;
+    char *buf;
+    char *t;
     int nest, maxnest;
-    int status = 0;
     int noescape = flags & FNM_NOESCAPE;
     VALUE ary;
 
-    ary = rb_ary_new();
+    if (rb_block_given_p())
+	ary = 0;
+    else
+	ary = rb_ary_new();
+
     SafeStringValue(str);
+    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++;
-	buf = p;
 	while (p < pend && !isdelim(*p)) {
 	    if (*p == '{') nest++, maxnest++;
 	    if (*p == '}') nest--;
 	    if (!noescape && *p == '\\') {
-		if (++p == pend) break;
+		*t++ = *p++;
+		if (p == pend) break;
 	    }
-	    p++;
+	    *t++ = *p++;
 	}
+	*t = '\0';
 	if (maxnest == 0) {
-	    status = push_globs(ary, buf, flags);
-	    if (status) break;
+	    push_globs(ary, buf, flags);
 	}
 	else if (nest == 0) {
-	    status = push_braces(ary, buf, flags);
-	    if (status) break;
+	    push_braces(ary, buf, flags);
 	}
 	/* else unmatched braces */
     }
-    if (status) GLOB_JUMP_TAG(status);
-    if (rb_block_given_p()) {
-	rb_ary_each(ary);
-	return Qnil;
-    }
+    free(buf);
+
     return ary;
 }
 
-/*
- *  call-seq:
- *     Dir[ string ] => array
- *
- *  Equivalent to calling
- *  <em>dir</em>.<code>glob(</code><i>string,</i><code>0)</code>.
- *
- */
 static VALUE
 dir_s_aref(obj, str)
     VALUE obj, str;
@@ -1375,64 +1006,6 @@ dir_s_aref(obj, str)
     return rb_push_glob(str, 0);
 }
 
-/*
- *  call-seq:
- *     Dir.glob( string, [flags] ) => array
- *     Dir.glob( string, [flags] ) {| filename | block }  => nil
- *
- *  Returns the filenames found by expanding the pattern given in
- *  <i>string</i>, either as an <i>array</i> or as parameters to the
- *  block. Note that this pattern is not a regexp (it's closer to a
- *  shell glob). See <code>File::fnmatch</code> for the meaning of
- *  the <i>flags</i> parameter.
- *
- *  <code>*</code>::        Matches any file. Can be restricted by
- *                          other values in the glob. <code>*</code>
- *                          will match all files; <code>c*</code> will
- *                          match all files beginning with
- *                          <code>c</code>; <code>*c</code> will match
- *                          all files ending with <code>c</code>; and
- *                          <code>*c*</code> will match all files that
- *                          have <code>c</code> in them (including at
- *                          the beginning or end). Equivalent to
- *                          <code>/ .* /x</code> in regexp.
- *  <code>**</code>::       Matches directories recursively.
- *  <code>?</code>::        Matches any one character. Equivalent to
- *                          <code>/.{1}/</code> in regexp.
- *  <code>[set]</code>::    Matches any one character in +set+.
- *                          Behaves exactly like character sets in
- *                          Regexp, including set negation
- *                          (<code>[^a-z]</code>).
- *  <code>{p,q}</code>::    Matches either literal <code>p</code> or
- *                          literal <code>q</code>. Matching literals
- *                          may be more than one character in length.
- *                          More than two literals may be specified.
- *                          Equivalent to pattern alternation in
- *                          regexp.
- *  <code>\</code>::        Escapes the next metacharacter.
- *
- *     Dir["config.?"]                     #=> ["config.h"]
- *     Dir.glob("config.?")                #=> ["config.h"]
- *     Dir.glob("*.[a-z][a-z]")            #=> ["main.rb"]
- *     Dir.glob("*.[^r]*")                 #=> ["config.h"]
- *     Dir.glob("*.{rb,h}")                #=> ["main.rb", "config.h"]
- *     Dir.glob("*")                       #=> ["config.h", "main.rb"]
- *     Dir.glob("*", File::FNM_DOTMATCH)   #=> [".", "..", "config.h", "main.rb"]
- *
- *     rbfiles = File.join("**", "*.rb")
- *     Dir.glob(rbfiles)                   #=> ["main.rb",
- *                                              "lib/song.rb",
- *                                              "lib/song/karaoke.rb"]
- *     libdirs = File.join("**", "lib")
- *     Dir.glob(libdirs)                   #=> ["lib"]
- *
- *     librbfiles = File.join("**", "lib", "**", "*.rb")
- *     Dir.glob(librbfiles)                #=> ["lib/song.rb",
- *                                              "lib/song/karaoke.rb"]
- *
- *     librbfiles = File.join("**", "lib", "*.rb")
- *     Dir.glob(librbfiles)                #=> ["lib/song.rb"]
- */
 static VALUE
 dir_s_glob(argc, argv, obj)
     int argc;
@@ -1451,127 +1024,26 @@ dir_s_glob(argc, argv, obj)
 }
 
 static VALUE
-dir_open_dir(path)
-    VALUE path;
-{
-    VALUE dir = rb_funcall(rb_cDir, rb_intern("open"), 1, path);
-
-    if (TYPE(dir) != T_DATA ||
-	RDATA(dir)->dfree != (RUBY_DATA_FUNC)free_dir) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Dir)",
-		 rb_obj_classname(dir));
-    }
-    return dir;
-}
-
-
-/*
- *  call-seq:
- *     Dir.foreach( dirname ) {| filename | block }  => nil
- *
- *  Calls the block once for each entry in the named directory, passing
- *  the filename of each entry as a parameter to the block.
- *
- *     Dir.foreach("testdir") {|x| puts "Got #{x}" }
- *
- *  <em>produces:</em>
- *
- *     Got .
- *     Got ..
- *     Got config.h
- *     Got main.rb
- *
- */
-static VALUE
 dir_foreach(io, dirname)
     VALUE io, dirname;
 {
     VALUE dir;
 
-    dir = dir_open_dir(dirname);
+    dir = rb_funcall(rb_cDir, rb_intern("open"), 1, dirname);
     rb_ensure(dir_each, dir, dir_close, dir);
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     Dir.entries( dirname ) => array
- *
- *  Returns an array containing all of the filenames in the given
- *  directory. Will raise a <code>SystemCallError</code> if the named
- *  directory doesn't exist.
- *
- *     Dir.entries("testdir")   #=> [".", "..", "config.h", "main.rb"]
- *
- */
 static VALUE
 dir_entries(io, dirname)
     VALUE io, dirname;
 {
     VALUE dir;
 
-    dir = dir_open_dir(dirname);
+    dir = rb_funcall(rb_cDir, rb_intern("open"), 1, dirname);
     return rb_ensure(rb_Array, dir, dir_close, dir);
 }
 
-/*
- *  call-seq:
- *     File.fnmatch( pattern, path, [flags] ) => (true or false)
- *     File.fnmatch?( pattern, path, [flags] ) => (true or false)
- *
- *  Returns true if <i>path</i> matches against <i>pattern</i> The
- *  pattern is not a regular expression; instead it follows rules
- *  similar to shell filename globbing. It may contain the following
- *  metacharacters:
- *
- *  <code>*</code>::        Matches any file. Can be restricted by
- *                          other values in the glob. <code>*</code>
- *                          will match all files; <code>c*</code> will
- *                          match all files beginning with
- *                          <code>c</code>; <code>*c</code> will match
- *                          all files ending with <code>c</code>; and
- *                          <code>*c*</code> will match all files that
- *                          have <code>c</code> in them (including at
- *                          the beginning or end). Equivalent to
- *                          <code>/ .* /x</code> in regexp.
- *  <code>?</code>::        Matches any one character. Equivalent to
- *                          <code>/.{1}/</code> in regexp.
- *  <code>[set]</code>::    Matches any one character in +set+.
- *                          Behaves exactly like character sets in
- *                          Regexp, including set negation
- *                          (<code>[^a-z]</code>).
- *  <code>\</code>::        Escapes the next metacharacter.
- *
- *  <i>flags</i> is a bitwise OR of the <code>FNM_xxx</code>
- *  parameters. The same glob pattern and flags are used by
- *  <code>Dir::glob</code>.
- *
- *     File.fnmatch('cat',       'cat')        #=> true
- *     File.fnmatch('cat',       'category')   #=> false
- *     File.fnmatch('c{at,ub}s', 'cats')       #=> false
- *     File.fnmatch('c{at,ub}s', 'cubs')       #=> false
- *     File.fnmatch('c{at,ub}s', 'cat')        #=> false
- *
- *     File.fnmatch('c?t',    'cat')                       #=> true
- *     File.fnmatch('c\?t',   'cat')                       #=> false
- *     File.fnmatch('c??t',   'cat')                       #=> false
- *     File.fnmatch('c*',     'cats')                      #=> true
- *     File.fnmatch('c/ * FIXME * /t', 'c/a/b/c/t')                 #=> true
- *     File.fnmatch('c*t',    'cat')                       #=> true
- *     File.fnmatch('c\at',   'cat')                       #=> true
- *     File.fnmatch('c\at',   'cat', File::FNM_NOESCAPE)   #=> false
- *     File.fnmatch('a?b',    'a/b')                       #=> true
- *     File.fnmatch('a?b',    'a/b', File::FNM_PATHNAME)   #=> false
- *
- *     File.fnmatch('*',   '.profile')                            #=> false
- *     File.fnmatch('*',   '.profile', File::FNM_DOTMATCH)        #=> true
- *     File.fnmatch('*',   'dave/.profile')                       #=> true
- *     File.fnmatch('*',   'dave/.profile', File::FNM_DOTMATCH)   #=> true
- *     File.fnmatch('*',   'dave/.profile', File::FNM_PATHNAME)   #=> false
- *     File.fnmatch('* / FIXME *', 'dave/.profile', File::FNM_PATHNAME)   #=> false
- *     STRICT = File::FNM_PATHNAME | File::FNM_DOTMATCH
- *     File.fnmatch('* / FIXME *', 'dave/.profile', STRICT)               #=> true
- */
 static VALUE
 file_s_fnmatch(argc, argv, obj)
     int argc;
@@ -1596,17 +1068,6 @@ file_s_fnmatch(argc, argv, obj)
     return Qfalse;
 }
 
-/*
- *  Objects of class <code>Dir</code> are directory streams representing
- *  directories in the underlying file system. They provide a variety of
- *  ways to list directories and their contents. See also
- *  <code>File</code>.
- *
- *  The directory used in these examples contains the two regular files
- *  (<code>config.h</code> and <code>main.rb</code>), the parent
- *  directory (<code>..</code>), and the directory itself
- *  (<code>.</code>).
- */
 void
 Init_Dir()
 {
@@ -1649,5 +1110,4 @@ Init_Dir()
     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_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE));
 }
diff --git a/distruby.rb b/distruby.rb
deleted file mode 100644
index 613da0eb9c..0000000000
--- a/distruby.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#!./miniruby
-
-if RUBY_PATCHLEVEL.zero?
-	dirname = sprintf 'ruby-%s', RUBY_VERSION
-	tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)/, 'v\1_\2_\3'
-else
-	dirname = sprintf 'ruby-%s-p%u', RUBY_VERSION, RUBY_PATCHLEVEL
-	tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)-p/, 'v\1_\2_\3_'
-end
-tgzname = dirname + '.tar.gz'
-tbzname = dirname + '.tar.bz2'
-zipname = dirname + '.zip'
-repos   = 'http://svn.ruby-lang.org/repos/ruby/tags/' + tagname
-
-STDERR.puts 'exporting sources...'
-system 'svn',  'export',  '-q', repos, dirname
-Dir.chdir dirname do
-	STDERR.puts 'generating configure...'
-	system 'autoconf'
-	system 'rm', '-rf', 'autom4te.cache'
-
-	STDERR.puts 'generating parse.c...'
-	system 'bison', '-y', '-o', 'parse.c', 'parse.y'
-end
-
-STDERR.puts 'generating tarballs...'
-ENV['GZIP'] = '-9'
-system 'tar', 'chofzp', tgzname, dirname
-system 'tar', 'chojfp', tbzname, dirname
-system 'zip', '-q9r', zipname, dirname
-
-require 'digest/md5'
-require 'digest/sha2'
-for name in [tgzname, tbzname, zipname] do
-	open name, 'rb' do |fp|
-		str = fp.read
-		md5 = Digest::MD5.hexdigest str
-		sha = Digest::SHA256.hexdigest str
-		printf "MD5(%s)= %s\nSHA256(%s)= %s\nSIZE(%s)= %s\n\n",
-				 name, md5,
-				 name, sha,
-				 name, str.size
-	end
-end
-
-
-
-# 
-# Local Variables:
-# mode: ruby
-# code: utf-8
-# indent-tabs-mode: t
-# tab-width: 3
-# ruby-indent-level: 3
-# fill-column: 79
-# default-justification: full
-# End:
-# vi: ts=3 sw=3
-
diff --git a/djgpp/config.status b/djgpp/config.status
new file mode 100644
index 0000000000..7a10754d1d
--- /dev/null
+++ b/djgpp/config.status
@@ -0,0 +1,77 @@
+/^SHELL/s,/bin/sh,$(COMPSEC),
+s%@srcdir@%.%g
+s%@top_srcdir@%..%
+s%@CFLAGS@%-O2%g
+s%@CPPFLAGS@%%g
+s%@CXXFLAGS@%%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-msdosdjgpp%g
+s%@host_alias@%i386-msdosdjgpp%g
+s%@host_cpu@%i386%g
+s%@host_vendor@%pc%g
+s%@host_os@%msdosdjgpp%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 vsnprintf.o%g
+s%@ALLOCA@%%g
+s%@DEFAULT_KCODE@%%g
+s%@EXEEXT@%.exe%g
+s%@OBJEXT@%o%g
+s%@XLDFLAGS@%%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.dj%g
+s%@LIBRUBY@%libruby.a%g
+s%@LIBRUBY_A@%libruby.a%g
+s%@LIBRUBYARG@%libruby.a%g
+s%@LIBRUBY_SO@%%g
+s%@SOLIBS@%%g
+s%@arch@%i386-msdosdjgpp%g
+;s%/bin/rm%rm%
+s%@DLDLIBS@%-lc%g
+s%@PREP@%%
+s%@RUBY_INSTALL_NAME@%ruby%g
+s%@RUBY_SO_NAME@%%g
+s%@arch@%i386-msdosdjgpp%g
+s%@sitedir@%${prefix}/lib/ruby/site_ruby%g
+s%@MINIRUBY@%./miniruby%
+s%@archlib@%/usr/local/lib/ruby/i386-msdosdjgpp%
+;s%|| true%%
+;/\/dev\/null/ {
+;s,/dev/null 2>&1, nul,
+;s,2> /dev/null,,
+;}
+;/^config.status/ {
+;    N;N;N;N;N;d
+;}
+;s%y\.tab\.c%y_tab.c%
+/^,THIS_IS_DUMMY_PATTERN_/i\
+ac_given_srcdir=.
diff --git a/djgpp/configure.bat b/djgpp/configure.bat
index e6a5d79d4a..e6a5d79d4a 100755..100644
--- a/djgpp/configure.bat
+++ b/djgpp/configure.bat
diff --git a/dln.c b/dln.c
index fd59bdab8e..3222b30743 100644
--- a/dln.c
+++ b/dln.c
@@ -2,8 +2,8 @@
 
   dln.c -
 
-  $Author: matz $
-  $Date: 2006/08/07 03:43:39 $
+  $Author$
+  $Date$
   created at: Tue Jan 18 17:05:06 JST 1994
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -27,7 +27,11 @@
 char *dln_argv0;
 #endif
 
-#if defined(HAVE_ALLOCA_H)
+#ifdef _AIX
+#pragma alloca
+#endif
+
+#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
 #include <alloca.h>
 #endif
 
@@ -85,9 +89,9 @@ char *getenv();
 # include <image.h>
 #endif
 
-#ifndef NO_DLN_LOAD
+int eaccess();
 
-#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(__APPLE__) && !defined(_UNICOSMP)
+#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(__APPLE__)
 /* dynamic load with dlopen() */
 # define USE_DLN_DLOPEN
 #endif
@@ -156,7 +160,7 @@ static int dln_errno;
 
 #define DLN_ENOEXEC	ENOEXEC	/* Exec format error */
 #define DLN_ECONFL	1201	/* Symbol name conflict */
-#define DLN_ENOINIT	1202	/* No initializer given */
+#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 */
@@ -391,7 +395,7 @@ dln_init(prog)
 	if (c != '!') goto err_noexec;
 
 	p = buf;
-	/* skip forwarding spaces */
+	/* skip forwading spaces */
 	while (read(fd, &c, 1) == 1) {
 	    if (c == '\n') goto err_noexec;
 	    if (c != '\t' && c != ' ') {
@@ -671,7 +675,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);
 		}
@@ -684,7 +688,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);
 		}
 	    }
@@ -752,7 +756,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);
 	    }
@@ -956,9 +960,8 @@ load_lib(lib)
     dln_errno = DLN_EBADLIB;
 
     if (lib[0] == '-' && lib[1] == 'l') {
-	long len = strlen(lib) + 4;
-	char *p = alloca(len);
-	snprintf(p, len, "lib%s.a", lib+2);
+	char *p = alloca(strlen(lib) + 4);
+	sprintf(p, "lib%s.a", lib+2);
 	lib = p;
     }
 
@@ -1112,7 +1115,7 @@ dln_sym(name)
 #endif /* USE_DLN_A_OUT */
 
 #ifdef USE_DLN_DLOPEN
-# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
+# ifdef __NetBSD__
 #  include <nlist.h>
 #  include <link.h>
 # else
@@ -1136,15 +1139,12 @@ dln_sym(name)
 #include <mach-o/rld.h>
 #else
 #include <mach-o/dyld.h>
-#ifndef NSLINKMODULE_OPTION_BINDNOW
-#define NSLINKMODULE_OPTION_BINDNOW 1
 #endif
 #endif
-#else
 #ifdef __APPLE__
 #include <mach-o/dyld.h>
 #endif
-#endif
+
 
 #if defined _WIN32 && !defined __CYGWIN__
 #include <windows.h>
@@ -1169,7 +1169,7 @@ dln_strerror()
       case DLN_ECONFL:
 	return "Symbol name conflict";
       case DLN_ENOINIT:
-	return "No initializer given";
+	return "No inititalizer given";
       case DLN_EUNDEF:
 	return "Unresolved symbols";
       case DLN_ENOTLIB:
@@ -1218,7 +1218,7 @@ aix_loaderror(const char *pathname)
     int i,j;
 
     struct errtab { 
-	int errnum;
+	int errno;
 	char *errstr;
     } load_errtab[] = {
 	{L_ERROR_TOOMANY,	"too many errors, rest skipped."},
@@ -1230,7 +1230,7 @@ aix_loaderror(const char *pathname)
 	{L_ERROR_MEMBER,
 	     "file not an archive or does not contain requested member:"},
 	{L_ERROR_TYPE,		"symbol table mismatch:"},
-	{L_ERROR_ALIGN,		"text alignment in file is wrong."},
+	{L_ERROR_ALIGN,		"text allignment in file is wrong."},
 	{L_ERROR_SYSTEM,	"System error:"},
 	{L_ERROR_ERRNO,		NULL}
     };
@@ -1245,7 +1245,7 @@ aix_loaderror(const char *pathname)
     for(i = 0; message[i] && *message[i]; i++) {
 	int nerr = atoi(message[i]);
 	for (j=0; j<LOAD_ERRTAB_LEN; j++) {
-           if (nerr == load_errtab[i].errnum && load_errtab[i].errstr)
+	    if (nerr == load_errtab[i].errno && load_errtab[i].errstr)
 		ERRBUF_APPEND(load_errtab[i].errstr);
 	}
 	while (isdigit(*message[i])) message[i]++; 
@@ -1258,29 +1258,10 @@ aix_loaderror(const char *pathname)
 }
 #endif
 
-#if defined(__VMS)
-#include <starlet.h>
-#include <rms.h>
-#include <stsdef.h>
-#include <unixlib.h>
-#include <descrip.h>
-#include <lib$routines.h>
-
-static char *vms_filespec;
-static int vms_fileact(char *filespec, int type);
-static long vms_fisexh(long *sigarr, long *mecarr);
-#endif
-
-#endif /* NO_DLN_LOAD */
-
 void*
 dln_load(file)
     const char *file;
 {
-#ifdef NO_DLN_LOAD
-    rb_raise(rb_eLoadError, "this executable file can't load extension libraries");
-#else
-
 #if !defined(_AIX) && !defined(NeXT)
     const char *error = 0;
 #define DLN_ERROR() (error = dln_strerror(), strcpy(ALLOCA_N(char, strlen(error) + 1), error))
@@ -1334,9 +1315,6 @@ dln_load(file)
 #ifndef RTLD_LAZY
 # define RTLD_LAZY 1
 #endif
-#ifdef __INTERIX
-# undef RTLD_GLOBAL
-#endif
 #ifndef RTLD_GLOBAL
 # define RTLD_GLOBAL 0
 #endif
@@ -1411,41 +1389,30 @@ dln_load(file)
    Special Thanks...
     Yu tomoak-i@is.aist-nara.ac.jp,
     Mi hisho@tasihara.nest.or.jp,
-    sunshine@sunshineco.com,
     and... Miss ARAI Akino(^^;)
  ----------------------------------------------------*/
 #if defined(NeXT) && (NS_TARGET_MAJOR < 4)/* NeXTSTEP rld functions */
 
     {
-        NXStream* s;
 	unsigned long init_address;
 	char *object_files[2] = {NULL, NULL};
 
 	void (*init_fct)();
 	
-	object_files[0] = (char*)file;
+	object_files[0] = file;
 	
-	s = NXOpenFile(2,NX_WRITEONLY);
-
 	/* Load object file, if return value ==0 ,  load failed*/
-	if(rld_load(s, NULL, object_files, NULL) == 0) {
-	    NXFlush(s);
-	    NXClose(s);
+	if(rld_load(NULL, NULL, object_files, NULL) == 0) {
 	    rb_loaderror("Failed to load %.200s", file);
 	}
 
 	/* lookup the initial function */
-	if(rld_lookup(s, buf, &init_address) == 0) {
-	    NXFlush(s);
-	    NXClose(s);
+	if(rld_lookup(NULL, buf, &init_address) == 0) {
 	    rb_loaderror("Failed to lookup Init function %.200s", file);
 	}
 
-	NXFlush(s);
-	NXClose(s);
-
-	/* Cannot call *init_address directory, so copy this value to
-	   funtion pointer */
+	 /* Cannot call *init_address directory, so copy this value to
+	    funtion pointer */
 	init_fct = (void(*)())init_address;
 	(*init_fct)();
 	return (void*)init_address;
@@ -1577,16 +1544,9 @@ dln_load(file)
 #if defined(__VMS)
 #define DLN_DEFINED
     {
-	long status;
-	void (*init_fct)();
+	void *handle, (*init_fct)();
 	char *fname, *p1, *p2;
 
-	$DESCRIPTOR(fname_d, "");
-	$DESCRIPTOR(image_d, "");
-	$DESCRIPTOR(buf_d, "");
-
-	decc$to_vms(file, vms_fileact, 0, 0);
-
 	fname = (char *)__alloca(strlen(file)+1);
 	strcpy(fname,file);
 	if (p1 = strrchr(fname,'/'))
@@ -1594,35 +1554,19 @@ dln_load(file)
 	if (p2 = strrchr(fname,'.'))
 	    *p2 = '\0';
 
-	fname_d.dsc$w_length  = strlen(fname);
-	fname_d.dsc$a_pointer = fname;
-	image_d.dsc$w_length  = strlen(vms_filespec);
-	image_d.dsc$a_pointer = vms_filespec;
-	buf_d.dsc$w_length    = strlen(buf);
-	buf_d.dsc$a_pointer   = buf;
-
-	lib$establish(vms_fisexh);
-
-	status = lib$find_image_symbol (
-		     &fname_d,
-		     &buf_d, 
-		     &init_fct, 
-		     &image_d);
-
-	lib$establish(0);
-
-	if (status == RMS$_FNF) {
+	if ((handle = (void*)dlopen(fname, 0)) == NULL) {
 	    error = dln_strerror();
 	    goto failed;
-	} else if (!$VMS_STATUS_SUCCESS(status)) {
+	}
+
+	if ((init_fct = (void (*)())dlsym(handle, buf)) == NULL) {
 	    error = DLN_ERROR();
+	    dlclose(handle);
 	    goto failed;
 	}
-
 	/* Call the init code */
 	(*init_fct)();
-
-	return 1;
+	return handle;
     }
 #endif /* __VMS */
 
@@ -1636,8 +1580,6 @@ dln_load(file)
   failed:
     rb_loaderror("%s - %s", error, file);
 #endif
-
-#endif /* NO_DLN_LOAD */
     return 0;			/* dummy return */
 }
 
@@ -1649,7 +1591,11 @@ 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) {
@@ -1676,6 +1622,34 @@ dln_find_file(fname, path)
 #endif
 }
 
+#if defined(__CYGWIN32__)
+const char *
+conv_to_posix_path(win32, posix, len)
+    char *win32;
+    char *posix;
+    int len;
+{
+    char *first = win32;
+    char *p = win32;
+    char *dst = posix;
+
+    for (p = win32; *p; p++)
+	if (*p == ';') {
+	    *p = 0;
+	    cygwin32_conv_to_posix_path(first, posix);
+	    posix += strlen(posix);
+	    *posix++ = ':';
+	    first = p + 1;
+	    *p = ';';
+	}
+    if (len < strlen(first))
+	fprintf(stderr, "PATH length too long: %s\n", first);
+    else
+	cygwin32_conv_to_posix_path(first, posix);
+    return dst;
+}
+#endif
+
 static char fbuf[MAXPATHLEN];
 
 static char *
@@ -1692,7 +1666,6 @@ dln_find_1(fname, path, exe_flag)
     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;
@@ -1768,7 +1741,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);
 
@@ -1822,13 +1795,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:
 	/* if not, and no other alternatives, life is bleak */
 	if (*ep == '\0') {
 	    return NULL;
@@ -1837,24 +1807,3 @@ dln_find_1(fname, path, exe_flag)
 	/* otherwise try the next component in the search path */
     }
 }
-
-#if defined(__VMS)
-
-/* action routine for decc$to_vms */
-static int vms_fileact(char *filespec, int type)
-{
-    if (vms_filespec)
-	free(vms_filespec);
-    vms_filespec = malloc(strlen(filespec)+1);
-    strcpy(vms_filespec, filespec);
-    return 1;
-}
-
-/* exception handler for LIB$FIND_IMAGE_SYMBOL */
-static long vms_fisexh(long *sigarr, long *mecarr)
-{
-    sys$unwind(1, 0);
-    return 1;
-}
-
-#endif /* __VMS */
diff --git a/dln.h b/dln.h
index 3d52ea2827..182cf9f9f4 100644
--- a/dln.h
+++ b/dln.h
@@ -2,8 +2,8 @@
 
   dln.h -
 
-  $Author: michal $
-  $Date: 2003/01/16 07:34:01 $
+  $Author$
+  $Date$
   created at: Wed Jan 19 16:53:09 JST 1994
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
diff --git a/dmydln.c b/dmydln.c
deleted file mode 100644
index 09ea06806c..0000000000
--- a/dmydln.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NO_DLN_LOAD 1
-#include "dln.c"
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
index b4445fa59f..905d2441c2 100644
--- a/doc/NEWS
+++ b/doc/NEWS
@@ -1,209 +1,145 @@
-= command line options
+This file is not actively maintained.  See ChangeLog for recent changes.
 
-: -W option
+: open-uri.rb
 
-  new option to specify warning level. -W0 to shut up warnings, -W1 for normal level,
-  -W2 for verbose level.  -w equals to -W2.
+  Imported.  This is an easy-to-use wrapper for net/http and net/ftp.
 
-= 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
+: Class#inherited
 
-  can be assignable again.  the original stdio are preserved as STDIN,
-  STDOUT, STDERR.
+  Method is called when Class is inherited by another class.
 
-: $VERBOSE now has 3 levels
+	class A; end
+	def A.inherited(by)
+          puts "A inherited by #{by.inspect}"
+        end
+        class B < A; end
 
-  nil - silence, false - medium (default), true - verbose
+        Prints out "A inherited by B"
 
-: allocation framework
+: String#to_i
 
-  any instance of class can be allocated by class.allocate,
-  (except for a few classes).
+  Now accepts optional base argument.
 
-: comparison of exception classes in a rescue clause
+	"101".to_i(10) => 101
+	"101".to_i(2)  => 5
+	"101".to_i(8)  => 65
+	"101".to_i(16) => 257
 
-  changed to use Module#=== for comparing $! with the exception
-  class specified in each rescue clause.
+  A base argument of 0 guesses at the base.
 
-  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.
+	"101".to_i(0)   => 101
+	"0b101".to_i(0) => 5
+	"0101".to_i(0)  => 65
+	"0x101".to_i(0) => 1
 
-: constants lookup
+: Set class (set.rb)
 
-  improved at the performance of searching by using an internal hash
-  table.
+  Imported.
 
-  calls const_missing method of the class/module, if constant is not
-  found in the look up path.
+: OptionParser module
 
-: expression parenthesis in the first argument
+  Imported.  Command line options utility library.
 
-  altered to get the following code (note the space after p):
+: parser
 
-    p ("xx"*2).to_i
+  %W(...) notation, word list literal like %w(...) with the
+  exception that #{} interpolation is allowed.
 
-  Interpreted as:
+: parser
 
-    p (("xx"*2).to_i)
+  Now arbitrary statements are allowed inside #{} interpolation
+  without escapes.  In other hand, they can no longer access to
+  variables defined in eval.
 
-  Instead of:
+: parser
 
-    (p("xx"*2)).to_i
+  Digits preceded minus sign is a literal integer.
 
-: implicit comparison in conditional expressions
+: IO::sysopen
 
-  Obsoleted except when it is used in -e.
+  New method to get a raw file descriptor.
 
-  : between Range and $.
-      Use explicit comparison instead.
+: TCPServer#accept, UNIXServer#accept, Socket#accept
 
-  : between Regexp and $_
-      Use the unary method ~/re/ instead.
+  New methods to return an accepted socket fd.
 
-: to_str
+: Date and DateTime
 
-  added to get objects which define to_str() treated as String's.
+  lib/date.rb now provides both Date and DateTime.
 
-  now almost all the built-in methods try each argument with to_str()
-  when they expect it to be a String.
+  Some methods have been renamed.  But the old names are still alive.
 
-    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]
+  Some new methods have been added (Date::parse, Date#strftime, etc.).
 
-: multiple assignment behavior
+  Date#mjd now returns the chronological modified Julian day number.
 
-  Fixed so that "*a = nil" results in "a == []".
+  All facilities about tjd have been removed.
 
-= changes in core class library
+: Thread#join
 
-: open
+  Optional argument limits maximum time to wait the thread in second.
+  And returns nil if timed out.
 
-  Extended so that when the third argument is permission flags it
-  calls open(2) instead of fopen(3).
+: Array#filter
 
-: sprintf
+  Previously deprecated, now removed.  Use Array#collect!.
 
-  new format specifier "%p" is available.
+: dl module
 
-: lambda and proc
+  Imported. An interface to the dynamic linker.
 
-  Proc object returns from these methods has the following attributes:
+: IO#sysseek
 
-  * strict argument number check
-  * break and return terminates the proc execution.
+  Added.
 
-: warn(message)
+: IO
 
-  a method to give warnings.
+  64bit off_t support by Janathan Baker.
 
 : abort()
 
-  takes optional terminate message argument.
+  Takes optional terminate message argument.
 
-: Object#initialize_copy
+: iconv module
 
-  copy constructor for clone and dup.
+  Imported.  Wrapper library of (({iconv})).
 
-: Object#instance_variable_set, Object#instance_variable_get
+: IO.fsync
 
-  added.
-
-: Object#singleton_method_removed
-: Object#singleton_method_undefined
+  New method that copies all in-memory parts of a file to disk and
+  waits until the deice reports that all parts are on stable storage.
+  Implemented with fsync(2) or equivalent.
 
-  Added.
+: Dir#pos=
 
-: Array#transpose
+  Returns the new position instead of self.
 
-  added.
+: Dir::glob
 
-: Array#fetch(index [, default])
+  Now accepts optional FNM_* flags via the second argument, whereas
+  Dir::[] doesn't.
 
-  Added.  If a default value isn't given, raises index error if index
-  is out of range.
+    Dir.glob("makefile", File::FNM_CASEFOLD) #=> ['Makefile', 'makefile']
 
-: Array#insert(n, other, ...)
+: fileutils module
 
-  Added. [ruby-talk:14289]
+  Imported.  File utility library.
 
-  This is much the same as (({ary[n,0] = [other,...]})) except
-  returing self.
+: racc runtime module
 
-    ary = [0,1,2,3]
-    ary[2, 0] = [4, 5, 6]
-    p ary
+  Imported.  Racc runtime library. (Racc is a parser generator for ruby)
 
-    ary = [0,1,2,3]
-    ary.insert(2, 4, 5, 6)
-    p ary
+: tsort module
 
-: Array#sort!
+  Imported.  Topological sorting library.
 
-  Changed to always return self without checking whether the sequence
-  of the elements was modified or not.
+: stringio module
 
-  Beware that this behavior is not guaranteed to continue in the
-  future.  Do not rely on its return value. [ruby-dev:12506]
+  Imported.  Pseudo (({IO})) class from/to (({String})).
 
-: Array#filter
+: strscan module
 
-  Previously deprecated, now removed.  Use Array#collect!.
+  Imported.  Fast string scanner library.
 
 : Array#pack, String#unpack
 
@@ -228,163 +164,138 @@
 
   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)
+: IO#fsync
 
   Added.
 
-  This is much the same as (({str[n, 0] = other})) except returing
-  self.
+: Array expansion
 
-: String#lstrip, rstrip, lstrip!, rstrip!
+  Fixed with the following behavior:
 
-  Added.  These strip only left or right part of a string.
+    a = *[1]
+    p a #=> [1]
 
-: String#match
+  Now 1-element array in rhs is expanded properly.
 
-  Added.
+    a = *[1]
+    p a #=> 1
 
-: String/Array methods
+: allocation framework
 
-  Returns an instance of receivers class.
+  any instance of class can be allocated by class.allocate,
+  (except a few classes).
 
-: String.new
+: break and next
 
-  The first argument becomes optional.
+  Extended to take an optional expression, which is used as a value
+  for termination. [experimental]
 
-: Symbol#intern
+: comparison of exception classes in a rescue clause
 
-  Added.
+  Changed to use Module#=== for comparing $! with the exception
+  class specified in each rescue clause.
 
-: Symbol.all_symbols
+  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.
 
-  Added. [ruby-dev:12921]
+: constants lookup
 
-: IO
+  Improved at the performance of searching by using an internal hash
+  table.
 
-  64bit off_t support by Janathan Baker.
+: expression parenthesis in the first argument
 
-: IO#read
-: IO#sysread
+  Experimentally altered to get the following code (note the space
+  after p):
 
-  takes optinal second argument for read buffer.
+    p ("xx"*2).to_i
 
-: IO::sysopen
+  Interpreted as:
 
-  New method to get a raw file descriptor.
+    p (("xx"*2).to_i)
 
-: IO#sysseek
+  Instead of:
 
-  Added.
+    (p("xx"*2)).to_i
 
-: IO#fsync
+: implicit comparison in conditional expressions
 
-  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.
+  Obsoleted except when it is used in -e.
 
-: IO.open
+  : between Range and $.
+      Use explicit comparison instead.
 
-  Made public.  Can only associate an IO object with a file number
-  like IO.new and IO.for_fd, but can take a block.
+  : between Regexp and $_
+      Use the unary method ~/re/ instead.
 
-: IO.for_fd
+: to_str
 
-  Added as a synonym for IO.new.
+  Added to get objects which define to_str() treated as String's.
 
-: IO.read
+  Now almost all the built-in methods try each argument with to_str()
+  when they expect it to be a String.
 
-  Added.  Like IO.readlines, except it returns the entire file as a
-  string.  [ruby-talk:9460]
+    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]
 
-: File#fnmatch, File::Constants::FNM_*
+: pp module
 
-  Added.  Refer to the fnmatch(3) manpage for details.
+  Imported. Prity Printing library.
 
-  Localism is FNM_DOTMATCH which has the opposite meaning of the
-  commonly known FNM_PERIOD, which does not exist in Ruby.
+: open
 
-  e.g.
+  Extended so that when the third argument is permission flags it
+  calls open(2) instead of fopen(3).
 
-    # exclude files matching "*.bak" case-insensitively.
-    files.reject! {|fn| File.fnmatch?("*.bak", fn, File::FNM_CASEFOLD) }
+: Array#fetch(index [, default])
 
-: File.lchmod
-: File.lchown
+  Added.  If a default value isn't given, raises index error if index
+  is out of range.
 
-  Added.
+: Array#insert(n, other, ...)
 
-: File.open, IO.open
+  Added. [ruby-talk:14289]
 
-  File mode can be specified by flags like open(2),
-  e.g. File::open(path, File::CREAT|File::WRONLY).
+  This is much the same as (({ary[n,0] = [other,...]})) except
+  returing self.
 
-: Regexp#options
+    ary = [0,1,2,3]
+    ary[2, 0] = [4, 5, 6]
+    p ary
 
-  Added.
+    ary = [0,1,2,3]
+    ary.insert(2, 4, 5, 6)
+    p ary
 
-: Regexp.last_match(n)
+: Array#sort!
 
-  Extended to take an optional argument.
+  Changed to always return self without checking whether the sequence
+  of the elements was modified or not.
 
-: MatchData#captures
+  Beware that this behavior is not guaranteed to continue in the
+  future.  Do not rely on its return value. [ruby-dev:12506]
 
-  added.
+: Curses
+
+  Updated.  New methods and constants for using the mouse, character
+  attributes, colors and key codes have been added.
 
 : Dir#path
 
@@ -416,102 +327,113 @@
       }
     }
 
-: Dir#pos=
+: Enumerable#all?
+: Enumerable#any?
+: Enumerable#inject
+: Enumerable#sort_by
 
-  Returns the new position instead of self.
+  Added.
 
-: Dir::glob
+: File#fnmatch, File::Constants::FNM_*
 
-  Now accepts optional FNM_* flags via the second argument, whereas
-  Dir::[] doesn't.
+  Added.  Refer to the fnmatch(3) manpage for details.
 
-    Dir.glob("makefile", File::FNM_CASEFOLD) #=> ['Makefile', 'makefile']
+  Localism is FNM_DOTMATCH which has the opposite meaning of the
+  commonly known FNM_PERIOD, which does not exist in Ruby.
 
-: Class#inherited
+  e.g.
 
-  Method is called when Class is inherited by another class.
+    # exclude files matching "*.bak" case-insensitively.
+    files.reject! {|fn| File.fnmatch?("*.bak", fn, File::FNM_CASEFOLD) }
 
-	class A; end
-	def A.inherited(by)
-          puts "A inherited by #{by.inspect}"
-        end
-        class B < A; end
+: File.lchmod
+: File.lchown
 
-        Prints out "A inherited by B"
+  Added.
 
-: Module#include?
+: File.open, IO.open
 
-  Added. [ruby-dev:13941] 
+  File mode can be specified by flags like open(2),
+  e.g. File::open(path, File::CREAT|File::WRONLY).
 
-: Module#included
+: IO.open
 
-  Added.  This is a hook called after Module#append_feature.
+  Made public.  Can only associate an IO object with a file number
+  like IO.new and IO.for_fd, but can take a block.
 
-: Module#method_removed
-: Module#method_undefined
+: IO.for_fd
 
-  Added.
+  Added as a synonym for IO.new.
 
-: Module.new, Class.new
+: IO.read
 
-  Extended to take block.
+  Added.  Like IO.readlines, except it returns the entire file as a
+  string.  [ruby-talk:9460]
 
-: Time
+: Interrupt
 
-  Extended to accept a negative time_t. (Only when the platform
-  supports it)
+  Made a subclass of SignalException. (It was a subclass of
+  Exception in 1.6 and prior)
 
-    p Time.at(-1)
-    => Thu Jan 01 08:59:59 JST 1970
+: Marshal
 
-: Time#to_a
-: Time#zone
+  Fixed not to dump anonymous classes/modules.
 
-  Made to return "UTC" under gmtime.  It used to return a platform
-  dependent value, typically "GMT", in 1.6 and prior.
+  Fixed with loading modules.
 
-: Marshal to use marshal_dump and marshal_load
+: MatchData#to_ary
 
-  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).
+  Added for convenience of Regexp#match. [ruby-dev:12766]
 
-: Marshal
+  Previously we had to do:
 
-  Fixed not to dump anonymous classes/modules.
+    foo, bar, baz = /(\w+?)\s+(\w+?)\s+(\w+)/.match("foo bar baz").to_a[1..-1]
+    p [foo, bar, baz]
 
-  Fixed with loading modules.
+  But now can do:
+
+    _, foo, bar, baz = /(\w+?)\s+(\w+?)\s+(\w+)/.match("foo bar baz")
+    p [foo, bar, baz]
 
-: Thread#group
+: Math.acos(x)
+: Math.asin(x)
+: Math.atan(x)
+: Math.cosh(x)
+: Math.hypot(x,y)
+: Math.sinh(x)
+: Math.tanh(x)
 
-  new method to get belonging  ThreadGroup.
+  Added.
 
-: Thread#terminate
+: Method#==
 
-  synonym of Thread#exit
+  Added.
 
-: Thread#join
+: Module#include?
 
-  Optional argument limits maximum time to wait the thread in second.
-  And returns nil if timed out.
+  Added. [ruby-dev:13941] 
 
-: ThreagGroup#enclose
+: Module#included
 
-  prohibits thread movement from/to enclosed groups.
+  Added.  This is a hook called after Module#append_feature.
 
-: Range#step([step=1])
+: Module#method_removed
+: Module#method_undefined
 
   Added.
 
-: SystemCallError
+: Module.new, Class.new
 
-  SystemCallError's "===" match (used in rescue also) is now based on its errno.
+  Extended to take block.
 
-: Interrupt
+: Multiple assignment behavior
 
-  Made a subclass of SignalException. (It was a subclass of
-  Exception in 1.6 and prior)
+  Fixed so that "*a = nil" results in "a == []".
+
+: Net::HTTP
+
+  New version of Net::HTTP has introduced seriously incompatible
+  changes. For details, see document embedded in net/http.rb itself.
 
 : NameError and NoMethodError
 
@@ -525,12 +447,8 @@
 
   Finally obsoleted.  Use NotImplementedError.
 
-: SystemCallError.===
-
-  Added. (See the "Comparison of exception classes in a rescue clause"
-  paragraph above) [ruby-dev:12670]
-
-: SystemExit#status
+: Object#singleton_method_removed
+: Object#singleton_method_undefined
 
   Added.
 
@@ -538,40 +456,10 @@
 
   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)
+: Proc#yield
 
-  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.
+  Added.  This is equivalent to Proc#call except it does not check the
+  number of given arguments, which are thus passed to the proc as-is.
 
 : Process.times
 
@@ -586,50 +474,27 @@
 
   Added.  (({$?})) is now an instance of this class.
 
-: Process::UID, Process::GID, Process::Sys,
+: Range#step([step=1])
 
   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
+: Range#to_ary
 
-  lib/date.rb now provides both Date and DateTime.
+  Added.  You can now do something like this:
 
-  Some methods have been renamed.  But the old names are still alive.
-
-  Some new methods have been added (Date::parse, Date#strftime, etc.).
+    a, b, c = 1..3
 
-  Date#mjd now returns the chronological modified Julian day number.
+: Regexp#options
 
-  All facilities about tjd have been removed.
+  Added.
 
-: Curses
+: Regexp.last_match(n)
 
-  Updated.  New methods and constants for using the mouse, character
-  attributes, colors and key codes have been added.
+  Extended to take an optional argument.
 
-: Net::HTTP
+: Signal
 
-  New version of Net::HTTP has introduced seriously incompatible
-  changes. For details, see document embedded in net/http.rb itself.
+  Added. This module has module functions Signal.trap and Signal.list.
 
 : Socket.pack_sockaddr_in, Socket.unpack_sockaddr_in
 
@@ -639,199 +504,94 @@
 
   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
+: String#[regexp, nth]
 
-  implements prettyprint algorithm.
+  Extended to accepts optional second argument.
 
-: lib/profiler
+  It tries match between self and REGEXP, then returns the
+  content of the NTH regexp register.
 
-  library to implement -r "profile"
+: String#casecmp
 
-: lib/racc/parser
+  Added.  This is a case insensitive version of String#<=>.
 
-  RACC parser generator runtime in Ruby.
+: String#chomp
 
-: lib/scanf
+  If $/ == "\n", chops off last newlines (any of \n, \r, \r\n).
 
-  scan string and retrieve object with format
+: String#eql?
 
-: lib/set
+  Changed to be always case sensitive.
 
-  Set class
+: String#insert(n, other)
 
-: lib/runit
+  Added.
 
-  RubyUnit compatible layer for test/unit
+  This is much the same as (({str[n, 0] = other})) except returing
+  self.
 
-: lib/test/unit
+: String#lstrip, rstrip, lstrip!, rstrip!
 
-  unit testing framework for Ruby
+  Added.  These strip only left or right part of a string.
 
-: lib/tmpdir
+: String#match
 
-  get temporary directory path.
+  Added.
 
-: lib/tsort
+: String/Array methods
 
-  topological sorting library.
+  Returns an instance of receivers class.
 
-: lib/rexml
+: String.new
 
-  REXML XML library
+  The first argument becomes optional.
 
-: lib/webrick
+: Symbol#intern
 
-  generic internet server kit
+  Added.
 
-: lib/xmlrpc
+: Symbol.all_symbols
 
-  simple RPC via XML
+  Added. [ruby-dev:12921]
 
-: lib/un
+: SystemCallError.===
 
-  used like 'ruby -run -e cp -- -p foo bar'.  neat, isn't it?
+  Added. (See the "Comparison of exception classes in a rescue clause"
+  paragraph above) [ruby-dev:12670]
 
-: lib/win32/registry
+: SystemExit#status
 
-  win32/registry is registry accessor
+  Added.
 
-: lib/yaml
+: TCPServer#listen, UNIXServer#listen
 
-  YAML Ain't Mark-up Language
+  Added.
 
-= removed libraries
+: TCPSocket.new
+: TCPSocket.open
 
-: lib/ftplib
+  Extended to take an address and a port number for the local side in
+  optional 3rd and 4th arguments.
 
-  use net/ftp instead.
+: Time
 
-: lib/telnet
+  Extended to accept a negative time_t. (Only when the platform
+  supports it)
 
-  use net/telnet instead.
+    p Time.at(-1)
+    => Thu Jan 01 08:59:59 JST 1970
 
-= new port
+: Time#to_a
+: Time#zone
 
-: WindowsCE port
-: Win32 BCC
+  Made to return "UTC" under gmtime.  It used to return a platform
+  dependent value, typically "GMT", in 1.6 and prior.
 
-= interpreter implementation
+To be investigated:
 
-: garbage collector
+ Sat Feb 24 03:15:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-  faster, but uses more memory for the worst case.
+        * io.c (set_stdin): preserve original stdin.
 
-: string concatenation
+        * io.c (set_outfile): preserve original stdout/stderr.
 
-  faster by avoiding too frequent realloc(3).
diff --git a/doc/forwardable.rd b/doc/forwardable.rd
index f9c8234761..7272c374b6 100644
--- a/doc/forwardable.rd
+++ b/doc/forwardable.rd
@@ -1,8 +1,8 @@
  -- forwardable.rb
 						
                                                 $Release Version: 1.1 $
-                                                $Revision: 1.2 $
-                                                $Date: 2001/05/07 23:52:57 $
+                                                $Revision$
+                                                $Date$
 						Original version by Tosh
 
 =begin
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
index a56823dd1a..d928fddc5e 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.ja
@@ -1,7 +1,7 @@
   -- forwatable.rb
                                                 $Release Version: 1.1 $
-                                                $Revision: 1.1 $
-                                                $Date: 2001/07/19 05:42:06 $
+                                                $Revision$
+                                                $Date$
 
 =begin
 = Forwardable
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
index 38145576dc..64d9ab29c8 100644
--- a/doc/irb/irb-tools.rd.ja
+++ b/doc/irb/irb-tools.rd.ja
@@ -1,7 +1,7 @@
 irb��Ϣ���ޤ����ޥ�ɤȥ饤�֥��
 				$Release Version: 0.7.1 $
-			   	$Revision: 1.1 $
-			   	$Date: 2001/07/19 05:42:06 $
+			   	$Revision$
+			   	$Date$
 			   	by Keiju ISHITSUKA(Nihon Rational Co.,Ltd.)
 
 =begin
diff --git a/doc/irb/irb.rd b/doc/irb/irb.rd
index f56e8b60e0..c1ac367919 100644
--- a/doc/irb/irb.rd
+++ b/doc/irb/irb.rd
@@ -1,7 +1,7 @@
 irb -- interactive ruby
 		$Release Version: 0.9 $
-		$Revision: 1.6 $
-		$Date: 2003/07/31 16:34:07 $
+		$Revision$
+		$Date$
 		by Keiju ISHITSUKA(keiju@ishitsuka.com)
 		by gotoken-san who is original translater from japanese version
 
@@ -221,7 +221,7 @@ For irb commands, both simple name and `irb_'-prefixed name are prepared.
     Whether readline is used or not. 
     true: uses 
     false: doen't use
-    nil: intends to use readline except for inf-ruby-mode (default)
+    nil: intends to use readline except for inf-reuby-mode (default)
 #
 #--- conf.verbose=T/F
 #    Whether verbose messages are display or not. 
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index aa3c0e13aa..7e80c7fc6f 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -1,8 +1,8 @@
 irb -- interactive ruby
-				$Release Version: 0.9.5 $
-			   	$Revision: 1.3.2.1 $
-			   	$Date: 2005/04/19 19:24:56 $
-			   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+				$Release Version: 0.9 $
+			   	$Revision$
+			   	$Date$
+			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 =begin
 = irb�Ȥ�?
 
@@ -53,7 +53,7 @@ irb�λȤ�����, Ruby�����ΤäƤ���Ф����äƴ�ñ�Ǥ�. ����Ū�ˤ� irb ��
   --noinspect	    ��̽��Ϥ�inspect���Ѥ��ʤ�.
   --readline	    readline�饤�֥������Ѥ���.
   --noreadline	    readline�饤�֥������Ѥ��ʤ�. �ǥե���Ȥ�ư���,
-		    inf-ruby-mode�ʳ���readline�饤�֥������Ѥ��褦
+		    inf-reuby-mode�ʳ���readline�饤�֥������Ѥ��褦
 		    �Ȥ���. 
   --prompt prompt-mode
   --prompt-mode prompt-mode
@@ -112,7 +112,6 @@ irb��ư����``~/.irbrc''���ɤ߹��ߤޤ�. �⤷¸�ߤ��ʤ�����,
 
    IRB.conf[:PROMPT][:MY_PROMPT] = { # �ץ���ץȥ⡼�ɤ�̾��
      :PROMPT_I => nil,		  # �̾�Υץ���ץ�
-     :PROMPT_N => nil,		  # ��³�ԤΥץ���ץ�
      :PROMPT_S => nil,		  # ʸ����ʤɤη�³�ԤΥץ���ץ�
      :PROMPT_C => nil,		  # ������³���Ƥ�����Υץ���ץ�
      :RETURN => "    ==>%s\n"	  # �꥿������Υץ���ץ�
@@ -127,7 +126,7 @@ OK�Ǥ�.
 
   IRB.conf[:PROMPT_MODE] = :MY_PROMPT
 
-PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C��, �ե����ޥåȤ���ꤷ�ޤ�.
+PROMPT_I, PROMPT_S, PROMPT_C��, �ե����ޥåȤ���ꤷ�ޤ�.
 
   %N	��ư���Ƥ��륳�ޥ��̾�����Ϥ����.
   %m	main���֥�������(self)��to_s�ǽ��Ϥ����.
@@ -142,7 +141,6 @@ PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C��, �ե����ޥåȤ���ꤷ�ޤ�.
 
   IRB.conf[:PROMPT_MODE][:DEFAULT] = {
       :PROMPT_I => "%N(%m):%03n:%i> ",
-      :PROMPT_N => "%N(%m):%03n:%i> ",
       :PROMPT_S => "%N(%m):%03n:%i%l ",
       :PROMPT_C => "%N(%m):%03n:%i* ",
       :RETURN => "%s\n"
@@ -234,7 +232,7 @@ irb��ĥ���ޥ�ɤ�, ��ñ��̾����Ƭ��`irb_'��Ĥ���̾����ξ����������
     readline��Ȥ����ɤ���?
     true: readline��Ȥ�.
     false: readline��Ȥ�ʤ�.
-    nil: (�ǥե����)inf-ruby-mode�ʳ���readline�饤�֥������Ѥ���
+    nil: (�ǥե����)inf-reuby-mode�ʳ���readline�饤�֥������Ѥ���
          ���Ȥ���.  
 #
 #--- conf.verbose=T/F
@@ -279,7 +277,7 @@ irb��ĥ���ޥ�ɤ�, ��ñ��̾����Ƭ��`irb_'��Ĥ���̾����ξ����������
 
 --- _  
     ���η׻��μ¹Է�̤�Ф��Ƥ���(���������ѿ�).
---- __ 
+___ __ 
     �¹Է�̤������Ф��Ƥ���.
     __[line_no]�ǡ����ιԤǼ¹Ԥ�����̤����뤳�Ȥ��Ǥ���. line_no�����
     ���ˤϡ��ǿ��η�̤���-line_no���η�̤����뤳�Ȥ��Ǥ���.
diff --git a/doc/shell.rd b/doc/shell.rd
index ae6855cbd8..02ee1b020a 100644
--- a/doc/shell.rd
+++ b/doc/shell.rd
@@ -1,7 +1,7 @@
  -- shell.rb
 				$Release Version: 0.6.0 $
-			   	$Revision: 1.2 $
-			   	$Date: 2001/05/17 10:09:49 $
+			   	$Revision$
+			   	$Date$
 			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 
 =begin
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
index aab9e5c7d2..073e71ea42 100644
--- a/doc/shell.rd.ja
+++ b/doc/shell.rd.ja
@@ -1,7 +1,7 @@
  -- shell.rb
 				$Release Version: 0.6.0 $
-			   	$Revision: 1.1 $
-			   	$Date: 2001/07/19 05:42:06 $
+			   	$Revision$
+			   	$Date$
 			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 
 =begin
diff --git a/enum.c b/enum.c
index 112a5f820b..6b76f4f710 100644
--- a/enum.c
+++ b/enum.c
@@ -2,8 +2,8 @@
 
   enum.c -
 
-  $Author: drbrain $
-  $Date: 2006/06/15 01:24:40 $
+  $Author$
+  $Date$
   created at: Fri Oct  1 15:15:19 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -44,24 +44,6 @@ grep_iter_i(i, arg)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.grep(pattern)                   => array
- *     enum.grep(pattern) {| obj | block }  => array
- *  
- *  Returns an array of every element in <i>enum</i> for which
- *  <code>Pattern === element</code>. If the optional <em>block</em> is
- *  supplied, each matching element is passed to it, and the block's
- *  result is stored in the output array.
- *     
- *     (1..100).grep 38..44   #=> [38, 39, 40, 41, 42, 43, 44]
- *     c = IO.constants
- *     c.grep(/SEEK/)         #=> ["SEEK_END", "SEEK_SET", "SEEK_CUR"]
- *     res = c.grep(/SEEK/) {|v| IO.const_get(v) }
- *     res                    #=> [2, 0, 1]
- *     
- */
-
 static VALUE
 enum_grep(obj, pat)
     VALUE obj, pat;
@@ -80,44 +62,33 @@ enum_grep(obj, pat)
 static VALUE
 find_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     if (RTEST(rb_yield(i))) {
-	*memo = i;
+	memo->u2.value = Qtrue;
+	memo->u1.value = i;
 	rb_iter_break();
     }
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.detect(ifnone = nil) {| obj | block }  => obj or nil
- *     enum.find(ifnone = nil)   {| obj | block }  => obj or nil
- *  
- *  Passes each entry in <i>enum</i> to <em>block</em>. Returns the
- *  first for which <em>block</em> is not <code>false</code>.  If no
- *  object matches, calls <i>ifnone</i> and returns its result when it
- *  is specified, or returns <code>nil</code>
- *     
- *     (1..10).detect  {|i| i % 5 == 0 and i % 7 == 0 }   #=> nil
- *     (1..100).detect {|i| i % 5 == 0 and i % 7 == 0 }   #=> 35
- *     
- */
-
 static VALUE
 enum_find(argc, argv, obj)
     int argc;
     VALUE* argv;
     VALUE obj;
 {
-    VALUE memo = Qundef;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, Qfalse, 0);
     VALUE if_none;
 
     rb_scan_args(argc, argv, "01", &if_none);
-    rb_iterate(rb_each, obj, find_i, (VALUE)&memo);
-    if (memo != Qundef) {
-	return memo;
+    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;
     }
+    rb_gc_force_recycle((VALUE)memo);
     if (!NIL_P(if_none)) {
 	return rb_funcall(if_none, rb_intern("call"), 0, 0);
     }
@@ -134,19 +105,6 @@ find_all_i(i, ary)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.find_all {| obj | block }  => array
- *     enum.select   {| obj | block }  => array
- *  
- *  Returns an array containing all elements of <i>enum</i> for which
- *  <em>block</em> is not <code>false</code> (see also
- *  <code>Enumerable#reject</code>).
- *     
- *     (1..10).find_all {|i|  i % 3 == 0 }   #=> [3, 6, 9]
- *     
- */
-
 static VALUE
 enum_find_all(obj)
     VALUE obj;
@@ -168,17 +126,6 @@ reject_i(i, ary)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.reject {| obj | block }  => array
- *  
- *  Returns an array for all elements of <i>enum</i> for which
- *  <em>block</em> is false (see also <code>Enumerable#find_all</code>).
- *     
- *     (1..10).reject {|i|  i % 3 == 0 }   #=> [1, 2, 4, 5, 7, 8, 10]
- *     
- */
-
 static VALUE
 enum_reject(obj)
     VALUE obj;
@@ -195,7 +142,7 @@ collect_i(i, ary)
     VALUE i, ary;
 {
     rb_ary_push(ary, rb_yield(i));
-
+    
     return Qnil;
 }
 
@@ -204,51 +151,28 @@ collect_all(i, ary)
     VALUE i, ary;
 {
     rb_ary_push(ary, i);
-
+    
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.collect {| obj | block }  => array
- *     enum.map     {| obj | block }  => array
- *  
- *  Returns a new array with the results of running <em>block</em> once
- *  for every element in <i>enum</i>.
- *     
- *     (1..4).collect {|i| i*i }   #=> [1, 4, 9, 16]
- *     (1..4).collect { "cat"  }   #=> ["cat", "cat", "cat", "cat"]
- *     
- */
-
 static VALUE
-enum_collect(obj)
+enum_to_a(obj)
     VALUE obj;
 {
     VALUE ary = rb_ary_new();
-
-    rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : collect_all, ary);
+    
+    rb_iterate(rb_each, obj, collect_all, ary);
 
     return ary;
 }
 
-/*
- *  call-seq:
- *     enum.to_a      =>    array
- *     enum.entries   =>    array
- *  
- *  Returns an array containing the items in <i>enum</i>.
- *     
- *     (1..7).to_a                       #=> [1, 2, 3, 4, 5, 6, 7]
- *     { 'a'=>1, 'b'=>2, 'c'=>3 }.to_a   #=> [["a", 1], ["b", 2], ["c", 3]]
- */
 static VALUE
-enum_to_a(obj)
+enum_collect(obj)
     VALUE obj;
 {
     VALUE ary = rb_ary_new();
-
-    rb_iterate(rb_each, obj, collect_all, ary);
+    
+    rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : collect_all, ary);
 
     return ary;
 }
@@ -256,60 +180,36 @@ enum_to_a(obj)
 static VALUE
 inject_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
-    if (*memo == Qundef) {
-        *memo = i;
+    if (memo->u2.value) {
+        memo->u2.value = Qfalse;
+        memo->u1.value = i;
     }
     else {
-        *memo = rb_yield_values(2, *memo, i);
+        memo->u1.value = rb_yield(rb_assoc_new(memo->u1.value, i));
     }
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.inject(initial) {| memo, obj | block }  => obj
- *     enum.inject          {| memo, obj | block }  => obj
- *  
- *  Combines the elements of <i>enum</i> by applying the block to an
- *  accumulator value (<i>memo</i>) and each element in turn. At each
- *  step, <i>memo</i> is set to the value returned by the block. The
- *  first form lets you supply an initial value for <i>memo</i>. The
- *  second form uses the first element of the collection as a the
- *  initial value (and skips that element while iterating).
- *     
- *     # Sum some numbers
- *     (5..10).inject {|sum, n| sum + n }              #=> 45
- *     # Multiply some numbers
- *     (5..10).inject(1) {|product, n| product * n }   #=> 151200
- *     
- *     # find the longest word
- *     longest = %w{ cat sheep bear }.inject do |memo,word|
- *        memo.length > word.length ? memo : word
- *     end
- *     longest                                         #=> "sheep"
- *     
- *     # find the length of the longest word
- *     longest = %w{ cat sheep bear }.inject(0) do |memo,word|
- *        memo >= word.length ? memo : word.length
- *     end
- *     longest                                         #=> 5
- *     
- */
-
 static VALUE
 enum_inject(argc, argv, obj)
     int argc;
     VALUE *argv, obj;
 {
-    VALUE memo = Qundef;
+    NODE *memo;
+    VALUE n;
 
-    if (rb_scan_args(argc, argv, "01", &memo) == 0)
-	memo = Qundef;
-    rb_iterate(rb_each, obj, inject_i, (VALUE)&memo);
-    if (memo == Qundef) return Qnil;
-    return memo;
+    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;
 }
 
 static VALUE
@@ -325,18 +225,6 @@ partition_i(i, ary)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.partition {| obj | block }  => [ true_array, false_array ]
- *  
- *  Returns two arrays, the first containing the elements of
- *  <i>enum</i> for which the block evaluates to true, the second
- *  containing the rest.
- *     
- *     (1..6).partition {|i| (i&1).zero?}   #=> [[2, 4, 6], [1, 3, 5]]
- *     
- */
-
 static VALUE
 enum_partition(obj)
     VALUE obj;
@@ -350,23 +238,6 @@ enum_partition(obj)
     return rb_assoc_new(ary[0], ary[1]);
 }
 
-/*
- *  call-seq:
- *     enum.sort                     => array
- *     enum.sort {| a, b | block }   => array
- *  
- *  Returns an array containing the items in <i>enum</i> sorted,
- *  either according to their own <code><=></code> method, or by using
- *  the results of the supplied block. The block should return -1, 0, or
- *  +1 depending on the comparison between <i>a</i> and <i>b</i>. As of
- *  Ruby 1.8, the method <code>Enumerable#sort_by</code> implements a
- *  built-in Schwartzian Transform, useful when key computation or
- *  comparison is expensive..
- *     
- *     %w(rhea kea flea).sort         #=> ["flea", "kea", "rhea"]
- *     (1..10).sort {|a,b| b <=> a}   #=> [10, 9, 8, 7, 6, 5, 4, 3, 2, 1]
- */
-
 static VALUE
 enum_sort(obj)
     VALUE obj;
@@ -378,96 +249,23 @@ static VALUE
 sort_by_i(i, ary)
     VALUE i, ary;
 {
-    VALUE v;
-    NODE *memo;
+    VALUE v, e;
 
     v = rb_yield(i);
-    if (RBASIC(ary)->klass) {
-	rb_raise(rb_eRuntimeError, "sort_by reentered");
-    }
-    memo = rb_node_newnode(NODE_MEMO, v, i, 0);
-    rb_ary_push(ary, (VALUE)memo);
+    e = rb_assoc_new(v, i);
+    rb_ary_push(ary, e);
     return Qnil;
 }
 
 static int
-sort_by_cmp(aa, bb)
-    NODE **aa, **bb;
-{
-    VALUE a = aa[0]->u1.value;
-    VALUE b = bb[0]->u1.value;
-
-    return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b);
-}
-
-/*
- *  call-seq:
- *     enum.sort_by {| obj | block }    => array
- *  
- *  Sorts <i>enum</i> using a set of keys generated by mapping the
- *  values in <i>enum</i> through the given block.
- *     
- *     %w{ apple pear fig }.sort_by {|word| word.length}
-                    #=> ["fig", "pear", "apple"]
- *     
- *  The current implementation of <code>sort_by</code> generates an
- *  array of tuples containing the original collection element and the
- *  mapped value. This makes <code>sort_by</code> fairly expensive when
- *  the keysets are simple
- *     
- *     require 'benchmark'
- *     include Benchmark
- *     
- *     a = (1..100000).map {rand(100000)}
- *     
- *     bm(10) do |b|
- *       b.report("Sort")    { a.sort }
- *       b.report("Sort by") { a.sort_by {|a| a} }
- *     end
- *     
- *  <em>produces:</em>
- *     
- *     user     system      total        real
- *     Sort        0.180000   0.000000   0.180000 (  0.175469)
- *     Sort by     1.980000   0.040000   2.020000 (  2.013586)
- *     
- *  However, consider the case where comparing the keys is a non-trivial
- *  operation. The following code sorts some files on modification time
- *  using the basic <code>sort</code> method.
- *     
- *     files = Dir["*"]
- *     sorted = files.sort {|a,b| File.new(a).mtime <=> File.new(b).mtime}
- *     sorted   #=> ["mon", "tues", "wed", "thurs"]
- *     
- *  This sort is inefficient: it generates two new <code>File</code>
- *  objects during every comparison. A slightly better technique is to
- *  use the <code>Kernel#test</code> method to generate the modification
- *  times directly.
- *     
- *     files = Dir["*"]
- *     sorted = files.sort { |a,b|
- *       test(?M, a) <=> test(?M, b)
- *     }
- *     sorted   #=> ["mon", "tues", "wed", "thurs"]
- *     
- *  This still generates many unnecessary <code>Time</code> objects. A
- *  more efficient technique is to cache the sort keys (modification
- *  times in this case) before the sort. Perl users often call this
- *  approach a Schwartzian Transform, after Randal Schwartz. We
- *  construct a temporary array, where each element is an array
- *  containing our sort key along with the filename. We sort this array,
- *  and then extract the filename from the result.
- *     
- *     sorted = Dir["*"].collect { |f|
- *        [test(?M, f), f]
- *     }.sort.collect { |f| f[1] }
- *     sorted   #=> ["mon", "tues", "wed", "thurs"]
- *     
- *  This is exactly what <code>sort_by</code> does internally.
- *     
- *     sorted = Dir["*"].sort_by {|f| test(?M, f)}
- *     sorted   #=> ["mon", "tues", "wed", "thurs"]
- */
+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);
+}
 
 static VALUE
 enum_sort_by(obj)
@@ -476,34 +274,25 @@ enum_sort_by(obj)
     VALUE ary;
     long i;
 
-    if (TYPE(obj) == T_ARRAY) {
-	ary  = rb_ary_new2(RARRAY(obj)->len);
-    }
-    else {
-	ary = rb_ary_new();
-    }
-    RBASIC(ary)->klass = 0;
+    ary  = rb_ary_new2((TYPE(obj) == T_ARRAY) ? RARRAY(obj)->len : 2000);
     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, 0);
-    }
-    if (RBASIC(ary)->klass) {
-	rb_raise(rb_eRuntimeError, "sort_by reentered");
+	qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), sort_by_cmp);
     }
     for (i=0; i<RARRAY(ary)->len; i++) {
-	RARRAY(ary)->ptr[i] = RNODE(RARRAY(ary)->ptr[i])->u2.value;
+	VALUE e = RARRAY(ary)->ptr[i];
+	RARRAY(ary)->ptr[i] = RARRAY(e)->ptr[1];
     }
-    RBASIC(ary)->klass = rb_cArray;
     return ary;
 }
 
 static VALUE
 all_iter_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     if (!RTEST(rb_yield(i))) {
-	*memo = Qfalse;
+	memo->u1.value = Qfalse;
 	rb_iter_break();
     }
     return Qnil;
@@ -512,49 +301,36 @@ all_iter_i(i, memo)
 static VALUE
 all_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     if (!RTEST(i)) {
-	*memo = Qfalse;
+	memo->u1.value = Qfalse;
 	rb_iter_break();
     }
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.all? [{|obj| block } ]   => true or false
- *  
- *  Passes each element of the collection to the given block. The method
- *  returns <code>true</code> if the block never returns
- *  <code>false</code> or <code>nil</code>. If the block is not given,
- *  Ruby adds an implicit block of <code>{|obj| obj}</code> (that is
- *  <code>all?</code> will return <code>true</code> only if none of the
- *  collection members are <code>false</code> or <code>nil</code>.)
- *     
- *     %w{ ant bear cat}.all? {|word| word.length >= 3}   #=> true
- *     %w{ ant bear cat}.all? {|word| word.length >= 4}   #=> false
- *     [ nil, true, 99 ].all?                             #=> false
- *     
- */
-
 static VALUE
 enum_all(obj)
     VALUE obj;
 {
-    VALUE result = Qtrue;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)&result);
+    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;
-    VALUE *memo;
+    NODE *memo;
 {
     if (RTEST(rb_yield(i))) {
-	*memo = Qtrue;
+	memo->u1.value = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
@@ -563,57 +339,43 @@ any_iter_i(i, memo)
 static VALUE
 any_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     if (RTEST(i)) {
-	*memo = Qtrue;
+	memo->u1.value = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.any? [{|obj| block } ]   => true or false
- *  
- *  Passes each element of the collection to the given block. The method
- *  returns <code>true</code> if the block ever returns a value other
- *  than <code>false</code> or <code>nil</code>. If the block is not
- *  given, Ruby adds an implicit block of <code>{|obj| obj}</code> (that
- *  is <code>any?</code> will return <code>true</code> if at least one
- *  of the collection members is not <code>false</code> or
- *  <code>nil</code>.
- *     
- *     %w{ ant bear cat}.any? {|word| word.length >= 3}   #=> true
- *     %w{ ant bear cat}.any? {|word| word.length >= 4}   #=> true
- *     [ nil, true, 99 ].any?                             #=> true
- *     
- */
-
 static VALUE
 enum_any(obj)
     VALUE obj;
 {
-    VALUE result = Qfalse;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)&result);
+    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;
 }
 
 static VALUE
 min_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_funcall(i, id_cmp, 1, *memo);
-	if (rb_cmpint(cmp, i, *memo) < 0) {
-	    *memo = i;
+	cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
+	if (rb_cmpint(cmp) < 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -622,76 +384,49 @@ min_i(i, memo)
 static VALUE
 min_ii(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_yield_values(2, i, *memo);
-	if (rb_cmpint(cmp, i, *memo) < 0) {
-	    *memo = i;
+	cmp = rb_yield(rb_assoc_new(i, memo->u1.value));
+	if (rb_cmpint(cmp) < 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
 }
 
-
-/*
- *  call-seq:
- *     enum.min                    => obj
- *     enum.min {| a,b | block }   => obj
- *  
- *  Returns the object in <i>enum</i> with the minimum value. The
- *  first form assumes all objects implement <code>Comparable</code>;
- *  the second uses the block to return <em>a <=> b</em>.
- *     
- *     a = %w(albatross dog horse)
- *     a.min                                  #=> "albatross"
- *     a.min {|a,b| a.length <=> b.length }   #=> "dog"
- */
-
 static VALUE
 enum_min(obj)
     VALUE obj;
 {
-    VALUE result = Qundef;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result);
-    if (result == Qundef) return 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;
 }
 
-/*
- *  call-seq:
- *     enum.max                    => obj
- *     enum.max {| a,b | block }   => obj
- *  
- *  Returns the object in <i>enum</i> with the maximum value. The
- *  first form assumes all objects implement <code>Comparable</code>;
- *  the second uses the block to return <em>a <=> b</em>.
- *     
- *     a = %w(albatross dog horse)
- *     a.max                                  #=> "horse"
- *     a.max {|a,b| a.length <=> b.length }   #=> "albatross"
- */
-
 static VALUE
 max_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_funcall(i, id_cmp, 1, *memo);
-	if (rb_cmpint(cmp, i, *memo) > 0) {
-	    *memo = i;
+	cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
+	if (rb_cmpint(cmp) > 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -700,128 +435,89 @@ max_i(i, memo)
 static VALUE
 max_ii(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_yield_values(2, i, *memo);
-	if (rb_cmpint(cmp, i, *memo) > 0) {
-	    *memo = i;
+	cmp = rb_yield(rb_assoc_new(i, memo->u1.value));
+	if (rb_cmpint(cmp) > 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.max                   => obj
- *     enum.max {|a,b| block }    => obj
- *  
- *  Returns the object in _enum_ with the maximum value. The
- *  first form assumes all objects implement <code>Comparable</code>;
- *  the second uses the block to return <em>a <=> b</em>.
- *     
- *     a = %w(albatross dog horse)
- *     a.max                                  #=> "horse"
- *     a.max {|a,b| a.length <=> b.length }   #=> "albatross"
- */  
-
 static VALUE
 enum_max(obj)
     VALUE obj;
 {
-    VALUE result = Qundef;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result);
-    if (result == Qundef) return Qnil;
+    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;
 }
 
 static VALUE
 member_i(item, memo)
     VALUE item;
-    VALUE *memo;
+    NODE *memo;
 {
-    if (rb_equal(item, memo[0])) {
-	memo[1] = Qtrue;
+    if (rb_equal(item, memo->u1.value)) {
+	memo->u2.value = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.include?(obj)     => true or false
- *     enum.member?(obj)      => true or false
- *  
- *  Returns <code>true</code> if any member of <i>enum</i> equals
- *  <i>obj</i>. Equality is tested using <code>==</code>.
- *     
- *     IO.constants.include? "SEEK_SET"          #=> true
- *     IO.constants.include? "SEEK_NO_FURTHER"   #=> false
- *     
- */
-
 static VALUE
 enum_member(obj, val)
     VALUE obj, val;
 {
-    VALUE memo[2];
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, val, Qfalse, 0);
 
-    memo[0] = val;
-    memo[1] = Qfalse;
     rb_iterate(rb_each, obj, member_i, (VALUE)memo);
-    return memo[1];
+    result = memo->u2.value;
+    rb_gc_force_recycle((VALUE)memo);
+    return result;
 }
 
 static VALUE
 each_with_index_i(val, memo)
     VALUE val;
-    VALUE *memo;
+    NODE *memo;
 {
-    rb_yield_values(2, val, INT2FIX(*memo));
-    ++*memo;
+    rb_yield(rb_assoc_new(val, INT2FIX(memo->u3.cnt)));
+    memo->u3.cnt++;
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.each_with_index {|obj, i| block }  -> enum
- *  
- *  Calls <em>block</em> with two arguments, the item and its index, for
- *  each item in <i>enum</i>.
- *     
- *     hash = Hash.new
- *     %w(cat dog wombat).each_with_index {|item, index|
- *       hash[item] = index
- *     }
- *     hash   #=> {"cat"=>0, "wombat"=>2, "dog"=>1}
- *     
- */
-
 static VALUE
 enum_each_with_index(obj)
     VALUE obj;
 {
-    VALUE memo = 0;
+    NODE *memo = rb_node_newnode(NODE_MEMO, 0, 0, 0);
 
-    rb_need_block();
-    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)&memo);
+    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)memo);
+    rb_gc_force_recycle((VALUE)memo);
     return obj;
 }
 
 static VALUE
 zip_i(val, memo)
     VALUE val;
-    VALUE *memo;
+    NODE *memo;
 {
-    VALUE result = memo[0];
-    VALUE args = memo[1];
-    int idx = memo[2]++;
+    VALUE result = memo->u1.value;
+    VALUE args = memo->u2.value;
+    int idx = memo->u3.cnt++;
     VALUE tmp;
     int i;
 
@@ -839,29 +535,6 @@ zip_i(val, memo)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     enum.zip(arg, ...)                   => array
- *     enum.zip(arg, ...) {|arr| block }    => nil
- *  
- *  Converts any arguments to arrays, then merges elements of
- *  <i>enum</i> with corresponding elements from each argument. This
- *  generates a sequence of <code>enum#size</code> <em>n</em>-element
- *  arrays, where <em>n</em> is one more that the count of arguments. If
- *  the size of any argument is less than <code>enum#size</code>,
- *  <code>nil</code> values are supplied. If a block given, it is
- *  invoked for each output array, otherwise an array of arrays is
- *  returned.
- *     
- *     a = [ 4, 5, 6 ]
- *     b = [ 7, 8, 9 ]
- *     
- *     (1..3).zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
- *     "cat\ndog".zip([1])   #=> [["cat\n", 1], ["dog", nil]]
- *     (1..3).zip            #=> [[1], [2], [3]]
- *     
- */
-
 static VALUE
 enum_zip(argc, argv, obj)
     int argc;
@@ -870,31 +543,18 @@ enum_zip(argc, argv, obj)
 {
     int i;
     VALUE result;
-    VALUE memo[3];
+    NODE *memo;
 
     for (i=0; i<argc; i++) {
-	argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_a");
+	argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_ary");
     }
     result = rb_block_given_p() ? Qnil : rb_ary_new();
-    memo[0] = result;
-    memo[1] = rb_ary_new4(argc, argv);
-    memo[2] = 0;
+    memo = rb_node_newnode(NODE_MEMO, result, rb_ary_new4(argc, argv), 0);
     rb_iterate(rb_each, obj, zip_i, (VALUE)memo);
 
     return result;
 }
 
-/*
- *  The <code>Enumerable</code> mixin provides collection classes with
- *  several traversal and searching methods, and with the ability to
- *  sort. The class must provide a method <code>each</code>, which
- *  yields successive members of the collection. If
- *  <code>Enumerable#max</code>, <code>#min</code>, or
- *  <code>#sort</code> is used, the objects in the collection must also
- *  implement a meaningful <code><=></code> operator, as these methods
- *  rely on an ordering between members of the collection.
- */
-
 void
 Init_Enumerable()
 {
diff --git a/env.h b/env.h
index 196090f387..a4802ed448 100644
--- a/env.h
+++ b/env.h
@@ -2,8 +2,8 @@
 
   env.h -
 
-  $Author: matz $
-  $Date: 2006/02/13 09:10:55 $
+  $Author$
+  $Date$
   created at: Mon Jul 11 11:53:03 JST 1994
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -16,21 +16,22 @@
 extern struct FRAME {
     VALUE self;
     int argc;
+    VALUE *argv;
     ID last_func;
     ID orig_func;
     VALUE last_class;
+    VALUE cbase;
     struct FRAME *prev;
     struct FRAME *tmp;
     struct RNode *node;
     int iter;
     int flags;
-    unsigned long uniq;
 } *ruby_frame;
 
 void rb_gc_mark_frame _((struct FRAME *));
 
-#define FRAME_DMETH  1
-#define FRAME_FUNC   2
+#define FRAME_ALLOCA 0
+#define FRAME_MALLOC 1
 
 extern struct SCOPE {
     struct RBasic super;
@@ -43,7 +44,6 @@ extern struct SCOPE {
 #define SCOPE_MALLOC  1
 #define SCOPE_NOSTACK 2
 #define SCOPE_DONT_RECYCLE 4
-#define SCOPE_CLONE   8
 
 extern int ruby_in_eval;
 
diff --git a/error.c b/error.c
index 6ebc927853..7befc7b8ee 100644
--- a/error.c
+++ b/error.c
@@ -2,8 +2,8 @@
 
   error.c -
 
-  $Author: matz $
-  $Date: 2006/07/20 07:04:13 $
+  $Author$
+  $Date$
   created at: Mon Aug  9 16:11:34 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -12,6 +12,7 @@
 
 #include "ruby.h"
 #include "env.h"
+#include "version.h"
 #include "st.h"
 
 #include <stdio.h>
@@ -22,44 +23,29 @@
 #include <varargs.h>
 #define va_init_list(a,b) va_start(a)
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-
-extern const char ruby_version[], ruby_release_date[], ruby_platform[];
 
 int ruby_nerrs;
 
-static int
-err_position(buf, len)
+static void
+err_snprintf(buf, len, fmt, args)
     char *buf;
     long len;
+    const char *fmt;
+    va_list args;
 {
+    long n;
+
     ruby_set_current_source();
     if (!ruby_sourcefile) {
-	return 0;
+	vsnprintf(buf, len, fmt, args);
+	return;
     }
     else if (ruby_sourceline == 0) {
-	return snprintf(buf, len, "%s: ", ruby_sourcefile);
+	n = snprintf(buf, len, "%s: ", ruby_sourcefile);
     }
     else {
-	return snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
+	n = snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
     }
-}
-
-static void
-err_snprintf(buf, len, fmt, args)
-    char *buf;
-    long len;
-    const char *fmt;
-    va_list args;
-{
-    long n;
-
-    n = err_position(buf, len);
     if (len > n) {
 	vsnprintf((char*)buf+n, len-n, fmt, args);
     }
@@ -118,12 +104,11 @@ warn_print(fmt, args)
     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);
+    fputs(buf, stderr);
+    fputs("\n", stderr);
+    fflush(stderr);
 }
 
 void
@@ -138,8 +123,6 @@ 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);
@@ -169,25 +152,6 @@ rb_warning(fmt, va_alist)
     va_end(args);
 }
 
-/*
- * call-seq:
- *    warn(msg)   => nil
- *
- * Display the given message (followed by a newline) on STDERR unless
- * warnings are disabled (for example with the <code>-W0</code> flag).
- */
-
-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, ...)
@@ -199,18 +163,14 @@ 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);
+    warn_print(buf, args);
+    va_end(args);
+    fprintf(stderr, "ruby %s (%s) [%s]\n", RUBY_VERSION, RUBY_RELEASE_DATE, RUBY_PLATFORM);
     abort();
 }
 
@@ -266,9 +226,6 @@ rb_check_type(x, t)
 		else if (FIXNUM_P(x)) {
 		    etype = "Fixnum";
 		}
-		else if (SYMBOL_P(x)) {
-		    etype = "Symbol";
-		}
 		else if (rb_special_const_p(x)) {
 		    etype = RSTRING(rb_obj_as_string(x))->ptr;
 		}
@@ -303,7 +260,6 @@ VALUE rb_eNoMethodError;
 VALUE rb_eSecurityError;
 VALUE rb_eNotImpError;
 VALUE rb_eNoMemError;
-VALUE rb_cNameErrorMesg;
 
 VALUE rb_eScriptError;
 VALUE rb_eSyntaxError;
@@ -337,42 +293,23 @@ rb_exc_new3(etype, str)
     return rb_exc_new(etype, RSTRING(str)->ptr, RSTRING(str)->len);
 }
 
-/*
- * call-seq:
- *    Exception.new(msg = nil)   =>  exception
- *
- *  Construct a new Exception object, optionally passing in 
- *  a message.
- */
-
 static VALUE
 exc_initialize(argc, argv, exc)
     int argc;
     VALUE *argv;
     VALUE exc;
 {
-    VALUE arg;
+    VALUE mesg;
 
-    rb_scan_args(argc, argv, "01", &arg);
-    rb_iv_set(exc, "mesg", arg);
+    if (rb_scan_args(argc, argv, "01", &mesg) == 1) {
+	StringValue(mesg);	/* ensure mesg can be converted to String */
+    }
+    rb_iv_set(exc, "mesg", mesg);
     rb_iv_set(exc, "bt", Qnil);
 
     return exc;
 }
 
-/*
- *  Document-method: exception
- *
- *  call-seq:
- *     exc.exception(string) -> an_exception or exc
- *  
- *  With no argument, or if the argument is the same as the receiver,
- *  return the receiver. Otherwise, create a new
- *  exception object of the same class as the receiver, but with a
- *  message equal to <code>string.to_str</code>.
- *     
- */
-
 static VALUE
 exc_exception(argc, argv, self)
     int argc;
@@ -389,50 +326,17 @@ exc_exception(argc, argv, self)
     return exc;
 }
 
-/*
- * call-seq:
- *   exception.to_s   =>  string
- *
- * Returns exception's message (or the name of the exception if
- * no message is set).
- */
-
 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_name(CLASS_OF(exc));
+    if (NIL_P(mesg)) return rb_class_path(CLASS_OF(exc));
     if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
     return mesg;
 }
 
-/*
- * call-seq:
- *   exception.message   =>  string
- *   exception.to_str    =>  string
- *
- * Returns the result of invoking <code>exception.to_s</code>.
- * Normally this returns the exception's message or name. By
- * supplying a to_str method, exceptions are agreeing to
- * be used where Strings are expected.
- */
-
-static VALUE
-exc_to_str(exc)
-    VALUE exc;
-{
-    return rb_funcall(exc, rb_intern("to_s"), 0, 0);
-}
-
-/*
- * call-seq:
- *   exception.inspect   => string
- *
- * Return this exception's class name an message
- */
-
 static VALUE
 exc_inspect(exc)
     VALUE exc;
@@ -442,11 +346,11 @@ exc_inspect(exc)
     klass = CLASS_OF(exc);
     exc = rb_obj_as_string(exc);
     if (RSTRING(exc)->len == 0) {
-	return rb_str_dup(rb_class_name(klass));
+	return rb_str_dup(rb_class_path(klass));
     }
 
     str = rb_str_buf_new2("#<");
-    klass = rb_class_name(klass);
+    klass = rb_class_path(klass);
     rb_str_buf_append(str, klass);
     rb_str_buf_cat(str, ": ", 2);
     rb_str_buf_append(str, exc);
@@ -455,47 +359,18 @@ exc_inspect(exc)
     return str;
 }
 
-/*
- *  call-seq:
- *     exception.backtrace    => array
- *  
- *  Returns any backtrace associated with the exception. The backtrace
- *  is an array of strings, each containing either ``filename:lineNo: in
- *  `method''' or ``filename:lineNo.''
- *     
- *     def a
- *       raise "boom"
- *     end
- *     
- *     def b
- *       a()
- *     end
- *     
- *     begin
- *       b()
- *     rescue => detail
- *       print detail.backtrace.join("\n")
- *     end
- *     
- *  <em>produces:</em>
- *     
- *     prog.rb:2:in `a'
- *     prog.rb:6:in `b'
- *     prog.rb:10
-*/
-
 static VALUE
 exc_backtrace(exc)
     VALUE exc;
 {
-    static ID bt;
+    ID bt = rb_intern("bt");
 
-    if (!bt) bt = rb_intern("bt");
-    return rb_attr_get(exc, bt);
+    if (!rb_ivar_defined(exc, bt)) return Qnil;
+    return rb_ivar_get(exc, bt);
 }
 
-VALUE
-rb_check_backtrace(bt)
+static VALUE
+check_backtrace(bt)
     VALUE bt;
 {
     long i;
@@ -517,78 +392,35 @@ rb_check_backtrace(bt)
     return bt;
 }
 
-/*
- *  call-seq:
- *     exc.set_backtrace(array)   =>  array
- *  
- *  Sets the backtrace information associated with <i>exc</i>. The
- *  argument must be an array of <code>String</code> objects in the
- *  format described in <code>Exception#backtrace</code>.
- *     
- */
-
 static VALUE
 exc_set_backtrace(exc, bt)
     VALUE exc;
     VALUE bt;
 {
-    return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
+    return rb_iv_set(exc, "bt", check_backtrace(bt));
 }
 
-/*
- * call-seq:
- *   SystemExit.new(status=0)   => system_exit
- *
- * Create a new +SystemExit+ exception with the given status.
- */
-
 static VALUE
 exit_initialize(argc, argv, exc)
     int argc;
     VALUE *argv;
     VALUE exc;
 {
-    VALUE status = INT2FIX(EXIT_SUCCESS);
+    VALUE status = INT2NUM(0);
     if (argc > 0 && FIXNUM_P(argv[0])) {
 	status = *argv++;
 	--argc;
     }
-    rb_call_super(argc, argv);
+    exc_initialize(argc, argv, exc);
     rb_iv_set(exc, "status", status);
     return exc;
 }
 
-
-/*
- * call-seq:
- *   system_exit.status   => fixnum
- *
- * Return the status value associated with this system exit.
- */
-
 static VALUE
 exit_status(exc)
     VALUE exc;
 {
-    return rb_attr_get(exc, rb_intern("status"));
-}
-
-
-/*
- * call-seq:
- *   system_exit.success?  => true or false
- *
- * Returns +true+ if exiting successful, +false+ if not.
- */
-
-static VALUE
-exit_success_p(exc)
-    VALUE exc;
-{
-    VALUE status = rb_attr_get(exc, rb_intern("status"));
-    if (NIL_P(status)) return Qtrue;
-    if (status == INT2FIX(EXIT_SUCCESS)) return Qtrue;
-    return Qfalse;
+    return rb_iv_get(exc, "status");
 }
 
 void
@@ -601,190 +433,31 @@ rb_name_error(id, fmt, va_alist)
     va_dcl
 #endif
 {
-    VALUE exc, argv[2];
+    VALUE exc;
+
     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);
+    exc = rb_exc_new2(rb_eNameError, buf);
+    rb_iv_set(exc, "name", ID2SYM(id));
     rb_exc_raise(exc);
 }
 
-/*
- * call-seq:
- *   NameError.new(msg [, name])  => name_error
- *
- * Construct a new NameError exception. If given the <i>name</i>
- * parameter may subsequently be examined using the <code>NameError.name</code>
- * method.
- */
-
-static VALUE
-name_err_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE name;
-
-    name = (argc > 1) ? argv[--argc] : Qnil;
-    rb_call_super(argc, argv);
-    rb_iv_set(self, "name", name);
-    return self;
-}
-
-/*
- *  call-seq:
- *    name_error.name    =>  string or nil
- *
- *  Return the name associated with this NameError exception.
- */
-
 static VALUE
 name_err_name(self)
     VALUE self;
 {
-    return rb_attr_get(self, rb_intern("name"));
-}
-
-/*
- * call-seq:
- *  name_error.to_s   => string
- *
- * Produce a nicely-formated string representing the +NameError+.
- */
-
-static VALUE
-name_err_to_s(exc)
-    VALUE exc;
-{
-    VALUE mesg = rb_attr_get(exc, rb_intern("mesg")), str = mesg;
-
-    if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
-    StringValue(str);
-    if (str != mesg) {
-	rb_iv_set(exc, "mesg", mesg = str);
-    }
-    if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
-    return mesg;
-}
-
-/*
- * call-seq:
- *   NoMethodError.new(msg, name [, args])  => no_method_error
- *
- * Construct a NoMethodError exception for a method of the given name
- * called with the given arguments. The name may be accessed using
- * the <code>#name</code> method on the resulting object, and the
- * arguments using the <code>#args</code> method.
- */
-
-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;
-}
-
-/* :nodoc: */
-static void
-name_err_mesg_mark(ptr)
-    VALUE *ptr;
-{
-    rb_gc_mark_locations(ptr, ptr+3);
-}
-
-/* :nodoc: */
-static VALUE
-name_err_mesg_new(obj, mesg, recv, method)
-    VALUE obj, mesg, recv, method;
-{
-    VALUE *ptr = ALLOC_N(VALUE, 3);
-
-    ptr[0] = mesg;
-    ptr[1] = recv;
-    ptr[2] = method;
-    return Data_Wrap_Struct(rb_cNameErrorMesg, name_err_mesg_mark, -1, ptr);
-}
-
-/* :nodoc: */
-static VALUE
-name_err_mesg_to_str(obj)
-    VALUE obj;
-{
-    VALUE *ptr, mesg;
-    Data_Get_Struct(obj, VALUE, ptr);
-
-    mesg = ptr[0];
-    if (NIL_P(mesg)) return Qnil;
-    else {
-	char *desc = 0;
-	VALUE d = 0, args[3];
-
-	obj = ptr[1];
-	switch (TYPE(obj)) {
-	  case T_NIL:
-	    desc = "nil";
-	    break;
-	  case T_TRUE:
-	    desc = "true";
-	    break;
-	  case T_FALSE:
-	    desc = "false";
-	    break;
-	  default:
-	    d = rb_protect(rb_inspect, obj, 0);
-	    if (NIL_P(d) || RSTRING(d)->len > 65) {
-		d = rb_any_to_s(obj);
-	    }
-	    desc = RSTRING(d)->ptr;
-	    break;
-	}
-	if (desc && desc[0] != '#') {
-	    d = rb_str_new2(desc);
-	    rb_str_cat2(d, ":");
-	    rb_str_cat2(d, rb_obj_classname(obj));
-	}
-	args[0] = mesg;
-	args[1] = ptr[2];
-	args[2] = d;
-	mesg = rb_f_sprintf(3, args);
-    }
-    if (OBJ_TAINTED(obj)) OBJ_TAINT(mesg);
-    return mesg;
-}
-
-/* :nodoc: */
-static VALUE
-name_err_mesg_load(klass, str)
-    VALUE klass, str;
-{
-    return str;
+    return rb_iv_get(self, "name");
 }
 
-/*
- * call-seq:
- *   no_method_error.args  => obj
- *
- * Return the arguments passed in as the third parameter to
- * the constructor.
- */
-
 static VALUE
 nometh_err_args(self)
     VALUE self;
 {
-    return rb_attr_get(self, rb_intern("args"));
+    return rb_iv_get(self, "args");
 }
 
 void
@@ -796,37 +469,6 @@ rb_invalid_str(str, type)
     rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING(s)->ptr);
 }
 
-/* 
- *  Document-module: Errno
- *
- *  Ruby exception objects are subclasses of <code>Exception</code>.
- *  However, operating systems typically report errors using plain
- *  integers. Module <code>Errno</code> is created dynamically to map
- *  these operating system errors to Ruby classes, with each error
- *  number generating its own subclass of <code>SystemCallError</code>.
- *  As the subclass is created in module <code>Errno</code>, its name
- *  will start <code>Errno::</code>.
- *     
- *  The names of the <code>Errno::</code> classes depend on
- *  the environment in which Ruby runs. On a typical Unix or Windows
- *  platform, there are <code>Errno</code> classes such as
- *  <code>Errno::EACCES</code>, <code>Errno::EAGAIN</code>,
- *  <code>Errno::EINTR</code>, and so on.
- *     
- *  The integer operating system error number corresponding to a
- *  particular error is available as the class constant
- *  <code>Errno::</code><em>error</em><code>::Errno</code>.
- *     
- *     Errno::EACCES::Errno   #=> 13
- *     Errno::EAGAIN::Errno   #=> 11
- *     Errno::EINTR::Errno    #=> 4
- *     
- *  The full list of operating system errors on your particular platform
- *  are available as the constants of <code>Errno</code>.
- *
- *     Errno.constants   #=> E2BIG, EACCES, EADDRINUSE, EADDRNOTAVAIL, ...
- */
-
 static st_table *syserr_tbl;
 
 static VALUE
@@ -862,101 +504,23 @@ get_syserr(n)
     return error;
 }
 
-/*
- * call-seq:
- *   SystemCallError.new(msg, errno)  => system_call_error_subclass
- *
- * If _errno_ corresponds to a known system error code, constructs
- * the appropriate <code>Errno</code> class for that error, otherwise
- * constructs a generic <code>SystemCallError</code> object. The
- * error number is subsequently available via the <code>errno</code>
- * method.
- */
-
-static VALUE
-syserr_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-#if !defined(_WIN32) && !defined(__VMS)
-    char *strerror();
-#endif
-    char *err;
-    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(klass, rb_intern("Errno"));
-    }
-    if (!NIL_P(error)) err = strerror(NUM2LONG(error));
-    else err = "unknown error";
-    if (!NIL_P(mesg)) {
-	VALUE str = mesg;
-	size_t len;
-
-	StringValue(str);
-	len = strlen(err)+RSTRING(str)->len+3;
-	mesg = rb_str_new(0, len);
-	snprintf(RSTRING(mesg)->ptr, len+1, "%s - %.*s", err,
-		(int)RSTRING(str)->len, RSTRING(str)->ptr);
-	rb_str_resize(mesg, strlen(RSTRING(mesg)->ptr));
-    }
-    else {
-	mesg = rb_str_new2(err);
-    }
-    rb_call_super(1, &mesg);
-    rb_iv_set(self, "errno", error);
-    return self;
-}
-
-/*
- * call-seq:
- *   system_call_error.errno   => fixnum
- *
- * Return this SystemCallError's error number.
- */
-
 static VALUE
 syserr_errno(self)
     VALUE self;
 {
-    return rb_attr_get(self, rb_intern("errno"));
+    return rb_iv_get(self, "errno");
 }
 
-/*
- * call-seq:
- *   system_call_error === other  => true or false
- *
- * Return +true+ if the receiver is a generic +SystemCallError+, or
- * if the error numbers _self_ and _other_ are the same.
- */
-
-
 static VALUE
 syserr_eqq(self, exc)
     VALUE self, exc;
 {
-    VALUE num, e;
+    VALUE num;
 
     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"));
+    num = rb_iv_get(exc, "errno");
     if (NIL_P(num)) {
 	VALUE klass = CLASS_OF(exc);
 
@@ -965,21 +529,12 @@ syserr_eqq(self, exc)
 	}
 	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))
+    if (rb_const_get(self, rb_intern("Errno")) == num)
 	return Qtrue;
     return Qfalse;
 }
 
-/*
- *  Descendents of class <code>Exception</code> are used to communicate
- *  between <code>raise</code> methods and <code>rescue</code>
- *  statements in <code>begin/end</code> blocks. <code>Exception</code>
- *  objects carry information about the exception---its type (the
- *  exception's class name), an optional descriptive string, and
- *  optional traceback information. Programs may subclass 
- *  <code>Exception</code> to add additional information.
- */
+static void init_syserr _((void));
 
 void
 Init_Exception()
@@ -989,8 +544,8 @@ Init_Exception()
     rb_define_method(rb_eException, "exception", exc_exception, -1);
     rb_define_method(rb_eException, "initialize", exc_initialize, -1);
     rb_define_method(rb_eException, "to_s", exc_to_s, 0);
-    rb_define_method(rb_eException, "to_str", exc_to_str, 0);
-    rb_define_method(rb_eException, "message", exc_to_str, 0);
+    rb_define_method(rb_eException, "to_str", exc_to_s, 0);
+    rb_define_method(rb_eException, "message", exc_to_s, 0);
     rb_define_method(rb_eException, "inspect", exc_inspect, 0);
     rb_define_method(rb_eException, "backtrace", exc_backtrace, 0);
     rb_define_method(rb_eException, "set_backtrace", exc_set_backtrace, 1);
@@ -998,7 +553,6 @@ Init_Exception()
     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_define_method(rb_eSystemExit, "success?", exit_success_p, 0);
 
     rb_eFatal  	    = rb_define_class("fatal", rb_eException);
     rb_eSignal      = rb_define_class("SignalException", rb_eException);
@@ -1010,16 +564,8 @@ Init_Exception()
     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_define_method(rb_eNameError, "to_s", name_err_to_s, 0);
-    rb_cNameErrorMesg = rb_define_class_under(rb_eNameError, "message", rb_cData);
-    rb_define_singleton_method(rb_cNameErrorMesg, "!", name_err_mesg_new, 3);
-    rb_define_method(rb_cNameErrorMesg, "to_str", name_err_mesg_to_str, 0);
-    rb_define_method(rb_cNameErrorMesg, "_dump", name_err_mesg_to_str, 1);
-    rb_define_singleton_method(rb_cNameErrorMesg, "_load", name_err_mesg_load, 1);
     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);
@@ -1031,15 +577,7 @@ Init_Exception()
     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_define_global_function("warn", rb_warn_m, 1);
+    init_syserr();
 }
 
 void
@@ -1083,7 +621,7 @@ void
 rb_notimplement()
 {
     rb_raise(rb_eNotImpError,
-	     "%s() function is unimplemented on this machine",
+	     "The %s() function is unimplemented on this machine",
 	     rb_id2name(ruby_frame->last_func));
 }
 
@@ -1111,16 +649,35 @@ void
 rb_sys_fail(mesg)
     const char *mesg;
 {
+#if !defined(_WIN32) && !defined(__VMS)
+    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 : "");
+    if (errno == 0) {
+	rb_bug("rb_sys_fail() - errno == 0");
     }
 
-    arg = mesg ? rb_str_new2(mesg) : Qnil;
-    rb_exc_raise(rb_class_new_instance(1, &arg, get_syserr(n)));
+    err = strerror(errno);
+    if (mesg) {
+	volatile VALUE tmp = rb_str_inspect(rb_str_new2(mesg));
+
+	buf = ALLOCA_N(char, strlen(err)+RSTRING(tmp)->len+4);
+	sprintf(buf, "%s - %s", err, RSTRING(tmp)->ptr);
+    }
+    else {
+	buf = ALLOCA_N(char, strlen(err)+1);
+	strcpy(buf, err);
+    }
+
+    errno = 0;
+    ee = rb_exc_new2(get_syserr(n), buf);
+    rb_iv_set(ee, "errno", INT2NUM(n));
+    rb_exc_raise(ee);
 }
 
 void
@@ -1151,14 +708,14 @@ rb_sys_warning(fmt, va_alist)
 
 void
 rb_load_fail(path)
-    const char *path;
+    char *path;
 {
     rb_loaderror("%s -- %s", strerror(errno), path);
 }
 
 void
 rb_error_frozen(what)
-    const char *what;
+    char *what;
 {
     rb_raise(rb_eTypeError, "can't modify frozen %s", what);
 }
@@ -1170,9 +727,15 @@ rb_check_frozen(obj)
     if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj));
 }
 
-void
-Init_syserr()
+static void
+init_syserr()
 {
+    syserr_tbl = st_init_numtable();
+    rb_eSystemCallError = rb_define_class("SystemCallError", rb_eStandardError);
+    rb_define_method(rb_eSystemCallError, "errno", syserr_errno, 0);
+    rb_define_singleton_method(rb_eSystemCallError, "===", syserr_eqq, 1);
+
+    rb_mErrno = rb_define_module("Errno");
 #ifdef EPERM
     set_syserr(EPERM, "EPERM");
 #endif
@@ -1560,7 +1123,8 @@ err_append(s)
 	}
     }
     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 132d2809cb..17f7f774f3 100644
--- a/eval.c
+++ b/eval.c
@@ -2,8 +2,8 @@
 
   eval.c -
 
-  $Author: shyouhei $
-  $Date: 2007/01/27 15:45:49 $
+  $Author$
+  $Date$
   created at: Thu Jun 10 14:22:17 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -18,23 +18,8 @@
 #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>
-#if defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT)
-#include <ucontext.h>
-#define USE_CONTEXT
-#endif
 #include <setjmp.h>
-
 #include "st.h"
 #include "dln.h"
 
@@ -53,7 +38,9 @@
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
-#  ifndef _AIX
+#  ifdef _AIX
+ #pragma alloca
+#  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca ();
 #   endif
@@ -85,130 +72,11 @@ char *strrchr _((const char*,const char));
 #include "macruby_private.h"
 #endif
 
-#ifdef __VMS
-#include "vmsruby_private.h"
+#ifndef setjmp
+#ifdef HAVE__SETJMP
+#define setjmp(env) _setjmp(env)
+#define longjmp(env,val) _longjmp(env,val)
 #endif
-
-#ifdef USE_CONTEXT
-typedef struct {
-    ucontext_t context;
-    volatile int status;
-} rb_jmpbuf_t[1];
-
-NORETURN(static void rb_jump_context(rb_jmpbuf_t, int));
-static inline void
-rb_jump_context(env, val)
-    rb_jmpbuf_t env;
-    int val;
-{
-    env->status = val;
-    setcontext(&env->context);
-    abort();			/* ensure noreturn */
-}
-/*
- * PRE_GETCONTEXT and POST_GETCONTEXT is a magic for getcontext, gcc,
- * IA64 register stack and SPARC register window combination problem.
- *
- * Assume following code sequence.
- * 
- * 1. set a register in the register stack/window such as r32/l0.
- * 2. call getcontext.
- * 3. use the register.
- * 4. update the register for other use.
- * 5. call setcontext indirectly (or directly).
- *
- * This code should be run as 1->2->3->4->5->3->4.
- * But after second getcontext return (second 3),
- * the register is broken (updated).
- * It's because getcontext/setcontext doesn't preserve the content of the
- * register stack/window.
- *
- * setjmp also doesn't preserve the content of the register stack/window.
- * But it has not the problem because gcc knows setjmp may return twice.
- * gcc detects setjmp and generates setjmp safe code.
- *
- * So setjmp calls before and after the getcontext call makes the code
- * somewhat safe.
- * It fix the problem on IA64.
- * It is not required that setjmp is called at run time, since the problem is
- * register usage.
- *
- * Since the magic setjmp is not enough for SPARC,
- * inline asm is used to prohibit registers in register windows.
- *
- * Since the problem is fixed at gcc 4.0.3, the magic is applied only for
- * prior versions of gcc.
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21957
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22127
- */
-#  define GCC_VERSION_BEFORE(major, minor, patchlevel) \
-    (defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
-     ((__GNUC__ < (major)) ||  \
-      (__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \
-      (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel))))
-#  if GCC_VERSION_BEFORE(4,0,3) && (defined(sparc) || defined(__sparc__))
-#    ifdef __pic__
-/*
- * %l7 is excluded for PIC because it is PIC register.
- * http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
- */
-#      define PRE_GETCONTEXT \
-	 ({ __asm__ volatile ("" : : :  \
-	    "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
-	    "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", \
-	    "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
-#    else
-#      define PRE_GETCONTEXT \
-	 ({ __asm__ volatile ("" : : :  \
-	    "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
-	    "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \
-	    "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
-#    endif
-#    define POST_GETCONTEXT PRE_GETCONTEXT
-#  elif GCC_VERSION_BEFORE(4,0,3) && defined(__ia64)
-static jmp_buf function_call_may_return_twice_jmp_buf;
-int function_call_may_return_twice_false_1 = 0;
-int function_call_may_return_twice_false_2 = 0;
-#    define PRE_GETCONTEXT \
-       (function_call_may_return_twice_false_1 ? \
-        setjmp(function_call_may_return_twice_jmp_buf) : \
-        0)
-#    define POST_GETCONTEXT \
-       (function_call_may_return_twice_false_2 ? \
-        setjmp(function_call_may_return_twice_jmp_buf) : \
-        0)
-#  elif defined(__FreeBSD__) && __FreeBSD__ < 7
-/*
- * workaround for FreeBSD/i386 getcontext/setcontext bug.
- * clear the carry flag by (0 ? ... : ...).
- * FreeBSD PR 92110 http://www.freebsd.org/cgi/query-pr.cgi?pr=92110
- * [ruby-dev:28263]
- */
-static int volatile freebsd_clear_carry_flag = 0;
-#    define PRE_GETCONTEXT \
-       (freebsd_clear_carry_flag ? (freebsd_clear_carry_flag = 0) : 0)
-#  endif
-#  ifndef PRE_GETCONTEXT
-#    define PRE_GETCONTEXT 0
-#  endif
-#  ifndef POST_GETCONTEXT
-#    define POST_GETCONTEXT 0
-#  endif
-#  define ruby_longjmp(env, val) rb_jump_context(env, val)
-#  define ruby_setjmp(j) ((j)->status = 0, \
-     PRE_GETCONTEXT, \
-     getcontext(&(j)->context), \
-     POST_GETCONTEXT, \
-     (j)->status)
-#else
-typedef jmp_buf rb_jmpbuf_t;
-#  if !defined(setjmp) && defined(HAVE__SETJMP)
-#    define ruby_setjmp(env) _setjmp(env)
-#    define ruby_longjmp(env,val) _longjmp(env,val)
-#  else
-#    define ruby_setjmp(env) setjmp(env)
-#    define ruby_longjmp(env,val) longjmp(env,val)
-#  endif
 #endif
 
 #include <sys/types.h>
@@ -226,20 +94,17 @@ typedef jmp_buf rb_jmpbuf_t;
 #include <sys/stat.h>
 
 VALUE rb_cProc;
-VALUE rb_cBinding;
-static VALUE proc_invoke _((VALUE,VALUE,VALUE,VALUE));
+static VALUE rb_cBinding;
+static VALUE proc_invoke _((VALUE,VALUE,int,VALUE));
 static VALUE rb_f_binding _((VALUE));
 static void rb_f_END _((void));
 static VALUE rb_f_block_given_p _((void));
 static VALUE block_pass _((VALUE,NODE*));
-
-VALUE rb_cMethod;
+static VALUE rb_cMethod;
 static VALUE method_call _((int, VALUE*, VALUE));
-VALUE rb_cUnboundMethod;
+static VALUE rb_cUnboundMethod;
 static VALUE umethod_bind _((VALUE, VALUE));
 static VALUE rb_mod_define_method _((int, VALUE*, VALUE));
-NORETURN(static void rb_raise_jump _((VALUE)));
-static VALUE rb_make_exception _((int argc, VALUE *argv));
 
 static int scope_vmode;
 #define SCOPE_PUBLIC    0
@@ -256,7 +121,7 @@ int ruby_safe_level = 0;
    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
+   3 - all genetated objects are tainted
    4 - no global (non-tainted) variable modification/no direct output
 */
 
@@ -268,25 +133,13 @@ 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);
-	}
+	rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d",
+		 rb_id2name(ruby_frame->last_func), ruby_safe_level);
     }
 }
 
 void
-rb_secure_update(obj)
-    VALUE obj;
-{
-    if (!OBJ_TAINTED(obj)) rb_secure(4);
-}
-
-void
-rb_check_safe_obj(x)
+rb_check_safe_str(x)
     VALUE x;
 {
     if (ruby_safe_level > 0 && OBJ_TAINTED(x)){
@@ -299,13 +152,6 @@ rb_check_safe_obj(x)
 	}
     }
     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));
@@ -319,7 +165,7 @@ print_undef(klass, id)
     ID id;
 {
     rb_name_error(id, "undefined method `%s' for %s `%s'",
-		  rb_id2name(id),
+		  rb_id2name(id), 
 		  (TYPE(klass) == T_MODULE) ? "module" : "class",
 		  rb_class2name(klass));
 }
@@ -356,24 +202,6 @@ rb_clear_cache()
 }
 
 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->mid == id &&
-	    RCLASS(ent->origin)->m_tbl == RCLASS(klass)->m_tbl) {
-	    ent->mid = 0;
-	}
-	ent++;
-    }
-}
-
-static void
 rb_clear_cache_by_id(id)
     ID id;
 {
@@ -389,7 +217,7 @@ rb_clear_cache_by_id(id)
     }
 }
 
-void
+static void
 rb_clear_cache_by_class(klass)
     VALUE klass;
 {
@@ -398,7 +226,7 @@ rb_clear_cache_by_class(klass)
     if (!ruby_running) return;
     ent = cache; end = ent + CACHE_SIZE;
     while (ent < end) {
-	if (ent->klass == klass || ent->origin == klass) {
+	if (ent->origin == klass) {
 	    ent->mid = 0;
 	}
 	ent++;
@@ -407,12 +235,7 @@ rb_clear_cache_by_class(klass)
 
 static ID init, eqq, each, aref, aset, match, missing;
 static ID added, singleton_added;
-static ID __id__, __send__, respond_to;
-
-#define NOEX_TAINTED 8
-#define NOEX_SAFE(n) ((n) >> 4)
-#define NOEX_WITH(n, v) ((n) | (v) << 4)
-#define NOEX_WITH_SAFE(n) NOEX_WITH(n, ruby_safe_level)
+static ID __id__, __send__;
 
 void
 rb_add_method(klass, mid, node, noex)
@@ -429,8 +252,8 @@ rb_add_method(klass, mid, node, noex)
     }
     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;
+	mid == rb_intern("initialize")) {
+	noex = NOEX_PRIVATE | (noex & NOEX_NOSUPER);
     }
     else if (FL_TEST(klass, FL_SINGLETON) && node && nd_type(node) == NODE_CFUNC &&
 	     mid == rb_intern("allocate")) {
@@ -440,16 +263,8 @@ rb_add_method(klass, mid, node, noex)
     }
     if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
     rb_clear_cache_by_id(mid);
-    body = NEW_METHOD(node, NOEX_WITH_SAFE(noex));
+    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
@@ -458,7 +273,8 @@ rb_define_alloc_func(klass, func)
     VALUE (*func) _((VALUE));
 {
     Check_Type(klass, T_CLASS);
-    rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0), NOEX_PRIVATE);
+    rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0),
+		  NOEX_PRIVATE|NOEX_CFUNC);
 }
 
 void
@@ -506,7 +322,7 @@ rb_get_method_body(klassp, idp, noexp)
 	ent->mid = ent->mid0 = id;
 	ent->noex   = 0;
 	ent->method = 0;
-
+	
 	return 0;
     }
 
@@ -547,16 +363,6 @@ rb_get_method_body(klassp, idp, noexp)
     return body;
 }
 
-NODE*
-rb_method_node(klass, id)
-    VALUE klass;
-    ID id;
-{
-    int noex;
-
-    return rb_get_method_body(&klass, &id, &noex);
-}
-
 static void
 remove_method(klass, mid)
     VALUE klass;
@@ -574,17 +380,12 @@ remove_method(klass, mid)
     if (mid == __id__ || mid == __send__ || mid == init) {
 	rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
     }
-    if (st_lookup(RCLASS(klass)->m_tbl, mid, (st_data_t *)&body)) {
-	if (!body || !body->nd_body) body = 0;
-	else {
-	    st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *)&body);
-	}
-    }
-    if (!body) {
+    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));
     }
-    rb_clear_cache_for_undef(klass, mid);
+    rb_clear_cache_by_id(mid);
     if (FL_TEST(klass, FL_SINGLETON)) {
 	rb_funcall(rb_iv_get(klass, "__attached__"), singleton_removed, 1, ID2SYM(mid));
     }
@@ -601,37 +402,33 @@ rb_remove_method(klass, name)
     remove_method(klass, rb_intern(name));
 }
 
-/*
- *  call-seq:
- *     remove_method(symbol)   => self
- *  
- *  Removes the method identified by _symbol_ from the current
- *  class. For an example, see <code>Module.undef_method</code>.
- */
-
 static VALUE
-rb_mod_remove_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++) {
-	remove_method(mod, rb_to_id(argv[i]));
-    }
+    remove_method(mod, rb_to_id(name));
     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_NOSUPER;
+    }
+    else {
+	rb_add_method(klass, mid, 0, NOEX_UNDEF);
+    }
 }
 
 void
@@ -639,7 +436,20 @@ rb_enable_super(klass, name)
     VALUE klass;
     const char *name;
 {
-    rb_warn("rb_enable_super() is obsolete");
+    VALUE origin;
+    NODE *body;
+    ID mid = rb_intern(name);
+
+    body = search_method(klass, mid, &origin);
+    if (!body) {
+	print_undef(klass, mid);
+    }
+    if (!body->nd_body) {
+	remove_method(klass, mid);
+    }
+    else {
+	body->nd_noex &= ~NOEX_NOSUPER;
+    }
 }
 
 static void
@@ -706,7 +516,6 @@ rb_attr(klass, id, read, write, ex)
     char *buf;
     ID attriv;
     int noex;
-    size_t len;
 
     if (!ex) noex = NOEX_PUBLIC;
     else {
@@ -724,22 +533,22 @@ rb_attr(klass, id, read, write, ex)
 	}
     }
 
-    if (!rb_is_local_id(id) && !rb_is_const_id(id)) {
-	rb_name_error(id, "invalid attribute name `%s'", rb_id2name(id));
-    }
     name = rb_id2name(id);
     if (!name) {
 	rb_raise(rb_eArgError, "argument needs to be symbol or string");
     }
-    len = strlen(name)+2;
-    buf = ALLOCA_N(char,len);
-    snprintf(buf, len, "@%s", name);
+    buf = ALLOCA_N(char,strlen(name)+2);
+    sprintf(buf, "@%s", name);
     attriv = rb_intern(buf);
     if (read) {
 	rb_add_method(klass, id, NEW_IVAR(attriv), noex);
+	rb_funcall(klass, added, 1, ID2SYM(id));
     }
     if (write) {
-	rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex);
+	sprintf(buf, "%s=", name);
+	id = rb_intern(buf);
+	rb_add_method(klass, id, NEW_ATTRSET(attriv), noex);
+	rb_funcall(klass, added, 1, ID2SYM(id));
     }
 }
 
@@ -750,8 +559,8 @@ extern NODE *ruby_eval_tree_begin;
 extern NODE *ruby_eval_tree;
 extern int ruby_nerrs;
 
-VALUE rb_eLocalJumpError;
-VALUE rb_eSysStackError;
+static VALUE rb_eLocalJumpError;
+static VALUE rb_eSysStackError;
 
 extern VALUE ruby_top_self;
 
@@ -760,17 +569,16 @@ struct SCOPE *ruby_scope;
 static struct FRAME *top_frame;
 static struct SCOPE *top_scope;
 
-static unsigned long frame_unique = 0;
-
 #define PUSH_FRAME() do {		\
     struct FRAME _frame;		\
     _frame.prev = ruby_frame;		\
     _frame.tmp  = 0;			\
     _frame.node = ruby_current_node;	\
     _frame.iter = ruby_iter->iter;	\
+    _frame.cbase = ruby_frame->cbase;	\
     _frame.argc = 0;			\
-    _frame.flags = 0;			\
-    _frame.uniq = frame_unique++;	\
+    _frame.argv = 0;			\
+    _frame.flags = FRAME_ALLOCA;	\
     ruby_frame = &_frame
 
 #define POP_FRAME()  			\
@@ -778,58 +586,69 @@ static unsigned long frame_unique = 0;
     ruby_frame = _frame.prev;		\
 } while (0)
 
+struct BLOCKTAG {
+    struct RBasic super;
+    long dst;
+    long flags;
+};
+
 struct BLOCK {
     NODE *var;
     NODE *body;
     VALUE self;
     struct FRAME frame;
     struct SCOPE *scope;
+    struct BLOCKTAG *tag;
     VALUE klass;
-    NODE *cref;
     int iter;
     int vmode;
     int flags;
-    int uniq;
     struct RVarmap *dyna_vars;
     VALUE orig_thread;
     VALUE wrapper;
-    VALUE block_obj;
-    struct BLOCK *outer;
     struct BLOCK *prev;
 };
 
 #define BLOCK_D_SCOPE 1
-#define BLOCK_LAMBDA  2
+#define BLOCK_DYNAMIC 2
+#define BLOCK_ORPHAN  4
 
 static struct BLOCK *ruby_block;
-static unsigned long block_unique = 1;
+
+static struct BLOCKTAG*
+new_blktag()
+{
+    NEWOBJ(blktag, struct BLOCKTAG);
+    OBJSETUP(blktag, 0, T_BLKTAG);
+    blktag->dst = 0;
+    blktag->flags = 0;
+    return blktag;
+}
 
 #define PUSH_BLOCK(v,b) do {		\
     struct BLOCK _block;		\
-    _block.var = (v);			\
-    _block.body = (b);			\
+    _block.tag = new_blktag();		\
+    _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.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;		\
-    _block.uniq = (b)?block_unique++:0; \
-    if (b) {				\
-	prot_tag->blkid = _block.uniq;  \
-    }                                   \
     ruby_block = &_block
 
-#define POP_BLOCK() \
-   ruby_block = _block.prev; \
+#define POP_BLOCK() 			\
+   if (_block.tag->flags & (BLOCK_DYNAMIC)) \
+       _block.tag->flags |= BLOCK_ORPHAN; \
+   else	if (!(_block.scope->flags & SCOPE_DONT_RECYCLE)) \
+       rb_gc_force_recycle((VALUE)_block.tag); \
+   ruby_block = _block.prev; 		\
 } while (0)
 
 struct RVarmap *ruby_dyna_vars;
@@ -839,17 +658,15 @@ struct RVarmap *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); \
+   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 DVAR_DONT_RECYCLE FL_USER2
 
-#define DMETHOD_P() (ruby_frame->flags & FRAME_DMETH)
-
 static struct RVarmap*
 new_dvar(id, value, prev)
     ID id;
@@ -988,7 +805,6 @@ static struct iter *ruby_iter;
 #define ITER_NOT 0
 #define ITER_PRE 1
 #define ITER_CUR 2
-#define ITER_PAS 3
 
 #define PUSH_ITER(i) do {		\
     struct iter _iter;			\
@@ -1001,15 +817,14 @@ static struct iter *ruby_iter;
 } while (0)
 
 struct tag {
-    rb_jmpbuf_t buf;
+    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;
-    int blkid;
 };
 static struct tag *prot_tag;
 
@@ -1022,29 +837,29 @@ static struct tag *prot_tag;
     _tag.scope = ruby_scope;		\
     _tag.tag = ptag;			\
     _tag.dst = 0;			\
-    _tag.blkid = 0;			\
     prot_tag = &_tag
 
-#define PROT_NONE   Qfalse	/* 0 */
-#define PROT_THREAD Qtrue	/* 2 */
-#define PROT_FUNC   INT2FIX(0)	/* 1 */
-#define PROT_LOOP   INT2FIX(1)	/* 3 */
-#define PROT_LAMBDA INT2FIX(2)	/* 5 */
-#define PROT_YIELD  INT2FIX(3)	/* 7 */
+#define PROT_NONE   0
+#define PROT_FUNC   -1
+#define PROT_THREAD -2
 
-#define EXEC_TAG()    (FLUSH_REGISTER_WINDOWS, ruby_setjmp(prot_tag->buf))
+#define EXEC_TAG()    (FLUSH_REGISTER_WINDOWS, setjmp(prot_tag->buf))
 
 #define JUMP_TAG(st) do {		\
     ruby_frame = prot_tag->frame;	\
     ruby_iter = prot_tag->iter;		\
-    ruby_longjmp(prot_tag->buf,(st));	\
+    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 POP_TMPTAG()			\
+    prot_tag = _tag.prev;		\
+} while (0)
 
 #define TAG_RETURN	0x1
 #define TAG_BREAK	0x2
@@ -1059,16 +874,15 @@ static struct tag *prot_tag;
 VALUE ruby_class;
 static VALUE ruby_wrapper;	/* security wrapper */
 
-#define PUSH_CLASS(c) do {		\
-    VALUE _class = ruby_class;		\
-    ruby_class = (c)
+#define PUSH_CLASS() do {		\
+    VALUE _class = ruby_class
 
 #define POP_CLASS() ruby_class = _class; \
 } while (0)
 
 static NODE *ruby_cref = 0;
 static NODE *top_cref;
-#define PUSH_CREF(c) ruby_cref = NEW_NODE(NODE_CREF,(c),0,ruby_cref)
+#define PUSH_CREF(c) ruby_cref = rb_node_newnode(NODE_CREF,(c),0,ruby_cref)
 #define POP_CREF() ruby_cref = ruby_cref->nd_next
 
 #define PUSH_SCOPE() do {		\
@@ -1090,15 +904,15 @@ static void scope_dup _((struct SCOPE *));
 
 #define POP_SCOPE() 			\
     if (ruby_scope->flags & SCOPE_DONT_RECYCLE) {\
-	if (_old) scope_dup(_old);	\
+       if (_old) scope_dup(_old);	\
     }					\
     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) {	\
+            ruby_scope != top_scope) {	\
 	    rb_gc_force_recycle((VALUE)ruby_scope);\
-	}				\
+        }				\
     }					\
     ruby_scope->flags |= SCOPE_NOSTACK;	\
     ruby_scope = _old;			\
@@ -1110,45 +924,15 @@ static VALUE eval _((VALUE,VALUE,VALUE,char*,int));
 static NODE *compile _((VALUE, char*, int));
 
 static VALUE rb_yield_0 _((VALUE, VALUE, VALUE, int, int));
-
-#define YIELD_LAMBDA_CALL 1
-#define YIELD_PROC_CALL   2
-#define YIELD_PUBLIC_DEF  4
-#define YIELD_FUNC_AVALUE 1
-#define YIELD_FUNC_SVALUE 2
-
 static VALUE rb_call _((VALUE,VALUE,ID,int,const VALUE*,int));
 static VALUE module_setup _((VALUE,NODE*));
 
 static VALUE massign _((VALUE,NODE*,VALUE,int));
 static void assign _((VALUE,NODE*,VALUE,int));
 
-typedef struct event_hook {
-    rb_event_hook_func_t func;
-    rb_event_t events;
-    struct event_hook *next;
-} rb_event_hook_t;
-
-static rb_event_hook_t *event_hooks;
-
-#define EXEC_EVENT_HOOK(event, node, self, id, klass) \
-    do { \
-	rb_event_hook_t *hook = event_hooks; \
-        rb_event_hook_func_t hook_func; \
-        rb_event_t events; \
-	\
-	while (hook) { \
-            hook_func = hook->func; \
-            events = hook->events; \
-            hook = hook->next; \
-	    if (events & event) \
-		(*hook_func)(event, node, self, id, klass); \
-	} \
-    } while (0)
-
 static VALUE trace_func = 0;
 static int tracing = 0;
-static void call_trace_func _((rb_event_t,NODE*,VALUE,ID,VALUE));
+static void call_trace_func _((char*,NODE*,VALUE,ID,VALUE));
 
 #if 0
 #define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
@@ -1161,60 +945,35 @@ void
 ruby_set_current_source()
 {
     if (ruby_current_node) {
-	ruby_sourcefile = ruby_current_node->nd_file;
+        ruby_sourcefile = ruby_current_node->nd_file;
 	ruby_sourceline = nd_line(ruby_current_node);
     }
 }
 
 static void
-#ifdef HAVE_STDARG_PROTOTYPES
-warn_printf(const char *fmt, ...)
-#else
-warn_printf(fmt, va_alist)
-    const char *fmt;
-    va_dcl
-#endif
-{
-    char buf[BUFSIZ];
-    va_list args;
-
-    va_init_list(args, fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
-    va_end(args);
-    rb_write_error(buf);
-}
-
-#define warn_print(x) rb_write_error(x)
-#define warn_print2(x,l) rb_write_error2(x,l)
-
-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->orig_func));
+	    fprintf(stderr, "%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", ruby_sourcefile);
 	}
 	else {
-	    warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
+	    fprintf(stderr, "%s:%d", ruby_sourcefile, ruby_sourceline);
 	}
     }
 }
 
-VALUE rb_check_backtrace(VALUE);
-
 static VALUE
 get_backtrace(info)
     VALUE info;
 {
     if (NIL_P(info)) return Qnil;
-    info = rb_funcall(info, rb_intern("backtrace"), 0);
-    if (NIL_P(info)) return Qnil;
-    return rb_check_backtrace(info);
+    return rb_funcall(info, rb_intern("backtrace"), 0);
 }
 
 static void
@@ -1228,7 +987,7 @@ static void
 error_print()
 {
     VALUE errat = Qnil;		/* OK */
-    volatile VALUE eclass, e;
+    volatile VALUE eclass;
     char *einfo;
     long elen;
 
@@ -1241,13 +1000,13 @@ error_print()
     else {
 	errat = Qnil;
     }
-    if (EXEC_TAG()) goto error;
+    POP_TAG();
     if (NIL_P(errat)){
 	ruby_set_current_source();
 	if (ruby_sourcefile)
-	    warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
+	    fprintf(stderr, "%s:%d", ruby_sourcefile, ruby_sourceline);
 	else
-	    warn_printf("%d", ruby_sourceline);
+	    fprintf(stderr, "%d", ruby_sourceline);
     }
     else if (RARRAY(errat)->len == 0) {
 	error_pos();
@@ -1257,14 +1016,14 @@ error_print()
 
 	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_funcall(ruby_errinfo, rb_intern("message"), 0, 0);
- 	StringValue(e);
+	VALUE e = rb_obj_as_string(ruby_errinfo);
 	einfo = RSTRING(e)->ptr;
 	elen = RSTRING(e)->len;
     }
@@ -1272,37 +1031,38 @@ error_print()
 	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_name(eclass);
+	epath = rb_class_path(eclass);
 	if (elen == 0) {
-	    warn_print(": ");
-	    warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
-	    warn_print("\n");
+	    fprintf(stderr, ": ");
+	    fwrite(RSTRING(epath)->ptr, 1, RSTRING(epath)->len, stderr);
+	    putc('\n', stderr);
 	}
 	else {
 	    char *tail  = 0;
 	    long 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);
 	    }
 	}
     }
@@ -1318,17 +1078,16 @@ 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();
+    fflush(stderr);
 }
 
 #if defined(__APPLE__)
@@ -1339,27 +1098,10 @@ extern char **environ;
 char **rb_origenviron;
 
 void rb_call_inits _((void));
-void Init_stack _((VALUE*));
+void Init_stack _((void*));
 void Init_heap _((void));
 void Init_ext _((void));
 
-#ifdef HAVE_NATIVETHREAD
-static rb_nativethread_t ruby_thid;
-int 
-is_ruby_native_thread() {
-    return NATIVETHREAD_EQUAL(ruby_thid, NATIVETHREAD_CURRENT());
-}
-
-# ifdef HAVE_NATIVETHREAD_KILL
-void
-ruby_native_thread_kill(sig)
-    int sig;
-{
-    NATIVETHREAD_KILL(ruby_thid, sig);
-}
-# endif
-#endif
-
 void
 ruby_init()
 {
@@ -1371,9 +1113,6 @@ ruby_init()
     if (initialized)
 	return;
     initialized = 1;
-#ifdef HAVE_NATIVETHREAD
-    ruby_thid = NATIVETHREAD_CURRENT();
-#endif
 
     ruby_frame = top_frame = &frame;
     ruby_iter = &iter;
@@ -1400,24 +1139,17 @@ ruby_init()
 	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)ruby_cref;
 	rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
 #ifdef __MACOS__
 	_macruby_init();
-#elif defined(__VMS)
-	_vmsruby_init();
 #endif
 	ruby_prog_init();
-	ALLOW_INTS;
     }
     POP_TAG();
-    if (state) {
-	error_print();
-	exit(EXIT_FAILURE);
-    }
+    if (state) error_print();
     POP_SCOPE();
     ruby_scope = top_scope;
-    top_scope->flags &= ~SCOPE_NOSTACK;
-    ruby_running = 1;
 }
 
 static VALUE
@@ -1441,78 +1173,68 @@ 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 VALUE exception_error;
-static VALUE sysstack_error;
-
-static int
-sysexit_status(err)
-    VALUE err;
-{
-    VALUE st = rb_iv_get(err, "status");
-    return NUM2INT(st);
-}
-
 static int
 error_handle(ex)
     int ex;
 {
-    int status = EXIT_FAILURE;
-
-    if (thread_set_raised()) return EXIT_FAILURE;
     switch (ex & TAG_MASK) {
       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");
+	fprintf(stderr, ": retry outside of rescue clause\n");
+	ex = 1;
 	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",
+	    fprintf(stderr, "%s:%d: uncaught throw\n",
 		    tag->nd_file, nd_line(tag));
 	}
 	else {
 	    error_pos();
-	    warn_printf(": unexpected throw\n");
+	    fprintf(stderr, ": unexpected throw\n");
 	}
+	ex = 1;
 	break;
       case TAG_RAISE:
       case TAG_FATAL:
 	if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	    status = sysexit_status(ruby_errinfo);
+	    VALUE st = rb_iv_get(ruby_errinfo, "status");
+	    ex = NUM2INT(st);
 	}
 	else {
 	    error_print();
+	    ex = 1;
 	}
 	break;
       default:
 	rb_bug("Unknown longjmp status %d", ex);
 	break;
     }
-    thread_reset_raised();
-    return status;
+    return ex;
 }
 
 void
@@ -1527,7 +1249,7 @@ ruby_options(argc, argv)
     if ((state = EXEC_TAG()) == 0) {
 	ruby_process_options(argc, argv);
     }
-    else {
+    if (state) {
 	trace_func = 0;
 	tracing = 0;
 	exit(error_handle(state));
@@ -1537,45 +1259,28 @@ ruby_options(argc, argv)
 
 void rb_exec_end_proc _((void));
 
-static void
-ruby_finalize_0()
+void
+ruby_finalize()
 {
+    int state;
+
     PUSH_TAG(PROT_NONE);
-    if (EXEC_TAG() == 0) {
+    if ((state = EXEC_TAG()) == 0) {
 	rb_trap_exit();
+	rb_exec_end_proc();
+	rb_gc_call_finalizer_at_exit();
     }
     POP_TAG();
-    rb_exec_end_proc();
-}
-
-static void
-ruby_finalize_1()
-{
-    signal(SIGINT, SIG_DFL);
-    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) {
@@ -1584,25 +1289,23 @@ ruby_cleanup(ex)
     }
     else if (ex == 0) {
 	ex = state;
-    }
+    }   
     POP_ITER();
-    ruby_errinfo = err;
+
     ex = error_handle(ex);
-    ruby_finalize_1();
     POP_TAG();
-
-    if (err && rb_obj_is_kind_of(err, rb_eSystemExit)) {
-	VALUE st = rb_iv_get(err, "status");
-	return NUM2INT(st);
-    }
+    ruby_finalize();
     return ex;
 }
 
-static int
-ruby_exec_internal()
+int
+ruby_exec()
 {
     int state;
+    volatile NODE *tmp;
 
+    Init_stack((void*)&tmp);
+    ruby_running = 1;
     PUSH_TAG(PROT_NONE);
     PUSH_ITER(ITER_NOT);
     /* default visibility is private at toplevel */
@@ -1622,22 +1325,13 @@ ruby_stop(ex)
     exit(ruby_cleanup(ex));
 }
 
-int
-ruby_exec()
-{
-    volatile NODE *tmp;
-
-    Init_stack((void*)&tmp);
-    return ruby_exec_internal();
-}
-
 void
 ruby_run()
 {
     int state;
     static int ex;
 
-    if (ruby_nerrs > 0) exit(EXIT_FAILURE);
+    if (ruby_nerrs > 0) exit(ruby_nerrs);
     state = ruby_exec();
     if (state && !ex) ex = state;
     ruby_stop(ex);
@@ -1682,7 +1376,22 @@ rb_eval_string_protect(str, state)
     const char *str;
     int *state;
 {
-    return rb_protect((VALUE (*)_((VALUE)))rb_eval_string, (VALUE)str, state);
+    VALUE result;		/* OK */
+    int status;
+
+    PUSH_TAG(PROT_NONE);
+    if ((status = EXEC_TAG()) == 0) {
+	result = rb_eval_string(str);
+    }
+    POP_TAG();
+    if (state) {
+	*state = status;
+    }
+    if (status != 0) {
+	return Qnil;
+    }
+
+    return result;
 }
 
 VALUE
@@ -1695,14 +1404,16 @@ rb_eval_string_wrap(str, state)
     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);
+    ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,ruby_wrapper,0,0);
     PUSH_SCOPE();
 
     val = rb_eval_string_protect(str, &status);
@@ -1721,119 +1432,69 @@ rb_eval_string_wrap(str, state)
     return val;
 }
 
-NORETURN(static void localjump_error(const char*, VALUE, int));
 static void
-localjump_error(mesg, value, reason)
+localjump_error(mesg, status)
     const char *mesg;
-    VALUE value;
-    int reason;
+    VALUE status;
 {
     VALUE exc = rb_exc_new2(rb_eLocalJumpError, mesg);
-    ID id;
-
-    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;
-    }
-    rb_iv_set(exc, "@reason", ID2SYM(id));
+    rb_iv_set(exc, "@status", status);
     rb_exc_raise(exc);
 }
 
-/*
- * call_seq:
- *   local_jump_error.exit_value  => obj
- *
- * Returns the exit value associated with this +LocalJumpError+.
- */
-static VALUE
-localjump_xvalue(exc)
-    VALUE exc;
-{
-    return rb_iv_get(exc, "@exit_value");
-}
-
-/*
- * call-seq:
- *    local_jump_error.reason   => symbol
- *
- * The reason this block was terminated:
- * :break, :redo, :retry, :next, :return, or :noreason.
- */
-
 static VALUE
-localjump_reason(exc)
+localjump_exitstatus(exc)
     VALUE exc;
 {
-    return rb_iv_get(exc, "@reason");
+    return rb_iv_get(exc, "@status");
 }
 
-NORETURN(static void jump_tag_but_local_jump _((int,VALUE)));
 static void
-jump_tag_but_local_jump(state, val)
+jump_tag_but_local_jump(state)
     int state;
-    VALUE val;
 {
+    VALUE val;
 
-    if (val == Qundef) val = prot_tag->retval;
+    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);
+	localjump_error("unexpected return", val);
 	break;
       case TAG_NEXT:
-	localjump_error("unexpected next", val, state);
+	localjump_error("unexpected next", val);
+	break;
+      case TAG_BREAK:
+	localjump_error("unexpected break", val);
 	break;
       case TAG_REDO:
-	localjump_error("unexpected redo", Qnil, state);
+	localjump_error("unexpected redo", Qnil);
 	break;
       case TAG_RETRY:
-	localjump_error("retry outside of rescue clause", Qnil, state);
+	localjump_error("retry outside of rescue clause", Qnil);
 	break;
       default:
+	JUMP_TAG(state);
 	break;
     }
-    JUMP_TAG(state);
 }
 
 VALUE
-rb_eval_cmd(cmd, arg, level)
+rb_eval_cmd(cmd, arg, tcheck)
     VALUE cmd, arg;
-    int level;
+    int tcheck;
 {
     int state;
-    VALUE val = Qnil;		/* OK */
+    VALUE val;			/* OK */
     struct SCOPE *saved_scope;
     volatile int safe = ruby_safe_level;
 
-    if (OBJ_TAINTED(cmd)) {
-	level = 4;
-    }
     if (TYPE(cmd) != T_STRING) {
 	PUSH_ITER(ITER_NOT);
-	PUSH_TAG(PROT_NONE);
-	ruby_safe_level = level;
-	if ((state = EXEC_TAG()) == 0) {
-	    val = rb_funcall2(cmd, rb_intern("call"), RARRAY(arg)->len, RARRAY(arg)->ptr);
-	}
-	ruby_safe_level = safe;
-	POP_TAG();
+	val = rb_funcall2(cmd, rb_intern("call"), RARRAY(arg)->len, RARRAY(arg)->ptr);
 	POP_ITER();
-	if (state) JUMP_TAG(state);
 	return val;
     }
 
@@ -1841,28 +1502,69 @@ rb_eval_cmd(cmd, arg, level)
     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);
+    ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,0,0,0);
+    RNODE(ruby_frame->cbase)->nd_clss = ruby_wrapper ? ruby_wrapper : rb_cObject;
 
-    ruby_safe_level = level;
+    if (tcheck && OBJ_TAINTED(cmd)) {
+	ruby_safe_level = 4;
+    }
 
     PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
 	val = eval(ruby_top_self, cmd, Qnil, 0, 0);
     }
     if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
-	scope_dup(saved_scope);
+       scope_dup(saved_scope);
     ruby_scope = saved_scope;
     ruby_safe_level = safe;
     POP_TAG();
     POP_FRAME();
 
-    jump_tag_but_local_jump(state, val);
+    jump_tag_but_local_jump(state);
     return val;
 }
 
-#define ruby_cbase (ruby_cref->nd_clss)
+static VALUE
+superclass(self, node)
+    VALUE self;
+    NODE *node;
+{
+    VALUE val;			/* OK */
+    int state;
+
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	val = rb_eval(self, node);
+    }
+    POP_TAG();
+    if (state) {
+	switch (nd_type(node)) {
+	  case NODE_COLON2:
+	    rb_raise(rb_eTypeError, "undefined superclass `%s'",
+		     rb_id2name(node->nd_mid));
+	  case NODE_CONST:
+	    rb_raise(rb_eTypeError, "undefined superclass `%s'",
+		     rb_id2name(node->nd_vid));
+	  default:
+	    break;
+	}
+	JUMP_TAG(state);
+    }
+    if (TYPE(val) != T_CLASS) {
+	rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
+		 rb_obj_classname(val));
+    }
+    if (FL_TEST(val, FL_SINGLETON)) {
+	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
+    }
+
+    return val;
+}
+
+#define ruby_cbase (RNODE(ruby_frame->cbase)->nd_clss)
 
 static VALUE
 ev_const_defined(cref, id, self)
@@ -1871,18 +1573,13 @@ ev_const_defined(cref, id, self)
     VALUE self;
 {
     NODE *cbase = cref;
-    VALUE result;
 
     while (cbase && cbase->nd_next) {
 	struct RClass *klass = RCLASS(cbase->nd_clss);
 
-	if (!NIL_P(klass)) {
-	    if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) {
-		if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) {
-		    return Qfalse;
-		}
-		return Qtrue;
-	    }
+	if (NIL_P(klass)) return rb_const_defined(CLASS_OF(self), id);
+	if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, 0)) {
+	    return Qtrue;
 	}
 	cbase = cbase->nd_next;
     }
@@ -1901,57 +1598,33 @@ ev_const_get(cref, id, self)
     while (cbase && cbase->nd_next) {
 	VALUE klass = cbase->nd_clss;
 
-	if (!NIL_P(klass)) {
-	    while (RCLASS(klass)->iv_tbl &&
-		   st_lookup(RCLASS(klass)->iv_tbl, id, &result)) {
-		if (result == Qundef) {
-		    if (!RTEST(rb_autoload_load(klass, id))) break;
-		    continue;
-		}
-		return result;
-	    }
+	if (NIL_P(klass)) return rb_const_get(CLASS_OF(self), id);
+	if (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, id, &result)) {
+	    return result;
 	}
 	cbase = cbase->nd_next;
     }
-    return rb_const_get(NIL_P(cref->nd_clss) ? CLASS_OF(self): cref->nd_clss, id);
+    return rb_const_get(cref->nd_clss, id);
 }
 
 static VALUE
 cvar_cbase()
 {
-    NODE *cref = ruby_cref;
+    NODE *cref = RNODE(ruby_frame->cbase);
 
-    while (cref && cref->nd_next && (NIL_P(cref->nd_clss) || FL_TEST(cref->nd_clss, FL_SINGLETON))) {
+    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");
 	}
     }
-    if (NIL_P(cref->nd_clss)) {
-	rb_raise(rb_eTypeError, "no class variables available");
-    }
     return cref->nd_clss;
 }
 
-/*
- *  call-seq:
- *     Module.nesting    => array
- *  
- *  Returns the list of +Modules+ nested at the point of call.
- *     
- *     module M1
- *       module M2
- *         $a = Module.nesting
- *       end
- *     end
- *     $a           #=> [M1::M2, M1]
- *     $a[0].name   #=> "M1::M2"
- */
-
 static VALUE
 rb_mod_nesting()
 {
-    NODE *cbase = ruby_cref;
+    NODE *cbase = RNODE(ruby_frame->cbase);
     VALUE ary = rb_ary_new();
 
     while (cbase && cbase->nd_next) {
@@ -1964,24 +1637,10 @@ rb_mod_nesting()
     return ary;
 }
 
-/*
- *  call-seq:
- *     Module.constants   => array
- *  
- *  Returns an array of the names of all constants defined in the
- *  system. This list includes the names of all modules and classes.
- *     
- *     p Module.constants.sort[1..5]
- *     
- *  <em>produces:</em>
- *     
- *     ["ARGV", "ArgumentError", "Array", "Bignum", "Binding"]
- */
-
 static VALUE
 rb_mod_s_constants()
 {
-    NODE *cbase = ruby_cref;
+    NODE *cbase = RNODE(ruby_frame->cbase);
     void *data = 0;
 
     while (cbase) {
@@ -2027,7 +1686,7 @@ rb_undef(klass, id)
     VALUE origin;
     NODE *body;
 
-    if (ruby_cbase == rb_cObject && klass == rb_cObject) {
+    if (ruby_class == rb_cObject && klass == ruby_class) {
 	rb_secure(4);
     }
     if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
@@ -2068,60 +1727,11 @@ rb_undef(klass, id)
     }
 }
 
-/*
- *  call-seq:
- *     undef_method(symbol)    => self
- *  
- *  Prevents the current class from responding to calls to the named
- *  method. Contrast this with <code>remove_method</code>, which deletes
- *  the method from the particular class; Ruby will still search
- *  superclasses and mixed-in modules for a possible receiver.
- *     
- *     class Parent
- *       def hello
- *         puts "In parent"
- *       end
- *     end
- *     class Child < Parent
- *       def hello
- *         puts "In child"
- *       end
- *     end
- *     
- *     
- *     c = Child.new
- *     c.hello
- *     
- *     
- *     class Child
- *       remove_method :hello  # remove from child, still in parent
- *     end
- *     c.hello
- *     
- *     
- *     class Child
- *       undef_method :hello   # prevent any calls to 'hello'
- *     end
- *     c.hello
- *     
- *  <em>produces:</em>
- *     
- *     In child
- *     In parent
- *     prog.rb:23: undefined method `hello' for #<Child:0x401b3bb4> (NoMethodError)
- */
-
-static VALUE
-rb_mod_undef_method(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
+static VALUE
+rb_mod_undef_method(mod, name)
+    VALUE mod, name;
 {
-    int i;
-
-    for (i=0; i<argc; i++) {
-	rb_undef(mod, rb_to_id(argv[i]));
-    }
+    rb_undef(mod, rb_to_id(name));
     return mod;
 }
 
@@ -2131,7 +1741,7 @@ rb_alias(klass, name, def)
     ID name, def;
 {
     VALUE origin;
-    NODE *orig, *body, *node;
+    NODE *orig, *body;
     VALUE singleton = 0;
 
     rb_frozen_class_p(klass);
@@ -2160,14 +1770,8 @@ rb_alias(klass, name, def)
     }
 
     rb_clear_cache_by_id(name);
-    if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, (st_data_t *)&node)) {
-	if (node->nd_cnt == 0 && node->nd_body) {
-	    rb_warning("discarding old %s", rb_id2name(name));
-	}
-    }
     st_insert(RCLASS(klass)->m_tbl, name,
-	      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin),
-				    NOEX_WITH_SAFE(orig->nd_noex)));
+      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin), orig->nd_noex));
     if (singleton) {
 	rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
     }
@@ -2176,28 +1780,6 @@ rb_alias(klass, name, def)
     }
 }
 
-/*
- *  call-seq:
- *     alias_method(new_name, old_name)   => self
- *  
- *  Makes <i>new_name</i> a new copy of the method <i>old_name</i>. This can
- *  be used to retain access to methods that are overridden.
- *     
- *     module Mod
- *       alias_method :orig_exit, :exit
- *       def exit(code=0)
- *         puts "Exiting with code #{code}"
- *         orig_exit(code)
- *       end
- *     end
- *     include Mod
- *     exit(99)
- *     
- *  <em>produces:</em>
- *     
- *     Exiting with code 99
- */
-
 static VALUE
 rb_mod_alias_method(mod, newname, oldname)
     VALUE mod, newname, oldname;
@@ -2211,7 +1793,7 @@ copy_node_scope(node, rval)
     NODE *node;
     NODE *rval;
 {
-    NODE *copy = NEW_NODE(NODE_SCOPE,0,rval,node->nd_next);
+    NODE *copy = rb_node_newnode(NODE_SCOPE,0,rval,node->nd_next);
 
     if (node->nd_tbl) {
 	copy->nd_tbl = ALLOC_N(ID, node->nd_tbl[0]+1);
@@ -2226,58 +1808,54 @@ copy_node_scope(node, rval)
 #ifdef C_ALLOCA
 # define TMP_PROTECT NODE * volatile tmp__protect_tmp=0
 # define TMP_ALLOC(n)							\
-    (tmp__protect_tmp = NEW_NODE(NODE_ALLOCA,				\
-				 ALLOC_N(VALUE,n),tmp__protect_tmp,n),	\
+    (tmp__protect_tmp = rb_node_newnode(NODE_ALLOCA,			\
+			     ALLOC_N(VALUE,n),tmp__protect_tmp,n),	\
      (void*)tmp__protect_tmp->nd_head)
 #else
 # define TMP_PROTECT typedef int foobazzz
 # define TMP_ALLOC(n) ALLOCA_N(VALUE,n)
 #endif
 
-#define SETUP_ARGS0(anode,extra) do {\
+#define SETUP_ARGS0(anode,alen) do {\
     NODE *n = anode;\
     if (!n) {\
 	argc = 0;\
 	argv = 0;\
     }\
     else if (nd_type(n) == NODE_ARRAY) {\
-	argc=anode->nd_alen;\
-	if (argc > 0) {\
-	    int i;\
+	argc=alen;\
+        if (argc > 0) {\
+            int i;\
 	    n = anode;\
-	    argv = TMP_ALLOC(argc+extra);\
+	    argv = TMP_ALLOC(argc);\
 	    for (i=0;i<argc;i++) {\
 		argv[i] = rb_eval(self,n->nd_head);\
 		n=n->nd_next;\
 	    }\
-	}\
-	else {\
+        }\
+        else {\
 	    argc = 0;\
 	    argv = 0;\
-	}\
+        }\
     }\
     else {\
-	VALUE args = rb_eval(self,n);\
+        VALUE args = rb_eval(self,n);\
 	if (TYPE(args) != T_ARRAY)\
 	    args = rb_ary_to_ary(args);\
-	argc = RARRAY(args)->len;\
-	argv = TMP_ALLOC(argc+extra);\
+        argc = RARRAY(args)->len;\
+	argv = ALLOCA_N(VALUE, argc);\
 	MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);\
     }\
 } while (0)
 
-#define SETUP_ARGS(anode) SETUP_ARGS0(anode,0)
+#define SETUP_ARGS(anode) SETUP_ARGS0(anode, anode->nd_alen)
 
 #define BEGIN_CALLARGS do {\
     struct BLOCK *tmp_block = ruby_block;\
-    int tmp_iter = ruby_iter->iter;\
-    switch (tmp_iter) {\
-      case ITER_PRE:\
-	ruby_block = ruby_block->outer;\
-      case ITER_PAS:\
-	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;\
@@ -2301,20 +1879,20 @@ arg_defined(self, node, buf, type)
     if (!node) return type;	/* no args */
     if (nd_type(node) == NODE_ARRAY) {
 	argc=node->nd_alen;
-	if (argc > 0) {
+        if (argc > 0) {
 	    for (i=0;i<argc;i++) {
 		if (!is_defined(self, node->nd_head, buf))
 		    return 0;
 		node = node->nd_next;
 	    }
-	}
+        }
     }
     else if (!is_defined(self, node, buf)) {
 	return 0;
     }
     return type;
 }
-
+    
 static char*
 is_defined(self, node, buf)
     VALUE self;
@@ -2329,10 +1907,10 @@ is_defined(self, node, buf)
     switch (nd_type(node)) {
       case NODE_SUPER:
       case NODE_ZSUPER:
-	if (ruby_frame->last_func == 0) return 0;
+	if (ruby_frame->orig_func == 0) return 0;
 	else if (ruby_frame->last_class == 0) return 0;
-	val = ruby_frame->last_class;
-	if (rb_method_boundp(RCLASS(val)->super, ruby_frame->orig_func, 0)) {
+	else if (rb_method_boundp(RCLASS(ruby_frame->last_class)->super,
+				  ruby_frame->orig_func, 0)) {
 	    if (nd_type(node) == NODE_SUPER) {
 		return arg_defined(self, node->nd_args, buf, "super");
 	    }
@@ -2413,7 +1991,6 @@ is_defined(self, node, buf)
       case NODE_DASGN:
       case NODE_DASGN_CURR:
       case NODE_GASGN:
-      case NODE_IASGN:
       case NODE_CDECL:
       case NODE_CVDECL:
       case NODE_CVASGN:
@@ -2437,7 +2014,7 @@ is_defined(self, node, buf)
 	break;
 
       case NODE_CONST:
-	if (ev_const_defined(ruby_cref, node->nd_vid, self)) {
+	if (ev_const_defined(RNODE(ruby_frame->cbase), node->nd_vid, self)) {
 	    return "constant";
 	}
 	break;
@@ -2462,7 +2039,7 @@ is_defined(self, node, buf)
 	    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:
@@ -2473,12 +2050,6 @@ is_defined(self, node, buf)
 	}
 	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);
@@ -2517,160 +2088,51 @@ static int handle_rescue _((VALUE,NODE*));
 static void blk_free();
 
 static VALUE
-rb_obj_is_proc(proc)
-    VALUE proc;
+rb_obj_is_block(block)
+    VALUE block;
 {
-    if (TYPE(proc) == T_DATA && RDATA(proc)->dfree == (RUBY_DATA_FUNC)blk_free) {
+    if (TYPE(block) == T_DATA && RDATA(block)->dfree == (RUBY_DATA_FUNC)blk_free) {
 	return Qtrue;
     }
     return Qfalse;
 }
 
-void
-rb_add_event_hook(func, events)
-    rb_event_hook_func_t func;
-    rb_event_t events;
+static VALUE
+rb_obj_is_proc(proc)
+    VALUE proc;
 {
-    rb_event_hook_t *hook;
-
-    hook = ALLOC(rb_event_hook_t);
-    hook->func = func;
-    hook->events = events;
-    hook->next = event_hooks;
-    event_hooks = hook;
+    if (rb_obj_is_block(proc) && rb_obj_is_kind_of(proc, rb_cProc)) {
+	return Qtrue;
+    }
+    return Qfalse;
 }
 
-int
-rb_remove_event_hook(func)
-    rb_event_hook_func_t func;
-{
-    rb_event_hook_t *prev, *hook;
-
-    prev = NULL;
-    hook = event_hooks;
-    while (hook) {
-	if (hook->func == func) {
-	    if (prev) {
-		prev->next = hook->next;
-	    }
-	    else {
-		event_hooks = hook->next;
-	    }
-	    xfree(hook);
-	    return 0;
-	}
-	prev = hook;
-	hook = hook->next;
-    }
-    return -1;
-}
-
-/*
- *  call-seq:
- *     set_trace_func(proc)    => proc
- *     set_trace_func(nil)     => nil
- *  
- *  Establishes _proc_ as the handler for tracing, or disables
- *  tracing if the parameter is +nil+. _proc_ takes up
- *  to six parameters: an event name, a filename, a line number, an
- *  object id, a binding, and the name of a class. _proc_ is
- *  invoked whenever an event occurs. Events are: <code>c-call</code>
- *  (call a C-language routine), <code>c-return</code> (return from a
- *  C-language routine), <code>call</code> (call a Ruby method),
- *  <code>class</code> (start a class or module definition),
- *  <code>end</code> (finish a class or module definition),
- *  <code>line</code> (execute code on a new line), <code>raise</code>
- *  (raise an exception), and <code>return</code> (return from a Ruby
- *  method). Tracing is disabled within the context of _proc_.
- *
- *      class Test
- *	def test
- *	  a = 1
- *	  b = 2
- *	end
- *      end
- *
- *      set_trace_func proc { |event, file, line, id, binding, classname|
- *	   printf "%8s %s:%-2d %10s %8s\n", event, file, line, id, classname
- *      }
- *      t = Test.new
- *      t.test
- *
- *	  line prog.rb:11               false
- *      c-call prog.rb:11        new    Class
- *      c-call prog.rb:11 initialize   Object
- *    c-return prog.rb:11 initialize   Object
- *    c-return prog.rb:11        new    Class
- *	  line prog.rb:12               false
- *  	  call prog.rb:2        test     Test
- *	  line prog.rb:3        test     Test
- *	  line prog.rb:4        test     Test
- *      return prog.rb:4        test     Test
- */
-
-
 static VALUE
 set_trace_func(obj, trace)
     VALUE obj, trace;
 {
-    rb_event_hook_t *hook;
-
-    rb_secure(4);
     if (NIL_P(trace)) {
 	trace_func = 0;
-	rb_remove_event_hook(call_trace_func);
 	return Qnil;
     }
     if (!rb_obj_is_proc(trace)) {
 	rb_raise(rb_eTypeError, "trace_func needs to be Proc");
     }
-    trace_func = trace;
-    for (hook = event_hooks; hook; hook = hook->next) {
-	if (hook->func == call_trace_func)
-	    return trace;
-    }
-    rb_add_event_hook(call_trace_func, RUBY_EVENT_ALL);
-    return trace;
-}
-
-static char *
-get_event_name(rb_event_t event)
-{
-    switch (event) {
-    case RUBY_EVENT_LINE:
-	return "line";
-    case RUBY_EVENT_CLASS:
-	return "class";
-    case RUBY_EVENT_END:
-	return "end";
-    case RUBY_EVENT_CALL:
-	return "call";
-    case RUBY_EVENT_RETURN:
-	return "return";
-    case RUBY_EVENT_C_CALL:
-	return "c-call";
-    case RUBY_EVENT_C_RETURN:
-	return "c-return";
-    case RUBY_EVENT_RAISE:
-	return "raise";
-    default:
-	return "unknown";
-    }
+    return trace_func = trace;
 }
 
 static void
 call_trace_func(event, node, self, id, klass)
-    rb_event_t event;
+    char *event;
     NODE *node;
     VALUE self;
     ID id;
     VALUE klass;		/* OK */
 {
-    int state, raised;
+    int state;
     struct FRAME *prev;
     NODE *node_save;
     VALUE srcfile;
-    char *event_name;
 
     if (!trace_func) return;
     if (tracing) return;
@@ -2698,24 +2160,21 @@ call_trace_func(event, node, self, id, klass)
 	    klass = RBASIC(klass)->klass;
 	}
 	else if (FL_TEST(klass, FL_SINGLETON)) {
-	    klass = rb_iv_get(klass, "__attached__");
+	    klass = self;
 	}
     }
     PUSH_TAG(PROT_NONE);
-    raised = thread_reset_raised();
     if ((state = EXEC_TAG()) == 0) {
 	srcfile = rb_str_new2(ruby_sourcefile?ruby_sourcefile:"(ruby)");
-	event_name = get_event_name(event);
-	proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event_name),
+	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);
+		    Qtrue, Qundef);
     }
-    if (raised) thread_set_raised();
-    POP_TAG();
+    POP_TMPTAG();		/* do not propagate retval */
     POP_FRAME();
 
     tracing = 0;
@@ -2728,8 +2187,9 @@ static VALUE
 avalue_to_svalue(v)
     VALUE v;
 {
-    VALUE tmp, top;
+    VALUE tmp;
 
+    if (v == Qundef) return v;
     tmp = rb_check_array_type(v);
     if (NIL_P(tmp)) {
 	return v;
@@ -2738,14 +2198,7 @@ avalue_to_svalue(v)
 	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 RARRAY(tmp)->ptr[0];
     }
     return tmp;
 }
@@ -2754,92 +2207,21 @@ 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 tmp;
-	}
-	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);
+    if (RARRAY(tmp)->len <= 1) {
+	return rb_ary_new3(1, tmp);
     }
     return tmp;
 }
 
 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)
     VALUE self;
     NODE *cpath;
@@ -2870,33 +2252,13 @@ class_prefix(self, cpath)
     }
 }
 
+static void return_check _((void));
 #define return_value(v) do {\
   if ((prot_tag->retval = (v)) == Qundef) {\
     prot_tag->retval = Qnil;\
   }\
 } while (0)
 
-NORETURN(static void return_jump _((VALUE)));
-NORETURN(static void break_jump _((VALUE)));
-NORETURN(static void next_jump _((VALUE)));
-NORETURN(static void unknown_node _((NODE * volatile)));
-
-static void
-unknown_node(node)
-    NODE *volatile node;
-{
-    ruby_current_node = 0;
-    if (node->flags == 0) {
-        rb_bug("terminated node (0x%lx)", node);
-    }
-    else if (BUILTIN_TYPE(node) != T_NODE) {
-        rb_bug("not a node 0x%02lx (0x%lx)", BUILTIN_TYPE(node), node);
-    }
-    else {
-        rb_bug("unknown node type %d (0x%lx)", nd_type(node), node);
-    }
-}
-
 static VALUE
 rb_eval(self, n)
     VALUE self;
@@ -2944,16 +2306,13 @@ rb_eval(self, n)
 
 	/* 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) */
       case NODE_MATCH3:
-	{
+        {
 	    VALUE r = rb_eval(self,node->nd_recv);
 	    VALUE l = rb_eval(self,node->nd_value);
 	    if (TYPE(l) == T_STRING) {
@@ -2967,7 +2326,7 @@ rb_eval(self, n)
 
 	/* node for speed-up(top-level loop for -n/-p) */
       case NODE_OPT_N:
-	PUSH_TAG(PROT_LOOP);
+	PUSH_TAG(PROT_NONE);
 	switch (state = EXEC_TAG()) {
 	  case 0:
 	  opt_n_next:
@@ -3005,9 +2364,11 @@ rb_eval(self, n)
 	RETURN(Qfalse);
 
       case NODE_IF:
-	EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
-			ruby_frame->last_func,
-			ruby_frame->last_class);
+	if (trace_func) {
+	    call_trace_func("line", node, self,
+			    ruby_frame->last_func,
+			    ruby_frame->last_class);
+	}
 	if (RTEST(rb_eval(self, node->nd_cond))) {
 	    node = node->nd_body;
 	}
@@ -3023,10 +2384,12 @@ rb_eval(self, n)
 	    if (nd_type(node) != NODE_WHEN) goto again;
 	    tag = node->nd_head;
 	    while (tag) {
-		EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
-				ruby_frame->last_func,
-				ruby_frame->last_class);
-		if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
+		if (trace_func) {
+		    call_trace_func("line", tag, self,
+				    ruby_frame->last_func,
+				    ruby_frame->last_class);	
+		}
+		if (nd_type(tag->nd_head) == NODE_WHEN) {
 		    VALUE v = rb_eval(self, tag->nd_head->nd_head);
 		    long i;
 
@@ -3064,10 +2427,12 @@ rb_eval(self, n)
 		}
 		tag = node->nd_head;
 		while (tag) {
-		    EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
-				    ruby_frame->last_func,
-				    ruby_frame->last_class);
-		    if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
+		    if (trace_func) {
+			call_trace_func("line", tag, self,
+					ruby_frame->last_func,
+					ruby_frame->last_class);	
+		    }
+		    if (nd_type(tag->nd_head) == NODE_WHEN) {
 			VALUE v = rb_eval(self, tag->nd_head->nd_head);
 			long i;
 
@@ -3093,7 +2458,7 @@ rb_eval(self, n)
 	RETURN(Qnil);
 
       case NODE_WHILE:
-	PUSH_TAG(PROT_LOOP);
+	PUSH_TAG(PROT_NONE);
 	result = Qnil;
 	switch (state = EXEC_TAG()) {
 	  case 0:
@@ -3114,11 +2479,8 @@ 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;
+	    result = prot_tag->retval;
 	  default:
 	    break;
 	}
@@ -3128,7 +2490,7 @@ rb_eval(self, n)
 	RETURN(result);
 
       case NODE_UNTIL:
-	PUSH_TAG(PROT_LOOP);
+	PUSH_TAG(PROT_NONE);
 	result = Qnil;
 	switch (state = EXEC_TAG()) {
 	  case 0:
@@ -3149,11 +2511,8 @@ 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;
+	    result = prot_tag->retval;
 	  default:
 	    break;
 	}
@@ -3169,12 +2528,12 @@ rb_eval(self, n)
       case NODE_ITER:
       case NODE_FOR:
 	{
-	    PUSH_TAG(PROT_LOOP);
+	  iter_retry:
+	    PUSH_TAG(PROT_FUNC);
 	    PUSH_BLOCK(node->nd_var, node->nd_body);
 
 	    state = EXEC_TAG();
 	    if (state == 0) {
-	      iter_retry:
 		PUSH_ITER(ITER_PRE);
 		if (nd_type(node) == NODE_ITER) {
 		    result = rb_eval(self, node->nd_iter);
@@ -3192,19 +2551,27 @@ rb_eval(self, n)
 		}
 		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 || state == TAG_BREAK) {
+		    result = prot_tag->retval;
+		}
 	    }
 	    POP_BLOCK();
 	    POP_TAG();
 	    switch (state) {
 	      case 0:
 		break;
+
+	      case TAG_RETRY:
+		goto iter_retry;
+
+	      case TAG_BREAK:
+		break;
+
+	      case TAG_RETURN:
+		return_value(result);
+		/* fall through */
 	      default:
 		JUMP_TAG(state);
 	    }
@@ -3212,12 +2579,14 @@ rb_eval(self, n)
 	break;
 
       case NODE_BREAK:
-	break_jump(rb_eval(self, node->nd_stts));
+	return_value(rb_eval(self, node->nd_stts));
+	JUMP_TAG(TAG_BREAK);
 	break;
 
       case NODE_NEXT:
 	CHECK_INTS;
-	next_jump(rb_eval(self, node->nd_stts));
+	return_value(rb_eval(self, node->nd_stts));
+	JUMP_TAG(TAG_NEXT);
 	break;
 
       case NODE_REDO:
@@ -3230,83 +2599,74 @@ rb_eval(self, n)
 	JUMP_TAG(TAG_RETRY);
 	break;
 
-      case NODE_SPLAT:
-	result = splat_value(rb_eval(self, node->nd_head));
+      case NODE_RESTARY:
+      case NODE_RESTARY2:
+	result = rb_ary_to_ary(rb_eval(self, node->nd_head));
 	break;
 
-      case NODE_TO_ARY:
-	result = rb_ary_to_ary(rb_eval(self, node->nd_head));
+      case NODE_REXPAND:
+	result = avalue_to_svalue(rb_eval(self, node->nd_head));
 	break;
 
       case NODE_SVALUE:
-	result = avalue_splat(rb_eval(self, node->nd_head));
+	result = rb_eval(self, node->nd_head);
 	if (result == Qundef) result = Qnil;
 	break;
 
       case NODE_YIELD:
-	if (node->nd_head) {
+	if (node->nd_stts) {
 	    result = rb_eval(self, node->nd_head);
-	    ruby_current_node = node;
 	}
 	else {
 	    result = Qundef;	/* no arg */
 	}
 	SET_CURRENT_SOURCE();
-	result = rb_yield_0(result, 0, 0, 0, node->nd_state);
+	result = rb_yield_0(result, 0, 0, 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) {
-	      retry_entry:
 		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;
-		    ruby_errinfo = e_info;
-		    goto retry_entry;
-		}
-		else if (state != TAG_RAISE) {
-		    result = prot_tag->retval;
-		}
-	    }
-	    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);
+			PUSH_TAG(PROT_NONE);
+			if ((state = EXEC_TAG()) == 0) {
+			    result = rb_eval(self, resq->nd_body);
+			}
+			POP_TAG();
+			if (state == TAG_RETRY) {
+			    state = 0;
+			    ruby_errinfo = Qnil;
+			    goto retry_entry;
+			}
+			if (state != TAG_RAISE) {
+			    ruby_errinfo = e_info;
+			}
 			break;
 		    }
 		    resq = resq->nd_head; /* next rescue */
 		}
 	    }
-	    else {
-		result = prot_tag->retval;
-	    }
-	    POP_TAG();
-	    if (state != TAG_RAISE) ruby_errinfo = e_info;
-	    if (state) {
-		JUMP_TAG(state);
-	    }
-	    /* no exception raised */
-	    if (!rescuing && (node = node->nd_else)) { /* else clause given */
-		goto again;
+	    else if (node->nd_else) { /* else clause given */
+		if (!state) {	/* no exception raised */
+		    result = rb_eval(self, node->nd_else);
+		}
 	    }
+	    if (state) JUMP_TAG(state);
 	}
-	break;
+        break;
 
       case NODE_ENSURE:
 	PUSH_TAG(PROT_NONE);
@@ -3344,11 +2704,19 @@ rb_eval(self, n)
 
       case NODE_DOT2:
       case NODE_DOT3:
-        {
-	    VALUE beg = rb_eval(self, node->nd_beg);
-	    VALUE end = rb_eval(self, node->nd_end);
-	    result = rb_range_new(beg, end, nd_type(node) == NODE_DOT3);
-	}	
+	result = rb_range_new(rb_eval(self, node->nd_beg),
+			      rb_eval(self, node->nd_end),
+			      nd_type(node) == NODE_DOT3);
+	if (node->nd_state) break;
+	if (nd_type(node->nd_beg) == NODE_LIT && FIXNUM_P(node->nd_beg->nd_lit) &&
+	    nd_type(node->nd_end) == NODE_LIT && FIXNUM_P(node->nd_end->nd_lit))
+	{
+	    nd_set_type(node, NODE_LIT);
+	    node->nd_lit = result;
+	}
+	else {
+	    node->nd_state = 1;
+	}
 	break;
 
       case NODE_FLIP2:		/* like AWK */
@@ -3391,21 +2759,19 @@ rb_eval(self, n)
 	break;
 
       case NODE_RETURN:
-	return_jump(rb_eval(self, node->nd_stts));
+	return_value(rb_eval(self, node->nd_stts));
+	return_check();
+	JUMP_TAG(TAG_RETURN);
 	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)));
-	}
+	result = rb_ary_concat(rb_eval(self, node->nd_head),
+			       rb_eval(self, node->nd_body));
 	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));
-	}
+	result = rb_ary_push(rb_ary_dup(rb_eval(self, node->nd_head)),
+			     rb_eval(self, node->nd_body));
 	break;
 
       case NODE_ATTRASGN:
@@ -3427,7 +2793,6 @@ rb_eval(self, n)
 	    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];
@@ -3445,7 +2810,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);
 	}
@@ -3460,7 +2824,6 @@ 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);
 	}
@@ -3477,8 +2840,8 @@ rb_eval(self, n)
 	    int argc; VALUE *argv; /* used in SETUP_ARGS */
 	    TMP_PROTECT;
 
-	    if (ruby_frame->last_class == 0) {
-		if (ruby_frame->last_func) {
+	    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));
@@ -3489,27 +2852,20 @@ rb_eval(self, n)
 	    }
 	    if (nd_type(node) == NODE_ZSUPER) {
 		argc = ruby_frame->argc;
-		if (argc && DMETHOD_P()) {
-		    if (TYPE(RBASIC(ruby_scope)->klass) != T_ARRAY ||
-			RARRAY(RBASIC(ruby_scope)->klass)->len != argc) {
-			rb_raise(rb_eRuntimeError, 
-				 "super: specify arguments explicitly");
-		    }
-		    argv = RARRAY(RBASIC(ruby_scope)->klass)->ptr;
-		}
-		else {
-		    argv = ruby_scope->local_vars + 2;
-		}
+		argv = ruby_frame->argv;
 	    }
 	    else {
 		BEGIN_CALLARGS;
 		SETUP_ARGS(node->nd_args);
 		END_CALLARGS;
-		ruby_current_node = node;
 	    }
 
+	    PUSH_ITER(ruby_iter->iter?ITER_PRE:ITER_NOT);
 	    SET_CURRENT_SOURCE();
-	    result = rb_call_super(argc, argv);
+	    result = rb_call(RCLASS(ruby_frame->last_class)->super,
+			     ruby_frame->self, ruby_frame->orig_func,
+			     argc, argv, 3);
+	    POP_ITER();
 	}
 	break;
 
@@ -3527,6 +2883,7 @@ rb_eval(self, n)
 	    if (node->nd_rval) {
 		saved_cref = ruby_cref;
 		ruby_cref = (NODE*)node->nd_rval;
+		ruby_frame->cbase = node->nd_rval;
 	    }
 	    if (node->nd_tbl) {
 		VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1);
@@ -3554,29 +2911,28 @@ rb_eval(self, n)
       case NODE_OP_ASGN1:
 	{
 	    int argc; VALUE *argv; /* used in SETUP_ARGS */
-	    VALUE recv, val, tmp;
+	    VALUE recv, val;
 	    NODE *rval;
 	    TMP_PROTECT;
 
 	    recv = rb_eval(self, node->nd_recv);
 	    rval = node->nd_args->nd_head;
-	    SETUP_ARGS0(node->nd_args->nd_body, 1);
-	    val = rb_funcall3(recv, aref, argc, argv);
+	    SETUP_ARGS0(node->nd_args->nd_next, node->nd_args->nd_alen - 1);
+	    val = rb_funcall2(recv, aref, argc-1, argv);
 	    switch (node->nd_mid) {
 	    case 0: /* OR */
-	      if (RTEST(val)) RETURN(val);
-	      val = rb_eval(self, rval);
-	      break;
+		if (RTEST(val)) RETURN(val);
+		val = rb_eval(self, rval);
+		break;
 	    case 1: /* AND */
-	      if (!RTEST(val)) RETURN(val);
-	      val = rb_eval(self, rval);
-	      break;
+		if (!RTEST(val)) RETURN(val);
+		val = rb_eval(self, rval);
+		break;
 	    default:
-	      tmp = rb_eval(self, rval);
-	      val = rb_funcall3(val, node->nd_mid, 1, &tmp);
+		val = rb_funcall(val, node->nd_mid, 1, rb_eval(self, rval));
 	    }
-	    argv[argc] = val;
-	    rb_funcall2(recv, aset, argc+1, argv);
+	    argv[argc-1] = val;
+	    rb_funcall2(recv, aset, argc, argv);
 	    result = val;
 	}
 	break;
@@ -3584,22 +2940,22 @@ rb_eval(self, n)
       case NODE_OP_ASGN2:
 	{
 	    ID id = node->nd_next->nd_vid;
-	    VALUE recv, val, tmp;
+	    VALUE recv, val;
 
 	    recv = rb_eval(self, node->nd_recv);
-	    val = rb_funcall3(recv, id, 0, 0);
+	    val = rb_funcall(recv, id, 0);
 	    switch (node->nd_next->nd_mid) {
 	    case 0: /* OR */
-	      if (RTEST(val)) RETURN(val);
-	      val = rb_eval(self, node->nd_value);
-	      break;
+		if (RTEST(val)) RETURN(val);
+		val = rb_eval(self, node->nd_value);
+		break;
 	    case 1: /* AND */
-	      if (!RTEST(val)) RETURN(val);
-	      val = rb_eval(self, node->nd_value);
-	      break;
+		if (!RTEST(val)) RETURN(val);
+		val = rb_eval(self, node->nd_value);
+		break;
 	    default:
-	      tmp = rb_eval(self, node->nd_value);
-	      val = rb_funcall3(val, node->nd_next->nd_mid, 1, &tmp);
+		val = rb_funcall(val, node->nd_next->nd_mid, 1,
+				 rb_eval(self, node->nd_value));
 	    }
 
 	    rb_funcall2(recv, node->nd_next->nd_aid, 1, &val);
@@ -3622,7 +2978,8 @@ rb_eval(self, n)
 	break;
 
       case NODE_MASGN:
-	result = massign(self, node, rb_eval(self, node->nd_value), 0);
+	result = svalue_to_avalue(rb_eval(self, node->nd_value));
+	result = massign(self, node, result, 0);
 	break;
 
       case NODE_LASGN:
@@ -3658,6 +3015,9 @@ rb_eval(self, n)
 	    rb_const_set(class_prefix(self, node->nd_else), node->nd_else->nd_mid, result);
 	}
 	else {
+	    if (NIL_P(ruby_cbase)) {
+		rb_raise(rb_eTypeError, "no class/module to define constant");
+	    }
 	    rb_const_set(ruby_cbase, node->nd_vid, result);
 	}
 	break;
@@ -3695,7 +3055,7 @@ rb_eval(self, n)
 	break;
 
       case NODE_CONST:
-	result = ev_const_get(ruby_cref, node->nd_vid, self);
+	result = ev_const_get(RNODE(ruby_frame->cbase), node->nd_vid, self);
 	break;
 
       case NODE_CVAR:
@@ -3706,7 +3066,7 @@ rb_eval(self, n)
 	if (ruby_scope->local_vars == 0)
 	    rb_bug("unexpected block argument");
 	if (rb_block_given_p()) {
-	    result = rb_block_proc();
+	    result = rb_f_lambda();
 	    ruby_scope->local_vars[node->nd_cnt] = result;
 	}
 	else {
@@ -3719,26 +3079,20 @@ 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 {
+	    switch (TYPE(klass)) {
+	      case T_CLASS:
+	      case T_MODULE:
+		result = rb_const_get(klass, node->nd_mid);
+		break;
+	      default:
 		result = rb_funcall(klass, node->nd_mid, 0, 0);
+		break;
 	    }
 	}
 	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:
@@ -3840,17 +3194,14 @@ rb_eval(self, n)
 	    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_LIT:
-		/* other thread may replace NODE_DREGX_ONCE to NODE_LIT */
-		goto again;
 	      case NODE_DXSTR:
 		result = rb_funcall(self, '`', 1, str);
 		break;
@@ -3865,13 +3216,20 @@ rb_eval(self, n)
 	break;
 
       case NODE_XSTR:
-	result = rb_funcall(self, '`', 1, rb_str_new3(node->nd_lit));
+	result = rb_funcall(self, '`', 1, node->nd_lit);
 	break;
 
       case NODE_LIT:
 	result = node->nd_lit;
 	break;
 
+      case NODE_ATTRSET:
+	if (ruby_frame->argc != 1)
+	    rb_raise(rb_eArgError, "wrong number 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;
@@ -3914,6 +3272,14 @@ rb_eval(self, n)
 	    if (scope_vmode == SCOPE_MODFUNC) {
 		rb_add_method(rb_singleton_class(ruby_class),
 			      node->nd_mid, defn, NOEX_PUBLIC);
+		rb_funcall(ruby_class, singleton_added, 1, ID2SYM(node->nd_mid));
+	    }
+	    if (FL_TEST(ruby_class, FL_SINGLETON)) {
+		rb_funcall(rb_iv_get(ruby_class, "__attached__"),
+			   singleton_added, 1, ID2SYM(node->nd_mid));
+	    }
+	    else {
+		rb_funcall(ruby_class, added, 1, ID2SYM(node->nd_mid));
 	    }
 	    result = Qnil;
 	}
@@ -3946,8 +3312,10 @@ rb_eval(self, n)
 		}
 	    }
 	    defn = copy_node_scope(node->nd_defn, ruby_cref);
-	    rb_add_method(klass, node->nd_mid, defn,
+	    defn->nd_rval = (VALUE)ruby_cref;
+	    rb_add_method(klass, node->nd_mid, defn, 
 			  NOEX_PUBLIC|(body?body->nd_noex&NOEX_UNDEF:0));
+	    rb_funcall(recv, singleton_added, 1, ID2SYM(node->nd_mid));
 	    result = Qnil;
 	}
 	break;
@@ -3956,7 +3324,7 @@ rb_eval(self, n)
 	if (NIL_P(ruby_class)) {
 	    rb_raise(rb_eTypeError, "no class to undef method");
 	}
-	rb_undef(ruby_class, rb_to_id(rb_eval(self, node->u2.node)));
+	rb_undef(ruby_class, node->nd_mid);
 	result = Qnil;
 	break;
 
@@ -3964,13 +3332,12 @@ rb_eval(self, n)
 	if (NIL_P(ruby_class)) {
 	    rb_raise(rb_eTypeError, "no class to make alias");
 	}
-	rb_alias(ruby_class, rb_to_id(rb_eval(self, node->u1.node)),
-		             rb_to_id(rb_eval(self, node->u2.node)));
+	rb_alias(ruby_class, node->nd_new, node->nd_old);
 	result = Qnil;
 	break;
 
       case NODE_VALIAS:
-	rb_alias_variable(node->u1.id, node->u2.id);
+	rb_alias_variable(node->nd_new, node->nd_old);
 	result = Qnil;
 	break;
 
@@ -3978,24 +3345,24 @@ rb_eval(self, n)
 	{
 	    VALUE super, klass, tmp, cbase;
 	    ID cname;
-	    int gen = Qfalse;
-
-	    cbase = class_prefix(self, node->nd_cpath);
-	    cname = node->nd_cpath->nd_mid;
 
 	    if (NIL_P(ruby_cbase)) {
 		rb_raise(rb_eTypeError, "no outer class/module");
 	    }
 	    if (node->nd_super) {
-	       super = rb_eval(self, node->nd_super);
-	       rb_check_inheritable(super);
+		super = superclass(self, node->nd_super);
 	    }
 	    else {
 		super = 0;
 	    }
 
+	    cbase = class_prefix(self, node->nd_cpath);
+	    cname = node->nd_cpath->nd_mid;
+	    if ((cbase == rb_cObject) && rb_autoload_defined(cname)) {
+		rb_autoload_load(cname);
+	    }
 	    if (rb_const_defined_at(cbase, cname)) {
-		klass = rb_const_get_at(cbase, cname);
+		klass = rb_const_get(cbase, cname);
 		if (TYPE(klass) != T_CLASS) {
 		    rb_raise(rb_eTypeError, "%s is not a class",
 			     rb_id2name(cname));
@@ -4003,8 +3370,7 @@ rb_eval(self, n)
 		if (super) {
 		    tmp = rb_class_real(RCLASS(klass)->super);
 		    if (tmp != super) {
-			rb_raise(rb_eTypeError, "superclass mismatch for class %s",
-				 rb_id2name(cname));
+			goto override_class;
 		    }
 		    super = 0;
 		}
@@ -4013,19 +3379,17 @@ rb_eval(self, n)
 		}
 	    }
 	    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);
-		gen = Qtrue;
 	    }
 	    if (ruby_wrapper) {
 		rb_extend_object(klass, ruby_wrapper);
 		rb_include_module(klass, ruby_wrapper);
 	    }
-	    if (super && gen) {
-		rb_class_inherited(super, klass);
-	    }
+	    if (super) rb_class_inherited(super, klass);
 	    result = module_setup(klass, node);
 	}
 	break;
@@ -4040,8 +3404,11 @@ rb_eval(self, n)
 	    }
 	    cbase = class_prefix(self, node->nd_cpath);
 	    cname = node->nd_cpath->nd_mid;
+	    if ((cbase == rb_cObject) && rb_autoload_defined(cname)) {
+		rb_autoload_load(cname);
+	    }
 	    if (rb_const_defined_at(cbase, cname)) {
-		module = rb_const_get_at(cbase, cname);
+		module = rb_const_get(cbase, cname);
 		if (TYPE(module) != T_MODULE) {
 		    rb_raise(rb_eTypeError, "%s is not a module",
 			     rb_id2name(cname));
@@ -4076,12 +3443,12 @@ rb_eval(self, n)
 	    if (ruby_safe_level >= 4 && !OBJ_TAINTED(result))
 		rb_raise(rb_eSecurityError, "Insecure: can't extend object");
 	    klass = rb_singleton_class(result);
-
+	    
 	    if (ruby_wrapper) {
 		rb_extend_object(klass, ruby_wrapper);
 		rb_include_module(klass, ruby_wrapper);
 	    }
-
+	    
 	    result = module_setup(klass, node);
 	}
 	break;
@@ -4097,14 +3464,16 @@ rb_eval(self, n)
 	break;
 
       case NODE_NEWLINE:
-	EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self, 
-			ruby_frame->last_func,
-			ruby_frame->last_class);
+	if (trace_func) {
+	    call_trace_func("line", node, self,
+			    ruby_frame->last_func,
+			    ruby_frame->last_class);	
+	}
 	node = node->nd_next;
 	goto again;
 
       default:
-	unknown_node(node);
+	rb_bug("unknown node type %d", nd_type(node));
     }
   finish:
     CHECK_INTS;
@@ -4124,14 +3493,15 @@ module_setup(module, n)
     NODE * volatile node = n->nd_body;
     int state;
     struct FRAME frame;
-    VALUE result = Qnil;	/* OK */
+    VALUE result;		/* OK */
     TMP_PROTECT;
 
     frame = *ruby_frame;
     frame.tmp = ruby_frame;
     ruby_frame = &frame;
 
-    PUSH_CLASS(module);
+    PUSH_CLASS();
+    ruby_class = module;
     PUSH_SCOPE();
     PUSH_VARS();
 
@@ -4148,10 +3518,12 @@ module_setup(module, n)
     }
 
     PUSH_CREF(module);
+    ruby_frame->cbase = (VALUE)ruby_cref;
     PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
-	EXEC_EVENT_HOOK(RUBY_EVENT_CLASS, n, ruby_cbase,
-			ruby_frame->last_func, ruby_frame->last_class);
+	if (trace_func) {
+	    call_trace_func("class", n, ruby_cbase, ruby_frame->last_func, ruby_frame->last_class);
+	}
 	result = rb_eval(ruby_cbase, node->nd_next);
     }
     POP_TAG();
@@ -4161,54 +3533,27 @@ module_setup(module, n)
     POP_CLASS();
 
     ruby_frame = frame.tmp;
-    EXEC_EVENT_HOOK(RUBY_EVENT_END, n, 0,
-		    ruby_frame->last_func, ruby_frame->last_class);
+    if (trace_func) {
+	call_trace_func("end", n, 0, ruby_frame->last_func, ruby_frame->last_class);
+    }
     if (state) JUMP_TAG(state);
 
     return result;
 }
 
-static NODE *basic_respond_to = 0;
-
-int
-rb_obj_respond_to(obj, id, priv)
-    VALUE obj;
-    ID id;
-    int priv;
-{
-    VALUE klass = CLASS_OF(obj);
-
-    if (rb_method_node(klass, respond_to) == basic_respond_to) {
-	return rb_method_boundp(klass, id, !priv);
-    }
-    else {
-	VALUE args[2];
-	int n = 0;
-	args[n++] = ID2SYM(id);
-	if (priv) args[n++] = Qtrue;
-	return rb_funcall2(obj, respond_to, n, args);
-    }
-}
-
 int
 rb_respond_to(obj, id)
     VALUE obj;
     ID id;
 {
-    return rb_obj_respond_to(obj, id, Qfalse);
+    if (rb_method_boundp(CLASS_OF(obj), id, 0)) {
+	return Qtrue;
+    }
+    return Qfalse;
 }
 
-/*
- *  call-seq:
- *     obj.respond_to?(symbol, include_private=false) => true or false
- *  
- *  Returns +true+> if _obj_ responds to the given
- *  method. Private methods are included in the search only if the
- *  optional second parameter evaluates to +true+.
- */
-
 static VALUE
-obj_respond_to(argc, argv, obj)
+rb_obj_respond_to(argc, argv, obj)
     int argc;
     VALUE *argv;
     VALUE obj;
@@ -4224,32 +3569,6 @@ obj_respond_to(argc, argv, obj)
     return Qfalse;
 }
 
-/*
- *  call-seq:
- *     mod.method_defined?(symbol)    => true or false
- *  
- *  Returns +true+ if the named method is defined by
- *  _mod_ (or its included modules and, if _mod_ is a class,
- *  its ancestors). Public and protected methods are matched.
- *     
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       def method2()  end
- *     end
- *     class C < B
- *       include A
- *       def method3()  end
- *     end
- *     
- *     A.method_defined? :method1    #=> true
- *     C.method_defined? "method1"   #=> true
- *     C.method_defined? "method2"   #=> true
- *     C.method_defined? "method3"   #=> true
- *     C.method_defined? "method4"   #=> false
- */
-
 static VALUE
 rb_mod_method_defined(mod, mid)
     VALUE mod, mid;
@@ -4259,32 +3578,6 @@ rb_mod_method_defined(mod, mid)
 
 #define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f))
 
-/*
- *  call-seq:
- *     mod.public_method_defined?(symbol)   => true or false
- *  
- *  Returns +true+ if the named public method is defined by
- *  _mod_ (or its included modules and, if _mod_ is a class,
- *  its ancestors).
- *     
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       protected
- *       def method2()  end
- *     end
- *     class C < B
- *       include A
- *       def method3()  end
- *     end
- *     
- *     A.method_defined? :method1           #=> true
- *     C.public_method_defined? "method1"   #=> true
- *     C.public_method_defined? "method2"   #=> false
- *     C.method_defined? "method2"          #=> true
- */
-
 static VALUE
 rb_mod_public_method_defined(mod, mid)
     VALUE mod, mid;
@@ -4299,32 +3592,6 @@ rb_mod_public_method_defined(mod, mid)
     return Qfalse;
 }
 
-/*
- *  call-seq:
- *     mod.private_method_defined?(symbol)    => true or false
- *  
- *  Returns +true+ if the named private method is defined by
- *  _ mod_ (or its included modules and, if _mod_ is a class,
- *  its ancestors).
- *     
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       private
- *       def method2()  end
- *     end
- *     class C < B
- *       include A
- *       def method3()  end
- *     end
- *     
- *     A.method_defined? :method1            #=> true
- *     C.private_method_defined? "method1"   #=> false
- *     C.private_method_defined? "method2"   #=> true
- *     C.method_defined? "method2"           #=> false
- */
-
 static VALUE
 rb_mod_private_method_defined(mod, mid)
     VALUE mod, mid;
@@ -4339,32 +3606,6 @@ rb_mod_private_method_defined(mod, mid)
     return Qfalse;
 }
 
-/*
- *  call-seq:
- *     mod.protected_method_defined?(symbol)   => true or false
- *  
- *  Returns +true+ if the named protected method is defined
- *  by _mod_ (or its included modules and, if _mod_ is a
- *  class, its ancestors).
- *     
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       protected
- *       def method2()  end
- *     end
- *     class C < B
- *       include A
- *       def method3()  end
- *     end
- *     
- *     A.method_defined? :method1              #=> true
- *     C.protected_method_defined? "method1"   #=> false
- *     C.protected_method_defined? "method2"   #=> true
- *     C.method_defined? "method2"             #=> true
- */
-
 static VALUE
 rb_mod_protected_method_defined(mod, mid)
     VALUE mod, mid;
@@ -4379,17 +3620,19 @@ rb_mod_protected_method_defined(mod, mid)
     return Qfalse;
 }
 
-NORETURN(static VALUE terminate_process _((int, VALUE)));
+#define terminate_process(status, mesg, mlen) rb_exc_raise(system_exit(status, mesg, mlen))
+
 static VALUE
-terminate_process(status, mesg)
+system_exit(status, mesg, mlen)
     int status;
-    VALUE mesg;
+    const char *mesg;
+    long mlen;
 {
     VALUE args[2];
     args[0] = INT2NUM(status);
-    args[1] = mesg;
+    args[1] = rb_str_new(mesg, mlen);
 
-    rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
+    return rb_class_new_instance(2, args, rb_eSystemExit);
 }
 
 void
@@ -4397,51 +3640,12 @@ rb_exit(status)
     int status;
 {
     if (prot_tag) {
-	terminate_process(status, rb_str_new("exit", 4));
+	terminate_process(status, "exit", 4);
     }
     ruby_finalize();
     exit(status);
 }
 
-
-/*
- *  call-seq:
- *     exit(integer=0)
- *     Kernel::exit(integer=0)
- *     Process::exit(integer=0)
- *  
- *  Initiates the termination of the Ruby script by raising the
- *  <code>SystemExit</code> exception. This exception may be caught. The
- *  optional parameter is used to return a status code to the invoking
- *  environment.
- *     
- *     begin
- *       exit
- *       puts "never get here"
- *     rescue SystemExit
- *       puts "rescued a SystemExit exception"
- *     end
- *     puts "after begin block"
- *     
- *  <em>produces:</em>
- *     
- *     rescued a SystemExit exception
- *     after begin block
- *     
- *  Just prior to termination, Ruby executes any <code>at_exit</code> functions
- *  (see Kernel::at_exit) and runs any object finalizers (see
- *  ObjectSpace::define_finalizer).
- *     
- *     at_exit { puts "at_exit function" }
- *     ObjectSpace.define_finalizer("string",  proc { puts "in finalizer" })
- *     exit
- *     
- *  <em>produces:</em>
- *     
- *     at_exit function
- *     in finalizer
- */
-
 VALUE
 rb_f_exit(argc, argv)
     int argc;
@@ -4452,40 +3656,15 @@ rb_f_exit(argc, argv)
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &status) == 1) {
-	switch (status) {
-	  case Qtrue:
-	    istatus = EXIT_SUCCESS;
-	    break;
-	  case Qfalse:
-	    istatus = EXIT_FAILURE;
-	    break;
-	  default:
-	    istatus = NUM2INT(status);
-#if EXIT_SUCCESS != 0
-	    if (istatus == 0) istatus = EXIT_SUCCESS;
-#endif
-	    break;
-	}
+	istatus = NUM2INT(status);
     }
     else {
-	istatus = EXIT_SUCCESS;
+	istatus = 0;
     }
     rb_exit(istatus);
     return Qnil;		/* not reached */
 }
 
-
-/*
- *  call-seq:
- *     abort
- *     Kernel::abort
- *     Process::abort
- *  
- *  Terminate execution immediately, effectively by calling
- *  <code>Kernel.exit(1)</code>. If _msg_ is given, it is written
- *  to STDERR prior to terminating.
- */
-
 VALUE
 rb_f_abort(argc, argv)
     int argc;
@@ -4496,15 +3675,15 @@ rb_f_abort(argc, argv)
 	if (!NIL_P(ruby_errinfo)) {
 	    error_print();
 	}
-	rb_exit(EXIT_FAILURE);
+	rb_exit(1);
     }
     else {
 	VALUE mesg;
 
 	rb_scan_args(argc, argv, "1", &mesg);
-	StringValue(mesg);
-	rb_io_puts(1, &mesg, rb_stderr);
-	terminate_process(EXIT_FAILURE, mesg);
+	StringValue(argv[0]);
+	rb_io_puts(argc, argv, rb_stderr);
+	terminate_process(1, RSTRING(argv[0])->ptr, RSTRING(argv[0])->len);
     }
     return Qnil;		/* not reached */
 }
@@ -4512,7 +3691,7 @@ rb_f_abort(argc, argv)
 void
 rb_iter_break()
 {
-    break_jump(Qnil);
+    JUMP_TAG(TAG_BREAK);
 }
 
 NORETURN(static void rb_longjmp _((int, VALUE)));
@@ -4525,10 +3704,6 @@ 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);
@@ -4549,29 +3724,18 @@ 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);
-	}
+	StringValue(e);
+	fprintf(stderr, "Exception `%s' at %s:%d - %s\n",
+		rb_obj_classname(ruby_errinfo),
+		ruby_sourcefile, ruby_sourceline,
+		RSTRING(e)->ptr);
+	fflush(stderr);
     }
 
     rb_trap_restore_mask();
-    if (tag != TAG_FATAL) {
-	EXEC_EVENT_HOOK(RUBY_EVENT_RAISE, ruby_current_node,
+    if (trace_func && tag != TAG_FATAL) {
+	call_trace_func("raise", ruby_current_node,
 			ruby_frame->self,
 			ruby_frame->last_func,
 			ruby_frame->last_class);
@@ -4579,7 +3743,6 @@ rb_longjmp(tag, mesg)
     if (!prot_tag) {
 	error_print();
     }
-    thread_reset_raised();
     JUMP_TAG(tag);
 }
 
@@ -4603,44 +3766,11 @@ rb_interrupt()
     rb_raise(rb_eInterrupt, "");
 }
 
-/*
- *  call-seq:
- *     raise
- *     raise(string)
- *     raise(exception [, string [, array]])
- *     fail
- *     fail(string)
- *     fail(exception [, string [, array]])
- *  
- *  With no arguments, raises the exception in <code>$!</code> or raises
- *  a <code>RuntimeError</code> if <code>$!</code> is +nil+.
- *  With a single +String+ argument, raises a
- *  +RuntimeError+ with the string as a message. Otherwise,
- *  the first parameter should be the name of an +Exception+
- *  class (or an object that returns an +Exception+ object when sent
- *  an +exception+ message). The optional second parameter sets the
- *  message associated with the exception, and the third parameter is an
- *  array of callback information. Exceptions are caught by the
- *  +rescue+ clause of <code>begin...end</code> blocks.
- *     
- *     raise "Failed to create socket"
- *     raise ArgumentError, "No parameters", caller
- */
-
 static VALUE
 rb_f_raise(argc, argv)
     int argc;
     VALUE *argv;
 {
-    rb_raise_jump(rb_make_exception(argc, argv));
-    return Qnil;		/* not reached */
-}
-
-static VALUE
-rb_make_exception(argc, argv)
-    int argc;
-    VALUE *argv;
-{
     VALUE mesg;
     ID exception;
     int n;
@@ -4676,17 +3806,9 @@ rb_make_exception(argc, argv)
     if (argc > 0) {
 	if (!rb_obj_is_kind_of(mesg, rb_eException))
 	    rb_raise(rb_eTypeError, "exception object expected");
-	if (argc>2)
-	    set_backtrace(mesg, argv[2]);
+	set_backtrace(mesg, (argc>2)?argv[2]:Qnil);
     }
 
-    return mesg;
-}
-
-static void
-rb_raise_jump(mesg)
-    VALUE mesg;
-{
     if (ruby_frame != top_frame) {
 	PUSH_FRAME();		/* fake frame */
 	*ruby_frame = *_frame.prev->prev;
@@ -4694,6 +3816,8 @@ rb_raise_jump(mesg)
 	POP_FRAME();
     }
     rb_longjmp(TAG_RAISE, mesg);
+
+    return Qnil;		/* not reached */
 }
 
 void
@@ -4706,7 +3830,7 @@ rb_jump_tag(tag)
 int
 rb_block_given_p()
 {
-    if (ruby_frame->iter == ITER_CUR && ruby_block)
+    if (ruby_frame->iter && ruby_block)
 	return Qtrue;
     return Qfalse;
 }
@@ -4717,158 +3841,18 @@ rb_iterator_p()
     return rb_block_given_p();
 }
 
-/*
- *  call-seq:
- *     block_given?   => true or false
- *     iterator?      => true or false
- *  
- *  Returns <code>true</code> if <code>yield</code> would execute a
- *  block in the current context. The <code>iterator?</code> form
- *  is mildly deprecated.
- *     
- *     def try
- *       if block_given?
- *         yield
- *       else
- *         "no block"
- *       end
- *     end
- *     try                  #=> "no block"
- *     try { "hello" }      #=> "hello"
- *     try do "hello" end   #=> "hello"
- */
-
-
 static VALUE
 rb_f_block_given_p()
 {
-    if (ruby_frame->prev && ruby_frame->prev->iter == ITER_CUR && ruby_block)
+    if (ruby_frame->prev && ruby_frame->prev->iter && ruby_block)
 	return Qtrue;
     return Qfalse;
 }
 
-static VALUE rb_eThreadError;
-
-NORETURN(static void proc_jump_error(int, VALUE));
-static void
-proc_jump_error(state, result)
-    int state;
-    VALUE result;
-{
-    char mesg[32];
-    char *statement;
-
-    switch (state) {
-      case TAG_BREAK:
-	statement = "break"; break;
-      case TAG_RETURN:
-	statement = "return"; break;
-      case TAG_RETRY:
-	statement = "retry"; break;
-      default:
-	statement = "local-jump"; break; /* should not happen */
-    }
-    snprintf(mesg, sizeof mesg, "%s from proc-closure", statement);
-    localjump_error(mesg, result, state);
-}
-
-static void
-return_jump(retval)
-    VALUE retval;
-{
-    struct tag *tt = prot_tag;
-    int yield = Qfalse;
-
-    if (retval == Qundef) retval = Qnil;
-    while (tt) {
-	if (tt->tag == PROT_YIELD) {
-	    yield = Qtrue;
-	    tt = tt->prev;
-	}
-	if (tt->tag == PROT_FUNC && tt->frame->uniq == ruby_frame->uniq) {
-	    tt->dst = (VALUE)ruby_frame->uniq;
-	    tt->retval = retval;
-	    JUMP_TAG(TAG_RETURN);
-	}
-	if (tt->tag == PROT_LAMBDA && !yield) {
-	    tt->dst = (VALUE)tt->frame->uniq;
-	    tt->retval = retval;
-	    JUMP_TAG(TAG_RETURN);
-	}
-	if (tt->tag == PROT_THREAD) {
-	    rb_raise(rb_eThreadError, "return can't jump across threads");
-	}
-	tt = tt->prev;
-    }
-    localjump_error("unexpected return", retval, TAG_RETURN);
-}
-
-static void
-break_jump(retval)
-    VALUE retval;
-{
-    struct tag *tt = prot_tag;
-
-    if (retval == Qundef) retval = Qnil;
-    while (tt) {
-	switch (tt->tag) {
-	  case PROT_THREAD:
-	  case PROT_YIELD:
-	  case PROT_LOOP:
-	  case PROT_LAMBDA:
-	    tt->dst = (VALUE)tt->frame->uniq;
-	    tt->retval = retval;
-	    JUMP_TAG(TAG_BREAK);
-	    break;
-	  case PROT_FUNC:
-	    tt = 0;
-	    continue;
-	  default:
-	    break;
-	}
-	tt = tt->prev;
-    }
-    localjump_error("unexpected break", retval, TAG_BREAK);
-}
-
-static void
-next_jump(retval)
-    VALUE retval;
-{
-    struct tag *tt = prot_tag;
-
-    if (retval == Qundef) retval = Qnil;
-    while (tt) {
-	switch (tt->tag) {
-	  case PROT_THREAD:
-	  case PROT_YIELD:
-	  case PROT_LOOP:
-	  case PROT_LAMBDA:
-	  case PROT_FUNC:
-	    tt->dst = (VALUE)tt->frame->uniq;
-	    tt->retval = retval;
-	    JUMP_TAG(TAG_NEXT);
-	    break;
-	  default:
-	    break;
-	}
-	tt = tt->prev;
-    }
-    localjump_error("unexpected next", retval, TAG_NEXT);
-}
-
-void
-rb_need_block()
-{
-    if (!rb_block_given_p()) {
-	localjump_error("no block given", Qnil, 0);
-    }
-}
-
 static VALUE
-rb_yield_0(val, self, klass, flags, avalue)
+rb_yield_0(val, self, klass, pcall, avalue)
     VALUE val, self, klass;	/* OK */
-    int flags, avalue;
+    int pcall, avalue;
 {
     NODE *node;
     volatile VALUE result = Qnil;
@@ -4876,28 +3860,27 @@ rb_yield_0(val, self, klass, flags, avalue)
     volatile VALUE old_wrapper;
     struct BLOCK * volatile block;
     struct SCOPE * volatile old_scope;
-    int old_vmode;
     struct FRAME frame;
     NODE *cnode = ruby_current_node;
-    int lambda = flags & YIELD_LAMBDA_CALL;
     int state;
+    static unsigned serial = 1;
 
-    rb_need_block();
+    if (!rb_block_given_p()) {
+	localjump_error("no block given", Qnil);
+    }
 
     PUSH_VARS();
+    PUSH_CLASS();
     block = ruby_block;
     frame = block->frame;
     frame.prev = ruby_frame;
-    frame.node = cnode;
     ruby_frame = &(frame);
     old_cref = (VALUE)ruby_cref;
-    ruby_cref = block->cref;
+    ruby_cref = (NODE*)ruby_frame->cbase;
     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) {
 	/* put place holder for dynamic (in-block) local variables */
@@ -4907,17 +3890,15 @@ rb_yield_0(val, self, klass, flags, avalue)
 	/* FOR does not introduce new scope */
 	ruby_dyna_vars = block->dyna_vars;
     }
-    PUSH_CLASS(klass ? klass : block->klass);
-    if (!klass) {
-	self = block->self;
-    }
+    ruby_class = klass?klass:block->klass;
+    if (!klass) 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 (lambda && RARRAY(val)->len != 0) {
+	    if (block->var == (NODE*)1) {
+		if (pcall && RARRAY(val)->len != 0) {
 		    rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
 			     RARRAY(val)->len);
 		}
@@ -4929,65 +3910,28 @@ rb_yield_0(val, self, klass, flags, avalue)
 		}
 	    }
 	    else if (nd_type(block->var) == NODE_MASGN) {
-		if (!avalue) {
-		    val = svalue_to_mrhs(val, block->var->nd_head);
-		}
-		massign(self, block->var, val, lambda);
+		if (!avalue) val = svalue_to_avalue(val);
+		massign(self, block->var, val, pcall);
 	    }
 	    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, lambda);
+		if (avalue) val = avalue_to_svalue(val);
+		if (val == Qundef) val = Qnil;
+		assign(self, block->var, val, pcall);
 	    }
 	}
 	POP_TAG();
 	if (state) goto pop_state;
     }
-    if (!node) {
-	state = 0;
-	goto pop_state;
-    }
-    ruby_current_node = node;
 
     PUSH_ITER(block->iter);
-    PUSH_TAG(lambda ? PROT_NONE : PROT_YIELD);
+    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 || nd_type(node) == NODE_IFUNC) {
+	    if (avalue) val = avalue_to_svalue(val);
 	    result = (*node->nd_cfnc)(val, node->nd_tval, self);
 	}
 	else {
@@ -5001,18 +3945,14 @@ rb_yield_0(val, self, klass, flags, avalue)
 	    CHECK_INTS;
 	    goto redo;
 	  case TAG_NEXT:
-	    if (!lambda) {
-		state = 0;
-		result = prot_tag->retval;
-	    }
+	    state = 0;
+	    result = prot_tag->retval;
 	    break;
 	  case TAG_BREAK:
-	    if (TAG_DST()) {
-		result = prot_tag->retval;
-	    }
-	    else {
-		lambda = Qtrue;	/* just pass TAG_BREAK */
-	    }
+	  case TAG_RETURN:
+	    state |= (serial++ << 8);
+	    state |= 0x10;
+	    block->tag->dst = state;
 	    break;
 	  default:
 	    break;
@@ -5042,32 +3982,20 @@ rb_yield_0(val, self, klass, flags, avalue)
     ruby_cref = (NODE*)old_cref;
     ruby_wrapper = old_wrapper;
     if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
-	scope_dup(old_scope);
+       scope_dup(old_scope);
     ruby_scope = old_scope;
-    scope_vmode = old_vmode;
-    switch (state) {
-      case 0:
-	break;
-      case TAG_BREAK:
-	if (!lambda) {
-	    struct tag *tt = prot_tag;
-
-	    while (tt) {
-		if (tt->tag == PROT_LOOP && tt->blkid == ruby_block->uniq) {
-		    tt->dst = (VALUE)tt->frame->uniq;
-		    tt->retval = result;
-		    JUMP_TAG(TAG_BREAK);
-		}
-		tt = tt->prev;
+    ruby_current_node = cnode;
+    if (state) {
+	if (!block->tag) {
+	    switch (state & TAG_MASK) {
+	      case TAG_BREAK:
+	      case TAG_RETURN:
+		jump_tag_but_local_jump(state & TAG_MASK);
+		break;
 	    }
-	    proc_jump_error(TAG_BREAK, result);
 	}
-	/* fall through */
-      default:
 	JUMP_TAG(state);
-	break;
     }
-    ruby_current_node = cnode;
     return result;
 }
 
@@ -5075,69 +4003,14 @@ VALUE
 rb_yield(val)
     VALUE val;
 {
-    return rb_yield_0(val, 0, 0, 0, Qfalse);
+    return rb_yield_0(val, 0, 0, 0, 0);
 }
 
-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, 0, 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, 0, 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, 0, avalue);
-}
-
-/*
- *  call-seq:
- *     loop {|| block } 
- *  
- *  Repeatedly executes the block.
- *     
- *     loop do
- *       print "Input: "
- *       line = gets
- *       break if !line or line =~ /^qQ/
- *       # ...
- *     end
- */
-
 static VALUE
 rb_f_loop()
 {
     for (;;) {
-	rb_yield_0(Qundef, 0, 0, 0, Qfalse);
+	rb_yield_0(Qundef, 0, 0, 0, 0);
 	CHECK_INTS;
     }
     return Qnil;		/* dummy */
@@ -5155,13 +4028,32 @@ massign(self, node, val, pcall)
 
     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 (len == 1 && list) {
+	VALUE v = RARRAY(val)->ptr[0];
+	VALUE tmp = rb_check_array_type(v);
+
+	if (NIL_P(tmp)) {
+	    assign(self, list->nd_head, v, pcall);
+	    list = list->nd_next;
+	}
+	else {
+	    len = RARRAY(tmp)->len;
+	    for (i=0; list && i<len; i++) {
+		assign(self, list->nd_head, RARRAY(tmp)->ptr[i], pcall);
+		list = list->nd_next;
+	    }
+	}
+	i = 1;
+    }
+    else {
+	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 ((long)(node->nd_args) == -1) {
+	if (node->nd_args == (NODE*)-1) {
 	    /* no check for mere `*' */
 	}
 	else if (!list && i<len) {
@@ -5246,7 +4138,7 @@ assign(self, lhs, val, pcall)
 	break;
 
       case NODE_MASGN:
-	massign(self, lhs, svalue_to_mrhs(val, lhs->nd_head), pcall);
+	massign(self, lhs, svalue_to_avalue(val), pcall);
 	break;
 
       case NODE_CALL:
@@ -5298,29 +4190,38 @@ rb_iterate(it_proc, data1, bl_proc, data2)
     NODE *node = NEW_IFUNC(bl_proc, data2);
     VALUE self = ruby_top_self;
 
+  iter_retry:
     PUSH_ITER(ITER_PRE);
-    PUSH_TAG(PROT_LOOP);
     PUSH_BLOCK(0, node);
+    PUSH_TAG(PROT_NONE);
+
     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 || state == TAG_BREAK) {
+	    retval = prot_tag->retval;
+	}
     }
-    POP_BLOCK();
     POP_TAG();
+    POP_BLOCK();
     POP_ITER();
 
     switch (state) {
       case 0:
 	break;
+
+      case TAG_RETRY:
+	goto iter_retry;
+
+      case TAG_BREAK:
+	break;
+
+      case TAG_RETURN:
+	return_value(retval);
+	/* fall through */
       default:
 	JUMP_TAG(state);
     }
@@ -5366,23 +4267,17 @@ rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
     int state;
     volatile VALUE result;
     volatile VALUE e_info = ruby_errinfo;
-    volatile int handle = Qfalse;
-    VALUE eclass;
     va_list args;
 
     PUSH_TAG(PROT_NONE);
-    switch (state = EXEC_TAG()) {
-      case TAG_RETRY:
-	if (!handle) break;
-	handle = Qfalse;
-	state = 0;
-	ruby_errinfo = Qnil;
-      case 0:
+    if ((state = EXEC_TAG()) == 0) {
+      retry_entry:
 	result = (*b_proc)(data1);
-	break;
-      case TAG_RAISE:
-	if (handle) break;
-	handle = Qfalse;
+    }
+    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)) {
@@ -5393,14 +4288,25 @@ rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
 	va_end(args);
 
 	if (handle) {
-	    state = 0;
 	    if (r_proc) {
-		result = (*r_proc)(data2, ruby_errinfo);
+		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 {
 		result = Qnil;
+		state = 0;
+	    }
+	    if (state == 0) {
+		ruby_errinfo = e_info;
 	    }
-	    ruby_errinfo = e_info;
 	}
     }
     POP_TAG();
@@ -5414,26 +4320,22 @@ 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);
+    return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, 0);
 }
 
-static VALUE cont_protect;
-
 VALUE
 rb_protect(proc, data, state)
     VALUE (*proc) _((VALUE));
     VALUE data;
     int *state;
 {
-    VALUE result = Qnil;	/* OK */
+    VALUE result;		/* OK */
     int status;
 
     PUSH_TAG(PROT_NONE);
-    cont_protect = (VALUE)rb_node_newnode(NODE_MEMO, cont_protect, 0, 0);
     if ((status = EXEC_TAG()) == 0) {
 	result = (*proc)(data);
     }
-    cont_protect = ((NODE *)cont_protect)->u1.value;
     POP_TAG();
     if (state) {
 	*state = status;
@@ -5464,6 +4366,7 @@ rb_ensure(b_proc, data1, e_proc, data2)
     retval = prot_tag ? prot_tag->retval : Qnil;	/* save retval */
     (*e_proc)(data2);
     if (prot_tag) return_value(retval);
+
     if (state) JUMP_TAG(state);
     return result;
 }
@@ -5473,28 +4376,22 @@ rb_with_disable_interrupt(proc, data)
     VALUE (*proc)();
     VALUE data;
 {
-    VALUE result = Qnil;	/* OK */
+    VALUE result;		/* OK */
     int status;
 
     DEFER_INTS;
-    {
-	int thr_critical = rb_thread_critical;
-
-	rb_thread_critical = Qtrue;
-	PUSH_TAG(PROT_NONE);
-	if ((status = EXEC_TAG()) == 0) {
-	    result = (*proc)(data);
-	}
-	POP_TAG();
-	rb_thread_critical = thr_critical;
+    PUSH_TAG(PROT_NONE);
+    if ((status = EXEC_TAG()) == 0) {
+	result = (*proc)(data);
     }
-    ENABLE_INTS;
+    POP_TAG();
+    ALLOW_INTS;
     if (status) JUMP_TAG(status);
 
     return result;
 }
 
-static void
+static inline void
 stack_check()
 {
     static int overflowing = 0;
@@ -5504,7 +4401,7 @@ stack_check()
 	overflowing = 1;
 	PUSH_TAG(PROT_NONE);
 	if ((state = EXEC_TAG()) == 0) {
-	    rb_exc_raise(sysstack_error);
+	    rb_raise(rb_eSysStackError, "stack level too deep");
 	}
 	POP_TAG();
 	overflowing = 0;
@@ -5519,45 +4416,17 @@ static int last_call_status;
 #define CSTAT_VCALL 4
 #define CSTAT_SUPER 8
 
-/*
- *  call-seq:
- *     obj.method_missing(symbol [, *args] )   => result
- *  
- *  Invoked by Ruby when <i>obj</i> is sent a message it cannot handle.
- *  <i>symbol</i> is the symbol for the method called, and <i>args</i>
- *  are any arguments that were passed to it. By default, the interpreter
- *  raises an error when this method is called. However, it is possible
- *  to override the method to provide more dynamic behavior.
- *  The example below creates
- *  a class <code>Roman</code>, which responds to methods with names
- *  consisting of roman numerals, returning the corresponding integer
- *  values.
- *     
- *     class Roman
- *       def romanToInt(str)
- *         # ...
- *       end
- *       def method_missing(methId)
- *         str = methId.id2name
- *         romanToInt(str)
- *       end
- *     end
- *     
- *     r = Roman.new
- *     r.iv      #=> 4
- *     r.xxiii   #=> 23
- *     r.mm      #=> 2000
- */
-
-static VALUE
-rb_method_missing(argc, argv, obj)
+static VALUE
+rb_f_missing(argc, argv, obj)
     int argc;
     VALUE *argv;
     VALUE obj;
 {
     ID id;
     VALUE exc = rb_eNoMethodError;
+    volatile VALUE d = 0;
     char *format = 0;
+    char *desc = "";
     NODE *cnode = ruby_current_node;
 
     if (argc == 0 || !SYMBOL_P(argv[0])) {
@@ -5568,44 +4437,73 @@ rb_method_missing(argc, argv, obj)
 
     id = SYM2ID(argv[0]);
 
+    switch (TYPE(obj)) {
+      case T_NIL:
+	desc = "nil";
+	break;
+      case T_TRUE:
+	desc = "true";
+	break;
+      case T_FALSE:
+	desc = "false";
+	break;
+      case T_OBJECT:
+	d = rb_any_to_s(obj);
+	break;
+      default:
+	d = rb_inspect(obj);
+	break;
+    }
+    if (d) {
+	if (RSTRING(d)->len > 65) {
+	    d = rb_any_to_s(obj);
+	}
+	desc = RSTRING(d)->ptr;
+    }
+
     if (last_call_status & CSTAT_PRIV) {
-	format = "private method `%s' called for %s";
+	format = "private method `%s' called for %s%s%s";
     }
     else if (last_call_status & CSTAT_PROT) {
-	format = "protected method `%s' called for %s";
+	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";
-	exc = rb_eNameError;
+	const char *mname = rb_id2name(id);
+
+	if (('a' <= mname[0] && mname[0] <= 'z') || mname[0] == '_') {
+	    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";
+	format = "undefined method `%s' for %s%s%s";
     }
 
     ruby_current_node = cnode;
+    PUSH_FRAME();		/* fake frame */
+    *ruby_frame = *_frame.prev->prev;
     {
-	int n = 0;
-	VALUE args[3];
-
-	args[n++] = rb_funcall(rb_const_get(exc, rb_intern("message")), '!',
-			       3, rb_str_new2(format), obj, argv[0]);
-	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" */
+	char buf[BUFSIZ];
+	int noclass = (!d || desc[0]=='#');
+
+	snprintf(buf, BUFSIZ, format, rb_id2name(id),
+		 desc, noclass ? "" : ":",
+		 noclass ? "" : rb_obj_classname(obj));
+	exc = rb_exc_new2(exc, buf);
+	rb_iv_set(exc, "name", argv[0]);
+	rb_iv_set(exc, "args", rb_ary_new4(argc-1, argv+1));
 	rb_exc_raise(exc);
     }
+    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;
@@ -5618,27 +4516,17 @@ method_missing(obj, id, argc, argv, call_status)
 
     if (id == missing) {
 	PUSH_FRAME();
-	rb_method_missing(argc, argv, obj);
+	rb_f_missing(argc, argv, obj);
 	POP_FRAME();
     }
     else if (id == ID_ALLOCATOR) {
-	rb_raise(rb_eTypeError, "allocator undefined for %s", rb_class2name(obj));
+	rb_raise(rb_eNoMethodError, "allocator undefined for %s", rb_class2name(obj));
     }
-    if (argc < 0) {
-	VALUE tmp;
 
-	argc = -argc-1;
-	tmp = splat_value(argv[argc]);
-	nargv = ALLOCA_N(VALUE, argc + RARRAY(tmp)->len + 1);
-	MEMCPY(nargv+1, argv, VALUE, argc);
-	MEMCPY(nargv+1+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
-	argc += RARRAY(tmp)->len;
-    }
-    else {
-	nargv = ALLOCA_N(VALUE, argc+1);
-	MEMCPY(nargv+1, argv, VALUE, argc);
-    }
+    nargv = ALLOCA_N(VALUE, argc+1);
     nargv[0] = ID2SYM(id);
+    MEMCPY(nargv+1, argv, VALUE, argc);
+
     return rb_funcall2(obj, missing, argc+1, nargv);
 }
 
@@ -5650,7 +4538,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 number of arguments(%d for %d)",
 		 argc, len);
     }
 
@@ -5724,37 +4612,30 @@ call_cfunc(func, recv, len, argc, argv)
 		       argv[11], argv[12], argv[13], argv[14]);
 	break;
       default:
-	rb_raise(rb_eArgError, "too many arguments (%d)", len);
+	rb_raise(rb_eArgError, "too many arguments(%d)", len);
 	break;
     }
     return Qnil;		/* not reached */
 }
 
 static VALUE
-rb_call0(klass, recv, id, oid, argc, argv, body, flags)
+rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
     VALUE klass, recv;
     ID    id;
     ID    oid;
     int argc;			/* OK */
     VALUE *argv;		/* OK */
-    NODE * volatile body;
-    int flags;
+    NODE *body;			/* OK */
+    int nosuper;
 {
     NODE *b2;		/* OK */
     volatile VALUE result = Qnil;
     int itr;
     static int tick;
     TMP_PROTECT;
-    volatile int safe = -1;
 
-    if (NOEX_SAFE(flags) > ruby_safe_level &&
-	ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
-	rb_raise(rb_eSecurityError, "calling insecure method: %s",
-		 rb_id2name(id));
-    }
     switch (ruby_iter->iter) {
       case ITER_PRE:
-      case ITER_PAS:
 	itr = ITER_CUR;
 	break;
       case ITER_CUR:
@@ -5766,29 +4647,16 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
     if ((++tick & 0xff) == 0) {
 	CHECK_INTS;		/* better than nothing */
 	stack_check();
-	rb_gc_finalize_deferred();
-    }
-    if (argc < 0) {
-	VALUE tmp;
-	VALUE *nargv;
-
-	argc = -argc-1;
-	tmp = splat_value(argv[argc]);
-	nargv = TMP_ALLOC(argc + RARRAY(tmp)->len);
-	MEMCPY(nargv, argv, VALUE, argc);
-	MEMCPY(nargv+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
-	argc += RARRAY(tmp)->len;
-	argv = nargv;
     }
     PUSH_ITER(itr);
     PUSH_FRAME();
 
     ruby_frame->last_func = id;
     ruby_frame->orig_func = oid;
-    ruby_frame->last_class = (flags & NOEX_NOSUPER)?0:klass;
+    ruby_frame->last_class = nosuper?0:klass;
     ruby_frame->self = recv;
     ruby_frame->argc = argc;
-    ruby_frame->flags = 0;
+    ruby_frame->argv = argv;
 
     switch (nd_type(body)) {
       case NODE_CFUNC:
@@ -5796,22 +4664,20 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	    int len = body->nd_argc;
 
 	    if (len < -2) {
-		rb_bug("bad argc (%d) specified for `%s(%s)'",
+		rb_bug("bad argc(%d) specified for `%s(%s)'",
 		       len, rb_class2name(klass), rb_id2name(id));
 	    }
-	    if (event_hooks) {
+	    if (trace_func) {
 		int state;
 
-		EXEC_EVENT_HOOK(RUBY_EVENT_C_CALL, ruby_current_node,
-				recv, id, klass);
+		call_trace_func("c-call", ruby_current_node, recv, id, klass);
 		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;
-		EXEC_EVENT_HOOK(RUBY_EVENT_C_RETURN, ruby_current_node,
-				recv, id, klass);
+		call_trace_func("c-return", ruby_current_node, recv, id, klass);
 		if (state) JUMP_TAG(state);
 	    }
 	    else {
@@ -5823,19 +4689,15 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	/* for attr get/set */
       case NODE_IVAR:
 	if (argc != 0) {
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	    rb_raise(rb_eArgError, "wrong number of arguments(%d for 0)", argc);
 	}
 	result = rb_attr_get(recv, body->nd_vid);
 	break;
 
       case NODE_ATTRSET:
-	if (argc != 1)
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
-	result = rb_ivar_set(recv, body->nd_vid, argv[0]);
-	break;
-
+	/* for re-scoped/renamed method */
       case NODE_ZSUPER:
-	result = rb_call_super(argc, argv);
+	result = rb_eval(recv, body);
 	break;
 
       case NODE_DMETHOD:
@@ -5843,16 +4705,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	break;
 
       case NODE_BMETHOD:
-	ruby_frame->flags |= FRAME_DMETH;
-	if (event_hooks) {
-	    struct BLOCK *data;
-	    Data_Get_Struct(body->nd_cval, struct BLOCK, data);
-	    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, data->body, recv, id, klass);
-	}
-	result = proc_invoke(body->nd_cval, rb_ary_new4(argc, argv), recv, klass);
-	if (event_hooks) {
-	    EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
-	}
+	result = proc_invoke(body->nd_cval, rb_ary_new4(argc, argv), Qtrue, recv);
 	break;
 
       case NODE_SCOPE:
@@ -5862,11 +4715,12 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	    NODE *saved_cref = 0;
 
 	    PUSH_SCOPE();
+
 	    if (body->nd_rval) {
 		saved_cref = ruby_cref;
 		ruby_cref = (NODE*)body->nd_rval;
+		ruby_frame->cbase = body->nd_rval;
 	    }
-	    PUSH_CLASS(ruby_cbase);
 	    if (body->nd_tbl) {
 		local_vars = TMP_ALLOC(body->nd_tbl[0]+1);
 		*local_vars++ = (VALUE)body;
@@ -5880,15 +4734,12 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	    }
 	    b2 = body = body->nd_next;
 
-	    if (NOEX_SAFE(flags) > ruby_safe_level) {
-		safe = ruby_safe_level;
-		ruby_safe_level = NOEX_SAFE(flags);
-	    }
 	    PUSH_VARS();
 	    PUSH_TAG(PROT_FUNC);
+
 	    if ((state = EXEC_TAG()) == 0) {
 		NODE *node = 0;
-		int i, nopt = 0;
+		int i;
 
 		if (nd_type(body) == NODE_ARGS) {
 		    node = body;
@@ -5905,96 +4756,90 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 
 		    i = node->nd_cnt;
 		    if (i > argc) {
-			rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+			rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)",
 				 argc, i);
 		    }
-		    if (!node->nd_rest) {
+		    if (node->nd_rest == -1) {
+			int opt = i;
 			NODE *optnode = node->nd_opt;
 
-			nopt = i;
 			while (optnode) {
-			    nopt++;
+			    opt++;
 			    optnode = optnode->nd_next;
 			}
-			if (nopt < argc) {
-			    rb_raise(rb_eArgError,
-				     "wrong number of arguments (%d for %d)",
-				     argc, nopt);
+			if (opt < argc) {
+			    rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)",
+				     argc, opt);
 			}
+			ruby_frame->argc = opt;
+			ruby_frame->argv = local_vars+2;
 		    }
+
 		    if (local_vars) {
 			if (i > 0) {
 			    /* +2 for $_ and $~ */
 			    MEMCPY(local_vars+2, argv, VALUE, i);
 			}
-		    }
-		    argv += i; argc -= i;
-		    if (node->nd_opt) {
-			NODE *opt = node->nd_opt;
-
-			while (opt && argc) {
-			    assign(recv, opt->nd_head, *argv, 1);
-			    argv++; argc--;
-			    opt = opt->nd_next;
-			}
-			if (opt) {
-			    rb_eval(recv, opt);
-			}
-			i = nopt;
-		    }
-		    if (node->nd_rest) {
-			VALUE v;
-			
-			if (argc > 0) {
-			    v = rb_ary_new4(argc,argv);
-			    i = -i - 1;
+			argv += i; argc -= i;
+			if (node->nd_opt) {
+			    NODE *opt = node->nd_opt;
+
+			    while (opt && argc) {
+				assign(recv, opt->nd_head, *argv, 1);
+				argv++; argc--;
+				opt = opt->nd_next;
+			    }
+			    if (opt) {
+				rb_eval(recv, opt);
+			    }
 			}
-			else {
-			    v = rb_ary_new2(0);
+			local_vars = ruby_scope->local_vars;
+			if (node->nd_rest >= 0) {
+			    VALUE v;
+
+			    if (argc > 0)
+				v = rb_ary_new4(argc,argv);
+			    else
+				v = rb_ary_new2(0);
+			    ruby_scope->local_vars[node->nd_rest] = v;
 			}
-			assign(recv, node->nd_rest, v, 1);
 		    }
-		    ruby_frame->argc = i;
 		}
-		if (event_hooks) {
-		    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass);
+
+		if (trace_func) {
+		    call_trace_func("call", b2, recv, id, klass);
 		}
 		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();
-	    if (event_hooks) {
-		EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
-	    }
 	    POP_VARS();
-	    POP_CLASS();
 	    POP_SCOPE();
 	    ruby_cref = saved_cref;
-	    if (safe >= 0) ruby_safe_level = safe;
+	    if (trace_func) {
+		call_trace_func("return", ruby_frame->prev->node, recv, id, klass);
+	    }
 	    switch (state) {
 	      case 0:
 		break;
 
-	      case TAG_BREAK:
-	      case TAG_RETURN:
-		JUMP_TAG(state);
-		break;
-
 	      case TAG_RETRY:
-		if (rb_block_given_p()) JUMP_TAG(state);
+		if (rb_block_given_p()) {
+                   JUMP_TAG(state);
+		}
 		/* fall through */
 	      default:
-		jump_tag_but_local_jump(state, result);
+		jump_tag_but_local_jump(state);
 		break;
 	    }
 	}
 	break;
 
       default:
-	unknown_node(body);
+	rb_bug("unknown node type %d", nd_type(body));
 	break;
     }
     POP_FRAME();
@@ -6023,7 +4868,7 @@ rb_call(klass, recv, mid, argc, argv, scope)
     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);
+	    return rb_undefined(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
 	klass = ent->origin;
 	id    = ent->mid0;
 	noex  = ent->noex;
@@ -6031,29 +4876,29 @@ 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);
+	    return rb_undefined(recv, mid, argc, argv, CSTAT_SUPER);
 	}
-	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 && scope == 0) {
+    if (mid != missing) {
 	/* receiver specified form for private method */
-	if (noex & NOEX_PRIVATE)
-	    return method_missing(recv, mid, argc, argv, CSTAT_PRIV);
+	if ((noex & NOEX_PRIVATE) && scope == 0)
+	    return rb_undefined(recv, mid, argc, argv, CSTAT_PRIV);
 
-	/* self must be kind of a specified form for protected method */
-	if (noex & NOEX_PROTECTED) {
+	/* 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) {
 		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);
+		return rb_undefined(recv, mid, argc, argv, CSTAT_PROT);
 	}
     }
 
-    return rb_call0(klass, recv, mid, id, argc, argv, body, noex);
+    return rb_call0(klass, recv, mid, id, argc, argv, body, noex & NOEX_NOSUPER);
 }
 
 VALUE
@@ -6071,24 +4916,6 @@ rb_apply(recv, mid, args)
     return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1);
 }
 
-/*
- *  call-seq:
- *     obj.send(symbol [, args...])        => obj
- *     obj.__send__(symbol [, args...])    => obj
- *  
- *  Invokes the method identified by _symbol_, passing it any
- *  arguments specified. You can use <code>\_\_send__</code> if the name
- *  +send+ clashes with an existing method in _obj_.
- *     
- *     class Klass
- *       def hello(*args)
- *         "Hello " + args.join(' ')
- *       end
- *     end
- *     k = Klass.new
- *     k.send :hello, "gentle", "readers"   #=> "Hello gentle readers"
- */
-
 static VALUE
 rb_f_send(argc, argv, recv)
     int argc;
@@ -6107,13 +4934,26 @@ rb_f_send(argc, argv, recv)
     return vid;
 }
 
-static VALUE
-vafuncall(recv, mid, n, ar)
+#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, ...)
+#else
+rb_funcall(recv, mid, n, va_alist)
     VALUE recv;
     ID mid;
     int n;
-    va_list *ar;
+    va_dcl
+#endif
 {
+    va_list ar;
     VALUE *argv;
 
     if (n > 0) {
@@ -6121,10 +4961,11 @@ vafuncall(recv, mid, n, ar)
 
 	argv = ALLOCA_N(VALUE, n);
 
+	va_init_list(ar, n);
 	for (i=0;i<n;i++) {
-	    argv[i] = va_arg(*ar, VALUE);
+	    argv[i] = va_arg(ar, VALUE);
 	}
-	va_end(*ar);
+	va_end(ar);
     }
     else {
 	argv = 0;
@@ -6134,55 +4975,6 @@ vafuncall(recv, mid, n, ar)
 }
 
 VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_funcall(VALUE recv, ID mid, int n, ...)
-#else
-rb_funcall(recv, mid, n, va_alist)
-    VALUE recv;
-    ID mid;
-    int n;
-    va_dcl
-#endif
-{
-    va_list ar;
-    va_init_list(ar, n);
-
-    return vafuncall(recv, mid, n, &ar);
-}
-
-VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_funcall_rescue(VALUE recv, ID mid, int n, ...)
-#else
-rb_funcall_rescue(recv, mid, n, va_alist)
-    VALUE recv;
-    ID mid;
-    int n;
-    va_dcl
-#endif
-{
-    VALUE result = Qnil;	/* OK */
-    int status;
-    va_list ar;
-
-    va_init_list(ar, n);
-
-    PUSH_TAG(PROT_NONE);
-    if ((status = EXEC_TAG()) == 0) {
-	result = vafuncall(recv, mid, n, &ar);
-    }
-    POP_TAG();
-    switch (status) {
-      case 0:
-	return result;
-      case TAG_RAISE:
-	return Qundef;
-      default:
-	JUMP_TAG(status);
-    }
-}
-
-VALUE
 rb_funcall2(recv, mid, argc, argv)
     VALUE recv;
     ID mid;
@@ -6207,21 +4999,17 @@ rb_call_super(argc, argv)
     int argc;
     const VALUE *argv;
 {
-    VALUE result, self, klass;
-
-    if (ruby_frame->last_class == 0) {
-	rb_name_error(ruby_frame->last_func, "calling `super' from `%s' is prohibited",
-		      rb_id2name(ruby_frame->orig_func));
-    }
+    VALUE result;
 
-    self = ruby_frame->self;
-    klass = ruby_frame->last_class;
-    if (RCLASS(klass)->super == 0) {
-	return method_missing(self, ruby_frame->orig_func, argc, argv, CSTAT_SUPER);
+    if (ruby_frame->last_class == 0) {	
+	rb_name_error(ruby_frame->last_func, "superclass method `%s' must be enabled by rb_enable_super()",
+		      rb_id2name(ruby_frame->last_func));
     }
 
-    PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
-    result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3);
+    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();
 
     return result;
@@ -6237,9 +5025,6 @@ backtrace(lev)
     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) {
@@ -6254,7 +5039,6 @@ backtrace(lev)
 	    snprintf(buf, BUFSIZ, "%s:%d", ruby_sourcefile, ruby_sourceline);
 	}
 	rb_ary_push(ary, rb_str_new2(buf));
-	if (lev < -1) return ary;
     }
     else {
 	while (lev-- > 0) {
@@ -6265,11 +5049,8 @@ backtrace(lev)
 	    }
 	}
     }
-    for (; frame && (n = frame->node); frame = frame->prev) {
+    while (frame && (n = frame->node)) {
 	if (frame->prev && frame->prev->last_func) {
-	    if (frame->prev->node == n) {
-		if (frame->prev->last_func == frame->last_func) continue;
-	    }
 	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
 		     n->nd_file, nd_line(n),
 		     rb_id2name(frame->prev->last_func));
@@ -6278,36 +5059,12 @@ backtrace(lev)
 	    snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
 	}
 	rb_ary_push(ary, rb_str_new2(buf));
+	frame = frame->prev;
     }
 
     return ary;
 }
 
-/*
- *  call-seq:
- *     caller(start=1)    => array
- *  
- *  Returns the current execution stack---an array containing strings in
- *  the form ``<em>file:line</em>'' or ``<em>file:line: in
- *  `method'</em>''. The optional _start_ parameter
- *  determines the number of initial stack entries to omit from the
- *  result.
- *     
- *     def a(skip)
- *       caller(skip)
- *     end
- *     def b(skip)
- *       a(skip)
- *     end
- *     def c(skip)
- *       b(skip)
- *     end
- *     c(0)   #=> ["prog:2:in `a'", "prog:5:in `b'", "prog:8:in `c'", "prog:10"]
- *     c(1)   #=> ["prog:5:in `b'", "prog:8:in `c'", "prog:11"]
- *     c(2)   #=> ["prog:8:in `c'", "prog:12"]
- *     c(3)   #=> ["prog:13"]
- */
-
 static VALUE
 rb_f_caller(argc, argv)
     int argc;
@@ -6320,7 +5077,7 @@ rb_f_caller(argc, argv)
 
     if (NIL_P(level)) lev = 1;
     else lev = NUM2INT(level);
-    if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev);
+    if (lev < 0) rb_raise(rb_eArgError, "negative level(%d)", lev);
 
     return backtrace(lev);
 }
@@ -6356,14 +5113,10 @@ compile(src, file, line)
     int line;
 {
     NODE *node;
-    int critical;
 
     ruby_nerrs = 0;
     StringValue(src);
-    critical = rb_thread_critical;
-    rb_thread_critical = Qtrue;
     node = rb_compile_string(file, src, line);
-    rb_thread_critical = critical;
 
     if (ruby_nerrs == 0) return node;
     return 0;
@@ -6386,11 +5139,10 @@ eval(self, src, scope, file, line)
     struct FRAME frame;
     NODE *nodesave = ruby_current_node;
     volatile int iter = ruby_frame->iter;
-    volatile int safe = ruby_safe_level;
     int state;
 
     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));
 	}
@@ -6409,13 +5161,13 @@ eval(self, src, scope, file, line)
 	old_vmode = scope_vmode;
 	scope_vmode = data->vmode;
 	old_cref = (VALUE)ruby_cref;
-	ruby_cref = data->cref;
+	ruby_cref = (NODE*)ruby_frame->cbase;
 	old_wrapper = ruby_wrapper;
 	ruby_wrapper = data->wrapper;
-	if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->frame.node) {
-	    file = data->frame.node->nd_file;
+	if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->body) {
+	    file = data->body->nd_file;
 	    if (!file) file = "__builtin__";
-	    line = nd_line(data->frame.node);
+	    line = nd_line(data->body);
 	}
 
 	self = data->self;
@@ -6431,7 +5183,9 @@ eval(self, src, scope, file, line)
 	file = ruby_sourcefile;
 	line = ruby_sourceline;
     }
-    PUSH_CLASS(data ? data->klass : ruby_class);
+    PUSH_CLASS();
+    ruby_class = ruby_cbase;
+
     ruby_in_eval++;
     if (TYPE(ruby_class) == T_ICLASS) {
 	ruby_class = RBASIC(ruby_class)->klass;
@@ -6440,16 +5194,14 @@ eval(self, src, scope, file, line)
     if ((state = EXEC_TAG()) == 0) {
 	NODE *node;
 
-	ruby_safe_level = 0;
 	result = ruby_errinfo;
 	ruby_errinfo = Qnil;
 	node = compile(src, file, line);
-	ruby_safe_level = safe;
 	if (ruby_nerrs > 0) {
 	    compile_error(0);
 	}
 	if (!NIL_P(result)) ruby_errinfo = result;
-	result = eval_node(self, node);
+	result = eval_node(self, node); 
     }
     POP_TAG();
     POP_CLASS();
@@ -6466,16 +5218,23 @@ eval(self, src, scope, file, line)
 	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);
-	    }
+	   struct tag *tag;
+	   struct RVarmap *vars;
+
+           scope_dup(ruby_scope);
+	   for (tag=prot_tag; tag; tag=tag->prev) {
+	       scope_dup(tag->scope);
+	   }
+	   if (ruby_block) {
+	       struct BLOCK *block = ruby_block;
+	       while (block) {
+		   block->tag->flags |= BLOCK_DYNAMIC;
+		   block = block->prev;
+	       }
+	   }
+	   for (vars = ruby_dyna_vars; vars; vars = vars->next) {
+	       FL_SET(vars, DVAR_DONT_RECYCLE);
+	   }
 	}
     }
     else {
@@ -6485,18 +5244,20 @@ eval(self, src, scope, file, line)
     ruby_set_current_source();
     if (state) {
 	if (state == TAG_RAISE) {
+	    VALUE err, errat, mesg;
+
+	    mesg = rb_obj_as_string(ruby_errinfo);
 	    if (strcmp(file, "(eval)") == 0) {
-		VALUE mesg, errat;
-
-		errat = get_backtrace(ruby_errinfo);
-		mesg  = rb_attr_get(ruby_errinfo, rb_intern("mesg"));
-		if (!NIL_P(errat) && TYPE(errat) == T_ARRAY) {
-		    if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
-			rb_str_update(mesg, 0, 0, rb_str_new2(": "));
-			rb_str_update(mesg, 0, 0, RARRAY(errat)->ptr[0]);
-		    }
-		    RARRAY(errat)->ptr[0] = RARRAY(backtrace(-2))->ptr[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);
+		}
+		else {
+		    err = mesg;
 		}
+		rb_exc_raise(rb_funcall(ruby_errinfo, rb_intern("exception"), 1, err));
 	    }
 	    rb_exc_raise(ruby_errinfo);
 	}
@@ -6506,25 +5267,6 @@ eval(self, src, scope, file, line)
     return result;
 }
 
-/*
- *  call-seq:
- *     eval(string [, binding [, filename [,lineno]]])  => obj
- *  
- *  Evaluates the Ruby expression(s) in <em>string</em>. If
- *  <em>binding</em> is given, the evaluation is performed in its
- *  context. The binding may be a <code>Binding</code> object or a
- *  <code>Proc</code> object. If the optional <em>filename</em> and
- *  <em>lineno</em> parameters are present, they will be used when
- *  reporting syntax errors.
- *     
- *     def getBinding(str)
- *       return binding
- *     end
- *     str = "hello"
- *     eval "str + ' Fred'"                      #=> "hello Fred"
- *     eval "str + ' Fred'", getBinding("bye")   #=> "bye Fred"
- */
-
 static VALUE
 rb_f_eval(argc, argv, self)
     int argc;
@@ -6546,13 +5288,12 @@ rb_f_eval(argc, argv, self)
 	SafeStringValue(src);
     }
     if (argc >= 3) {
-	StringValue(vfile);
+	file = StringValuePtr(vfile);
     }
     if (argc >= 4) {
 	line = NUM2INT(vline);
     }
 
-    if (!NIL_P(vfile)) file = RSTRING(vfile)->ptr;
     if (NIL_P(scope) && ruby_frame->prev) {
 	struct FRAME *prev;
 	VALUE val;
@@ -6576,19 +5317,22 @@ exec_under(func, under, cbase, args)
     VALUE under, cbase;
     void *args;
 {
-    VALUE val = Qnil;		/* OK */
+    VALUE val;			/* OK */
     int state;
     int mode;
-    struct FRAME *f = ruby_frame;
 
-    PUSH_CLASS(under);
+    PUSH_CLASS();
+    ruby_class = under;
     PUSH_FRAME();
-    ruby_frame->self = f->self;
-    ruby_frame->last_func = f->last_func;
-    ruby_frame->orig_func = f->orig_func;
-    ruby_frame->last_class = f->last_class;
-    ruby_frame->argc = f->argc;
+    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) {
+	if (ruby_cbase != cbase) {
+	    ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,under,0,ruby_frame->cbase);
+	}
 	PUSH_CREF(cbase);
     }
 
@@ -6612,11 +5356,6 @@ static VALUE
 eval_under_i(args)
     VALUE *args;
 {
-    struct FRAME *f = ruby_frame;
-
-    if (f && (f = f->prev) && (f = f->prev)) {
-	ruby_frame = f;
-    }
     return eval(args[0], args[1], Qnil, (char*)args[2], (int)args[3]);
 }
 
@@ -6646,7 +5385,7 @@ 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, 0, 0);
 }
 
 /* block eval under the class/module context */
@@ -6688,38 +5427,15 @@ specific_eval(argc, argv, klass, self)
 			 rb_id2name(ruby_frame->last_func),
 			 rb_id2name(ruby_frame->last_func));
 	    }
-	    if (argc > 2) line = NUM2INT(argv[2]);
 	    if (argc > 1) {
 		file = StringValuePtr(argv[1]);
 	    }
+	    if (argc > 2) line = NUM2INT(argv[2]);
 	}
 	return eval_under(klass, self, argv[0], file, line);
     }
 }
 
-/*
- *  call-seq:
- *     obj.instance_eval(string [, filename [, lineno]] )   => obj
- *     obj.instance_eval {| | block }                       => obj
- *  
- *  Evaluates a string containing Ruby source code, or the given block,
- *  within the context of the receiver (_obj_). In order to set the
- *  context, the variable +self+ is set to _obj_ while
- *  the code is executing, giving the code access to _obj_'s
- *  instance variables. In the version of <code>instance_eval</code>
- *  that takes a +String+, the optional second and third
- *  parameters supply a filename and starting line number that are used
- *  when reporting compilation errors.
- *     
- *     class Klass
- *       def initialize
- *         @secret = 99
- *       end
- *     end
- *     k = Klass.new
- *     k.instance_eval { @secret }   #=> 99
- */
-
 VALUE
 rb_obj_instance_eval(argc, argv, self)
     int argc;
@@ -6728,39 +5444,16 @@ rb_obj_instance_eval(argc, argv, self)
 {
     VALUE klass;
 
-    if (SPECIAL_CONST_P(self)) {
+    if (rb_special_const_p(self)) {
 	klass = Qnil;
     }
     else {
 	klass = rb_singleton_class(self);
     }
+
     return specific_eval(argc, argv, klass, self);
 }
 
-/*
- *  call-seq:
- *     mod.class_eval(string [, filename [, lineno]])  => obj
- *     mod.module_eval {|| block }                     => obj
- *  
- *  Evaluates the string or block in the context of _mod_. This can
- *  be used to add methods to a class. <code>module_eval</code> returns
- *  the result of evaluating its argument. The optional _filename_
- *  and _lineno_ parameters set the text for error messages.
- *     
- *     class Thing
- *     end
- *     a = %q{def hello() "Hello there!" end}
- *     Thing.module_eval(a)
- *     puts Thing.new.hello()
- *     Thing.module_eval("invalid code", "dummy", 123)
- *     
- *  <em>produces:</em>
- *     
- *     Hello there!
- *     dummy:123:in `module_eval': undefined local variable
- *         or method `code' for Thing:Class
- */
-
 VALUE
 rb_mod_module_eval(argc, argv, mod)
     int argc;
@@ -6772,8 +5465,6 @@ rb_mod_module_eval(argc, argv, mod)
 
 VALUE rb_load_path;
 
-NORETURN(static void load_failed _((VALUE)));
-
 void
 rb_load(fname, wrap)
     VALUE fname;
@@ -6781,11 +5472,9 @@ rb_load(fname, wrap)
 {
     VALUE tmp;
     int state;
-    volatile int prohibit_int = rb_prohibit_interrupt;
     volatile ID last_func;
-    volatile VALUE wrapper = ruby_wrapper;
+    volatile VALUE wrapper = 0;
     volatile VALUE self = ruby_top_self;
-    NODE *volatile last_node;
     NODE *saved_cref = ruby_cref;
     TMP_PROTECT;
 
@@ -6795,16 +5484,16 @@ rb_load(fname, wrap)
     else {
 	SafeStringValue(fname);
     }
-    fname = rb_str_new4(fname);
     tmp = rb_find_file(fname);
     if (!tmp) {
-	load_failed(fname);
+	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);
+    PUSH_CLASS();
+    wrapper = ruby_wrapper;
     ruby_cref = top_cref;
     if (!wrap) {
 	rb_secure(4);		/* should alter global state */
@@ -6815,7 +5504,7 @@ rb_load(fname, wrap)
 	/* 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);
+	rb_extend_object(self, ruby_class);
 	PUSH_CREF(ruby_wrapper);
     }
     PUSH_ITER(ITER_NOT);
@@ -6823,44 +5512,32 @@ rb_load(fname, wrap)
     ruby_frame->last_func = 0;
     ruby_frame->last_class = 0;
     ruby_frame->self = self;
+    ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,ruby_class,0,0);
     PUSH_SCOPE();
     /* 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);
 	ruby_in_eval--;
 	node = ruby_eval_tree;
-	rb_thread_critical = critical;
 	ALLOW_INTS;
 	if (ruby_nerrs == 0) {
 	    eval_node(self, node);
 	}
     }
     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->local_tbl) /* toplevel was empty */
 	    free(ruby_scope->local_tbl);
     }
     POP_TAG();
-    rb_prohibit_interrupt = prohibit_int;
     ruby_cref = saved_cref;
     POP_SCOPE();
     POP_FRAME();
@@ -6872,7 +5549,7 @@ rb_load(fname, wrap)
 	ruby_nerrs = 0;
 	rb_exc_raise(ruby_errinfo);
     }
-    if (state) jump_tag_but_local_jump(state, Qundef);
+    if (state) jump_tag_but_local_jump(state);
     if (!NIL_P(ruby_errinfo))	/* exception during load */
 	rb_exc_raise(ruby_errinfo);
 }
@@ -6893,21 +5570,6 @@ rb_load_protect(fname, wrap, state)
     if (state) *state = status;
 }
 
-/*
- *  call-seq:
- *     load(filename, wrap=false)   => true
- *  
- *  Loads and executes the Ruby
- *  program in the file _filename_. If the filename does not
- *  resolve to an absolute path, the file is searched for in the library
- *  directories listed in <code>$:</code>. If the optional _wrap_
- *  parameter is +true+, the loaded script will be executed
- *  under an anonymous module, protecting the calling program's global
- *  namespace. In no circumstance will any local variables in the loaded
- *  file be propagated to the loading environment.
- */
-
-
 static VALUE
 rb_f_load(argc, argv)
     int argc;
@@ -6924,47 +5586,49 @@ 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_feature_p(feature, wait)
+    const char *feature;
+    int wait;
 {
     VALUE v;
-    char *f, *e;
-    long i, len, elen;
+    char *f;
+    long i, len = strlen(feature);
 
-    if (ext) {
-	len = ext - feature;
-	elen = strlen(ext);
-    }
-    else {
-	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 (strcmp(f, feature) == 0) {
+	    goto load_wait;
 	}
-	if (*e != '.') continue;
-	if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) {
-	    return e;
+	if (strncmp(f, feature, len) == 0) {
+	    if (strcmp(f+len, ".so") == 0) {
+		return Qtrue;
+	    }
+	    if (strcmp(f+len, ".rb") == 0) {
+		if (wait) goto load_wait;
+		return Qtrue;
+	    }
 	}
-	if ((rb || !ext) && (strcmp(e, ".rb") == 0)) {
-	    return e;
+    }
+    return Qfalse;
+
+  load_wait:
+    if (loading_tbl) {
+	char *ext = strrchr(f, '.');
+	if (ext && strcmp(ext, ".rb") == 0) {
+	    rb_thread_t th;
+
+	    while (st_lookup(loading_tbl, (st_data_t)f, (st_data_t *)&th)) {
+		if (th == curr_thread) {
+		    return Qtrue;
+		}
+		CHECK_INTS;
+		rb_thread_schedule();
+	    }
 	}
     }
-    return 0;
+    return Qtrue;
 }
 
 static const char *const loadable_ext[] = {
@@ -6979,21 +5643,14 @@ int
 rb_provided(feature)
     const char *feature;
 {
-    int i;
-    char *buf;
+    VALUE f = rb_str_new2(feature);
 
-    if (rb_feature_p(feature, 0, Qfalse))
-	return Qtrue;
-    if (!loading_tbl) return Qfalse;
-    if (st_lookup(loading_tbl, (st_data_t)feature, 0)) return Qtrue;
-    buf = ALLOCA_N(char, strlen(feature)+8);
-    strcpy(buf, feature);
-    for (i=0; ; i++) {
-	if (!loadable_ext[i]) break;
-	strcpy(buf+strlen(feature), loadable_ext[i]);
-	if (st_lookup(loading_tbl, (st_data_t)buf, 0)) return Qtrue;
+    if (strrchr(feature, '.') == 0) {
+	if (rb_find_file_ext(&f, loadable_ext) == 0) {
+	    return rb_feature_p(feature, Qfalse);
+	}
     }
-    return Qfalse;
+    return rb_feature_p(RSTRING(f)->ptr, Qfalse);
 }
 
 static void
@@ -7010,208 +5667,157 @@ rb_provide(feature)
     rb_provide_feature(rb_str_new2(feature));
 }
 
-static int
-load_wait(ftptr)
-    char *ftptr;
-{
-    st_data_t th;
-
-    if (!loading_tbl) return Qfalse;
-    if (!st_lookup(loading_tbl, (st_data_t)ftptr, &th)) return Qfalse;
-    do {
-	if ((rb_thread_t)th == curr_thread) return Qtrue;
-	CHECK_INTS;
-    } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th));
-    return Qtrue;
-}
-
-/*
- *  call-seq:
- *     require(string)    => true or false
- *  
- *  Ruby tries to load the library named _string_, returning
- *  +true+ if successful. If the filename does not resolve to
- *  an absolute path, it will be searched for in the directories listed
- *  in <code>$:</code>. If the file has the extension ``.rb'', it is
- *  loaded as a source file; if the extension is ``.so'', ``.o'', or
- *  ``.dll'', or whatever the default shared library extension is on
- *  the current platform, Ruby loads the shared library as a Ruby
- *  extension. Otherwise, Ruby tries adding ``.rb'', ``.so'', and so on
- *  to the name. The name of the loaded feature is added to the array in
- *  <code>$"</code>. A feature will not be loaded if it's name already
- *  appears in <code>$"</code>. However, the file name is not converted
- *  to an absolute path, so that ``<code>require 'a';require
- *  './a'</code>'' will load <code>a.rb</code> twice.
- *     
- *     require "my-library.rb"
- *     require "db-driver"
- */
+NORETURN(static void load_failed _((VALUE)));
+static VALUE load_dyna _((VALUE, VALUE));
+static VALUE load_rb _((VALUE, VALUE));
 
 VALUE
 rb_f_require(obj, fname)
     VALUE obj, fname;
 {
-    return rb_require_safe(fname, ruby_safe_level);
-}
-
-static int
-search_required(fname, featurep, path)
-    VALUE fname, *featurep, *path;
-{
-    VALUE tmp;
-    char *ext, *ftptr;
-    int type;
+    VALUE feature, tmp;
+    char *ext; /* OK */
 
-    *featurep = fname;
-    *path = 0;
-    ext = strrchr(ftptr = RSTRING(fname)->ptr, '.');
-    if (ext && !strchr(ext, '/')) {
+    SafeStringValue(fname);
+    ext = strrchr(RSTRING(fname)->ptr, '.');
+    if (ext && strchr(ext, '/')) ext = 0;
+    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;
+	    feature = rb_str_dup(fname);
+	    tmp = rb_find_file(fname);
+	    if (tmp) {
+		return load_rb(feature, tmp);
+	    }
+	    load_failed(fname);
 	}
-	else if (IS_SOEXT(ext)) {
-	    if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
+	else if (strcmp(".so", ext) == 0 || strcmp(".o", ext) == 0) {
 	    tmp = rb_str_new(RSTRING(fname)->ptr, ext-RSTRING(fname)->ptr);
-	    *featurep = tmp;
 #ifdef DLEXT2
-	    OBJ_FREEZE(tmp);
 	    if (rb_find_file_ext(&tmp, loadable_ext+1)) {
-		*featurep = tmp;
-		*path = rb_find_file(tmp);
-		return 's';
+		return load_dyna(tmp, rb_find_file(tmp));
 	    }
 #else
+	    feature = tmp;
 	    rb_str_cat2(tmp, DLEXT);
-	    OBJ_FREEZE(tmp);
-	    if (*path = rb_find_file(tmp)) {
-		return 's';
+	    tmp = rb_find_file(tmp);
+	    if (tmp) {
+		return load_dyna(feature, tmp);
 	    }
 #endif
 	}
-	else if (IS_DLEXT(ext)) {
-	    if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
-	    if (*path = rb_find_file(fname)) return 's';
+	else if (strcmp(DLEXT, ext) == 0) {
+	    tmp = rb_find_file(fname);
+	    if (tmp) {
+		return load_dyna(fname, tmp);
+	    }
+	}
+#ifdef DLEXT2
+	else if (strcmp(DLEXT2, ext) == 0) {
+	    tmp = rb_find_file(fname);
+	    if (tmp) {
+		return load_dyna(fname, tmp);
+	    }
 	}
+#endif
     }
     tmp = fname;
-    switch (type = rb_find_file_ext(&tmp, loadable_ext)) {
+    switch (rb_find_file_ext(&tmp, loadable_ext)) {
       case 0:
-	if ((ext = rb_feature_p(ftptr, 0, Qfalse))) {
-	    type = strcmp(".rb", ext);
-	    break;
-	}
-	return 0;
+	break;
+
+      case 1:
+	return load_rb(tmp, tmp);
 
       default:
-	*featurep = tmp;
-	ext = strrchr(ftptr = RSTRING(tmp)->ptr, '.');
-	if (rb_feature_p(ftptr, ext, !--type)) break;
-	*path = rb_find_file(tmp);
+	return load_dyna(tmp, rb_find_file(tmp));
     }
-    return type ? 's' : 'r';
+    if (!rb_feature_p(RSTRING(fname)->ptr, Qfalse))
+	load_failed(fname);
+    return Qfalse;
 }
 
 static void
 load_failed(fname)
     VALUE fname;
 {
-    rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING(fname)->ptr);
+    rb_raise(rb_eLoadError, "No such file to load -- %s", RSTRING(fname)->ptr);
 }
 
-VALUE
-rb_require_safe(fname, safe)
-    VALUE fname;
-    int safe;
+static VALUE
+load_dyna(feature, fname)
+    VALUE feature, fname;
 {
-    VALUE result = Qnil;
-    volatile VALUE errinfo = ruby_errinfo;
     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);
-    fname = rb_str_new4(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;
-		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);
-		    rb_load(path, 0);
-		    break;
+    if (rb_feature_p(RSTRING(feature)->ptr, Qfalse))
+	return Qfalse;
+    rb_provide_feature(feature);
+    {
+	int volatile old_vmode = scope_vmode;
+	NODE *const volatile old_node = ruby_current_node;
+	const volatile ID old_func = ruby_frame->last_func;
 
-		  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;
-		}
-		rb_provide_feature(feature);
-		result = Qtrue;
-	    }
-	}
-    }
-    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);
+	ruby_current_node = 0;
+	ruby_sourcefile = rb_source_filename(RSTRING(fname)->ptr);
+	ruby_sourceline = 0;
+	ruby_frame->last_func = 0;
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    void *handle;
+
+	    SCOPE_SET(SCOPE_PUBLIC);
+	    handle = dln_load(RSTRING(fname)->ptr);
+	    rb_ary_push(ruby_dln_librefs, LONG2NUM((long)handle));
 	}
+	POP_TAG();
+	ruby_current_node = old_node;
+	ruby_set_current_source();
+	ruby_frame->last_func = old_func;
+	SCOPE_SET(old_vmode);
     }
     if (state) JUMP_TAG(state);
-    if (NIL_P(result)) {
-	load_failed(fname);
+
+    return Qtrue;
+}
+
+static VALUE
+load_rb(feature, fname)
+    VALUE feature, fname;
+{
+    int state;
+    char *ftptr;
+    volatile int safe = ruby_safe_level;
+
+    if (rb_feature_p(RSTRING(feature)->ptr, Qtrue))
+	return Qfalse;
+    ruby_safe_level = 0;
+    rb_provide_feature(feature);
+    /* loading ruby library should be serialized. */
+    if (!loading_tbl) {
+	loading_tbl = st_init_strtable();
     }
-    ruby_errinfo = errinfo;
+    /* partial state */
+    ftptr = ruby_strdup(RSTRING(feature)->ptr);
+    st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
 
-    return result;
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	rb_load(fname, 0);
+    }
+    POP_TAG();
+    st_delete(loading_tbl, (st_data_t *)&ftptr, 0); /* loading done */
+    free(ftptr);
+    ruby_safe_level = safe;
+    if (state) JUMP_TAG(state);
+
+    return Qtrue;
 }
 
 VALUE
 rb_require(fname)
     const char *fname;
 {
-    VALUE fn = rb_str_new2(fname);
-    OBJ_FREEZE(fn);
-    return rb_require_safe(fn, ruby_safe_level);
+    return rb_f_require(Qnil, rb_str_new2(fname));
 }
 
 static void
@@ -7239,16 +5845,6 @@ set_method_visibility(self, argc, argv, ex)
     rb_clear_cache_by_class(self);
 }
 
-/*
- *  call-seq:
- *     public                 => self
- *     public(symbol, ...)    => self
- *  
- *  With no arguments, sets the default visibility for subsequently
- *  defined methods to public. With arguments, sets the named methods to
- *  have public visibility.
- */
-
 static VALUE
 rb_mod_public(argc, argv, module)
     int argc;
@@ -7265,16 +5861,6 @@ rb_mod_public(argc, argv, module)
     return module;
 }
 
-/*
- *  call-seq:
- *     protected                => self
- *     protected(symbol, ...)   => self
- *  
- *  With no arguments, sets the default visibility for subsequently
- *  defined methods to protected. With arguments, sets the named methods
- *  to have protected visibility.
- */
-
 static VALUE
 rb_mod_protected(argc, argv, module)
     int argc;
@@ -7291,25 +5877,6 @@ rb_mod_protected(argc, argv, module)
     return module;
 }
 
-/*
- *  call-seq:
- *     private                 => self
- *     private(symbol, ...)    => self
- *  
- *  With no arguments, sets the default visibility for subsequently
- *  defined methods to private. With arguments, sets the named methods
- *  to have private visibility.
- *     
- *     module Mod
- *       def a()  end
- *       def b()  end
- *       private
- *       def c()  end
- *       private :a
- *     end
- *     Mod.private_instance_methods   #=> ["a", "c"]
- */
-
 static VALUE
 rb_mod_private(argc, argv, module)
     int argc;
@@ -7326,13 +5893,6 @@ rb_mod_private(argc, argv, module)
     return module;
 }
 
-/*
- *  call-seq:
- *     mod.public_class_method(symbol, ...)    => mod
- *  
- *  Makes a list of existing class methods public.
- */
-
 static VALUE
 rb_mod_public_method(argc, argv, obj)
     int argc;
@@ -7343,22 +5903,6 @@ rb_mod_public_method(argc, argv, obj)
     return obj;
 }
 
-/*
- *  call-seq:
- *     mod.private_class_method(symbol, ...)   => mod
- *  
- *  Makes existing class methods private. Often used to hide the default
- *  constructor <code>new</code>.
- *     
- *     class SimpleSingleton  # Not thread safe
- *       private_class_method :new
- *       def SimpleSingleton.create(*args, &block)
- *         @me = new(*args, &block) if ! @me
- *         @me
- *       end
- *     end
- */
-
 static VALUE
 rb_mod_private_method(argc, argv, obj)
     int argc;
@@ -7369,16 +5913,6 @@ rb_mod_private_method(argc, argv, obj)
     return obj;
 }
 
-/*
- *  call-seq:
- *     public
- *     public(symbol, ...)
- *  
- *  With no arguments, sets the default visibility for subsequently
- *  defined methods to public. With arguments, sets the named methods to
- *  have public visibility.
- */
-
 static VALUE
 top_public(argc, argv)
     int argc;
@@ -7395,42 +5929,6 @@ top_private(argc, argv)
     return rb_mod_private(argc, argv, rb_cObject);
 }
 
-/*
- *  call-seq:
- *     module_function(symbol, ...)    => self
- *  
- *  Creates module functions for the named methods. These functions may
- *  be called with the module as a receiver, and also become available
- *  as instance methods to classes that mix in the module. Module
- *  functions are copies of the original, and so may be changed
- *  independently. The instance-method versions are made private. If
- *  used with no arguments, subsequently defined methods become module
- *  functions.
- *     
- *     module Mod
- *       def one
- *         "This is one"
- *       end
- *       module_function :one
- *     end
- *     class Cls
- *       include Mod
- *       def callOne
- *         one
- *       end
- *     end
- *     Mod.one     #=> "This is one"
- *     c = Cls.new
- *     c.callOne   #=> "This is one"
- *     module Mod
- *       def one
- *         "This is the new one"
- *       end
- *     end
- *     Mod.one     #=> "This is one"
- *     c.callOne   #=> "This is the new one"
- */
-
 static VALUE
 rb_mod_modfunc(argc, argv, module)
     int argc;
@@ -7458,9 +5956,6 @@ rb_mod_modfunc(argc, argv, module)
 	id = rb_to_id(argv[i]);
 	for (;;) {
 	    body = search_method(m, id, &m);
-	    if (body == 0) {
-		body = search_method(rb_cObject, id, &m);
-	    }
 	    if (body == 0 || body->nd_body == 0) {
 		rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
 	    }
@@ -7468,25 +5963,13 @@ rb_mod_modfunc(argc, argv, module)
 		break;		/* normal case: need not to follow 'super' link */
 	    }
 	    m = RCLASS(m)->super;
-	    if (!m) break;
 	}
 	rb_add_method(rb_singleton_class(module), id, body->nd_body, NOEX_PUBLIC);
+	rb_funcall(module, singleton_added, 1, ID2SYM(id));
     }
     return module;
 }
 
-/*
- *  call-seq:
- *     append_features(mod)   => mod
- *  
- *  When this module is included in another, Ruby calls
- *  <code>append_features</code> in this module, passing it the
- *  receiving module in _mod_. Ruby's default implementation is
- *  to add the constants, methods, and module variables of this module
- *  to _mod_ if this module has not already been added to
- *  _mod_ or one of its ancestors. See also <code>Module#include</code>.
- */
-
 static VALUE
 rb_mod_append_features(module, include)
     VALUE module, include;
@@ -7504,25 +5987,18 @@ rb_mod_append_features(module, include)
     return module;
 }
 
-/*
- *  call-seq:
- *     include(module, ...)    => self
- *  
- *  Invokes <code>Module.append_features</code> on each parameter in turn.
- */
-
 static VALUE
 rb_mod_include(argc, argv, module)
     int argc;
     VALUE *argv;
     VALUE module;
 {
-    int i;
-
-    for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE);
     while (argc--) {
-	rb_funcall(argv[argc], rb_intern("append_features"), 1, module);
-	rb_funcall(argv[argc], rb_intern("included"), 1, module);
+	VALUE m = argv[argc];
+
+	Check_Type(m, T_MODULE);
+	rb_funcall(m, rb_intern("append_features"), 1, module);
+	rb_funcall(m, rb_intern("included"), 1, module);
     }
     return module;
 }
@@ -7538,6 +6014,15 @@ rb_obj_call_init(obj, argc, argv)
     POP_ITER();
 }
 
+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;
@@ -7545,33 +6030,6 @@ rb_extend_object(obj, module)
     rb_include_module(rb_singleton_class(obj), module);
 }
 
-/*
- *  call-seq:
- *     extend_object(obj)    => obj
- *  
- *  Extends the specified object by adding this module's constants and
- *  methods (which are added as singleton methods). This is the callback
- *  method used by <code>Object#extend</code>.
- *     
- *     module Picky
- *       def Picky.extend_object(o)
- *         if String === o
- *           puts "Can't add Picky to a String"
- *         else
- *           puts "Picky added to #{o.class}"
- *           super
- *         end
- *       end
- *     end
- *     (s = Array.new).extend Picky  # Call Object.extend
- *     (s = "quick brown fox").extend Picky
- *     
- *  <em>produces:</em>
- *     
- *     Picky added to Array
- *     Can't add Picky to a String
- */
-
 static VALUE
 rb_mod_extend_object(mod, obj)
     VALUE mod, obj;
@@ -7580,31 +6038,6 @@ rb_mod_extend_object(mod, obj)
     return obj;
 }
 
-/*
- *  call-seq:
- *     obj.extend(module, ...)    => obj
- *  
- *  Adds to _obj_ the instance methods from each module given as a
- *  parameter.
- *     
- *     module Mod
- *       def hello
- *         "Hello from Mod.\n"
- *       end
- *     end
- *     
- *     class Klass
- *       def hello
- *         "Hello from Klass.\n"
- *       end
- *     end
- *     
- *     k = Klass.new
- *     k.hello         #=> "Hello from Klass.\n"
- *     k.extend(Mod)   #=> #<Klass:0x401b3bc8>
- *     k.hello         #=> "Hello from Mod.\n"
- */
-
 static VALUE
 rb_obj_extend(argc, argv, obj)
     int argc;
@@ -7614,39 +6047,15 @@ rb_obj_extend(argc, argv, obj)
     int i;
 
     if (argc == 0) {
-	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
+	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);
-	rb_funcall(argv[argc], rb_intern("extended"), 1, obj);
     }
     return obj;
 }
 
-/*
- *  call-seq:
- *     include(module, ...)   => self
- *  
- *  Invokes <code>Module.append_features</code>
- *  on each parameter in turn. Effectively adds the methods and constants
- *  in each module to the receiver.
- */
-
-static VALUE
-top_include(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    rb_secure(4);
-    if (ruby_wrapper) {
-	rb_warning("main#include in the wrapped load is effective only in wrapper module");
-	return rb_mod_include(argc, argv, ruby_wrapper);
-    }
-    return rb_mod_include(argc, argv, rb_cObject);
-}
-
 VALUE rb_f_trace_var();
 VALUE rb_f_untrace_var();
 
@@ -7681,19 +6090,6 @@ errat_setter(val, id, var)
     set_backtrace(ruby_errinfo, val);
 }
 
-/*
- *  call-seq:
- *     local_variables    => array
- *  
- *  Returns the names of the current local variables.
- *     
- *     fred = 1
- *     for i in 1..10
- *        # ...
- *     end
- *     local_variables   #=> ["fred", "i"]
- */
-
 static VALUE
 rb_f_local_variables()
 {
@@ -7728,11 +6124,10 @@ NORETURN(static VALUE rb_f_throw _((int,VALUE*)));
 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, *tmp_end_procs;
+static struct end_proc_data *end_procs, *ephemeral_end_procs;
 
 void
 rb_set_end_proc(func, data)
@@ -7747,7 +6142,6 @@ rb_set_end_proc(func, data)
     link->next = *list;
     link->func = func;
     link->data = data;
-    link->safe = ruby_safe_level;
     *list = link;
 }
 
@@ -7766,11 +6160,6 @@ rb_mark_end_proc()
 	rb_gc_mark(link->data);
 	link = link->next;
     }
-    link = tmp_end_procs;
-    while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
-    }
 }
 
 static void call_end_proc _((VALUE data));
@@ -7782,10 +6171,9 @@ call_end_proc(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);
+    proc_invoke(data, rb_ary_new2(0), Qfalse, Qundef);
     POP_FRAME();
     POP_ITER();
 }
@@ -7795,41 +6183,17 @@ 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();
 }
 
-/*
- *  call-seq:
- *     at_exit { block } -> proc
- *  
- *  Converts _block_ to a +Proc+ object (and therefore
- *  binds it at the point of call) and registers it for execution when
- *  the program exits. If multiple handlers are registered, they are
- *  executed in reverse order of registration.
- *     
- *     def do_at_exit(str1)
- *       at_exit { print str1 }
- *     end
- *     at_exit { puts "cruel world" }
- *     do_at_exit("goodbye ")
- *     exit
- *     
- *  <em>produces:</em>
- *     
- *     goodbye cruel world
- */
-
 static VALUE
 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;
 }
@@ -7837,47 +6201,34 @@ rb_f_at_exit()
 void
 rb_exec_end_proc()
 {
-    struct end_proc_data *link, *tmp;
+    struct end_proc_data *link, *save;
     int status;
-    volatile int safe = ruby_safe_level;
 
-    while (ephemeral_end_procs) {
-	tmp_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;
-	    tmp_end_procs = link = link->next;
-	    free(tmp);
+    save = link = end_procs;
+    while (link) {
+	rb_protect((VALUE(*)_((VALUE)))link->func, link->data, &status);
+	if (status) {
+	    error_handle(status);
 	}
+	link = link->next;
     }
-    while (end_procs) {
-	tmp_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;
-	    tmp_end_procs = link = link->next;
-	    free(tmp);
+    link = end_procs;
+    while (link != save) {
+	rb_protect((VALUE(*)_((VALUE)))link->func, link->data, &status);
+	if (status) {
+	    error_handle(status);
 	}
+	link = link->next;
+    }
+    while (ephemeral_end_procs) {
+	link = ephemeral_end_procs;
+	ephemeral_end_procs = link->next;
+	rb_protect((VALUE(*)_((VALUE)))link->func, link->data, &status);
+	if (status) {
+	    error_handle(status);
+	}
+	free(link);
     }
-    ruby_safe_level = safe;
 }
 
 void
@@ -7913,14 +6264,11 @@ Init_eval()
     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("method_missing", rb_f_missing, -1);
     rb_define_global_function("loop", rb_f_loop, 0);
 
-    rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1);
-    respond_to   = rb_intern("respond_to?");
-    rb_global_variable((VALUE*)&basic_respond_to);
-    basic_respond_to = rb_method_node(rb_cObject, respond_to);
-    
+    rb_define_method(rb_mKernel, "respond_to?", rb_obj_respond_to, -1);
+
     rb_define_global_function("raise", rb_f_raise, -1);
     rb_define_global_function("fail", rb_f_raise, -1);
 
@@ -7933,7 +6281,7 @@ Init_eval()
 
     rb_define_global_function("catch", rb_f_catch, 1);
     rb_define_global_function("throw", rb_f_throw, -1);
-    rb_define_global_function("global_variables", rb_f_global_variables, 0); /* in variable.c */
+    rb_define_global_function("global_variables", rb_f_global_variables, 0);
     rb_define_global_function("local_variables", rb_f_local_variables, 0);
 
     rb_define_method(rb_mKernel, "send", rb_f_send, -1);
@@ -7958,8 +6306,8 @@ Init_eval()
 
     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);
 
@@ -7972,8 +6320,8 @@ Init_eval()
 
     rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
 
-    rb_define_global_function("trace_var", rb_f_trace_var, -1); /* in variable.c */
-    rb_define_global_function("untrace_var", rb_f_untrace_var, -1); /* in variable.c */
+    rb_define_global_function("trace_var", rb_f_trace_var, -1);
+    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);
@@ -7981,121 +6329,26 @@ Init_eval()
     rb_define_virtual_variable("$SAFE", safe_getter, safe_setter);
 }
 
-/*
- *  call-seq:
- *     mod.autoload(name, filename)   => nil
- *
- *  Registers _filename_ to be loaded (using <code>Kernel::require</code>) 
- *  the first time that _name_ (which may be a <code>String</code> or
- *  a symbol) is accessed in the namespace of _mod_.
- *
- *     module A
- *     end
- *     A.autoload(:B, "b")
- *     A::B.doit            # autoloads "b"
- */
-
-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;
-}
-
-/*
- *  call-seq:
- *     mod.autoload?(name)   => String or nil
- *
- *  Returns _filename_ to be loaded if _name_ is registered as
- *  +autoload+ in the namespace of _mod_.
- *
- *     module A
- *     end
- *     A.autoload(:B, "b")
- *     A.autoload?(:B)            # => "b"
- */
-
-static VALUE
-rb_mod_autoload_p(mod, sym)
-    VALUE mod, sym;
-{
-    return rb_autoload_p(mod, rb_to_id(sym));
-}
-
-/*
- *  call-seq:
- *     autoload(module, filename)   => nil
- *  
- *  Registers _filename_ to be loaded (using <code>Kernel::require</code>) 
- *  the first time that _module_ (which may be a <code>String</code> or
- *  a symbol) is accessed.
- *     
- *     autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
- */
-
-static VALUE
-rb_f_autoload(obj, sym, file)
-    VALUE obj;
-    VALUE sym;
-    VALUE file;
-{
-    if (NIL_P(ruby_cbase)) {
-	rb_raise(rb_eTypeError, "no class/module for autoload target");
-    }
-    return rb_mod_autoload(ruby_cbase, sym, file);
-}
-
-/*
- *  call-seq:
- *     autoload(module, filename)   => nil
- *
- *  Registers _filename_ to be loaded (using <code>Kernel::require</code>)
- *  the first time that _module_ (which may be a <code>String</code> or
- *  a symbol) is accessed.
- *
- *     autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
- */
-
-static VALUE
-rb_f_autoload_p(obj, sym)
-    VALUE obj;
-    VALUE sym;
-{
-    /* use ruby_cbase as same as rb_f_autoload. */
-    if (NIL_P(ruby_cbase)) {
-	return Qfalse;
-    }
-    return rb_mod_autoload_p(ruby_cbase, sym);
-}
+VALUE rb_f_autoload();
 
 void
 Init_load()
 {
+    rb_load_path = rb_ary_new();
     rb_define_readonly_variable("$:", &rb_load_path);
     rb_define_readonly_variable("$-I", &rb_load_path);
     rb_define_readonly_variable("$LOAD_PATH", &rb_load_path);
-    rb_load_path = rb_ary_new();
 
-    rb_define_readonly_variable("$\"", &rb_features);
-    rb_define_readonly_variable("$LOADED_FEATURES", &rb_features);
     rb_features = rb_ary_new();
+    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("autoload", rb_f_autoload, 2);
     rb_global_variable(&ruby_wrapper);
 
-    rb_global_variable(&ruby_dln_librefs);
     ruby_dln_librefs = rb_ary_new();
+    rb_global_variable(&ruby_dln_librefs);
 }
 
 static void
@@ -8129,35 +6382,31 @@ blk_mark(data)
 	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((VALUE)data->klass);
+	rb_gc_mark((VALUE)data->tag);
 	rb_gc_mark(data->wrapper);
-	rb_gc_mark(data->block_obj);
 	data = data->prev;
     }
 }
 
 static void
-frame_free(frame)
-    struct FRAME *frame;
+blk_free(data)
+    struct BLOCK *data;
 {
-    struct FRAME *tmp;
+    struct FRAME *frame;
+    void *tmp;
 
-    frame = frame->prev;
+    frame = data->frame.prev;
     while (frame) {
+	if (frame->argc > 0 && (frame->flags & FRAME_MALLOC))
+	    free(frame->argv);
 	tmp = frame;
 	frame = frame->prev;
 	free(tmp);
     }
-}
-
-static void
-blk_free(data)
-    struct BLOCK *data;
-{
-    void *tmp;
-
     while (data) {
-	frame_free(&data->frame);
+	if (data->frame.argc > 0)
+	    free(data->frame.argv);
 	tmp = data;
 	data = data->prev;
 	free(tmp);
@@ -8165,23 +6414,6 @@ blk_free(data)
 }
 
 static void
-frame_dup(frame)
-    struct FRAME *frame;
-{
-    struct FRAME *tmp;
-
-    for (;;) {
-	frame->tmp = 0;		/* should not preserve tmp */
-	if (!frame->prev) break;
-	tmp = ALLOC(struct FRAME);
-	*tmp = *frame->prev;
-	frame->prev = tmp;
-	frame = tmp;
-    }
-}
-
-
-static void
 blk_copy_prev(block)
     struct BLOCK *block;
 {
@@ -8191,8 +6423,13 @@ blk_copy_prev(block)
     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;
+	}
 	scope_dup(tmp->scope);
-	frame_dup(&tmp->frame);
+	tmp->tag->flags |= BLOCK_DYNAMIC;
 
 	for (vars = tmp->dyna_vars; vars; vars = vars->next) {
 	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
@@ -8204,75 +6441,52 @@ blk_copy_prev(block)
     }
 }
 
-
 static void
-blk_dup(dup, orig)
-    struct BLOCK *dup, *orig;
+frame_dup(frame)
+    struct FRAME *frame;
 {
-    MEMCPY(dup, orig, struct BLOCK, 1);
-    frame_dup(&dup->frame);
+    VALUE *argv;
+    struct FRAME *tmp;
 
-    if (dup->iter) {
-	blk_copy_prev(dup);
-    }
-    else {
-	dup->prev = 0;
+    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;
     }
 }
 
-/*
- * MISSING: documentation
- */
-
 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);
+    bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
     CLONESETUP(bind, self);
-    blk_dup(data, orig);
-
-    return bind;
-}
-
-/*
- * MISSING: documentation
- */
-
-static VALUE
-proc_dup(self)
-    VALUE self;
-{
-    struct BLOCK *orig, *data;
-    VALUE bind;
+    MEMCPY(data, orig, struct BLOCK, 1);
+    frame_dup(&data->frame);
 
-    Data_Get_Struct(self, struct BLOCK, orig);
-    bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
-    blk_dup(data, orig);
+    if (data->iter) {
+	blk_copy_prev(data);
+    }
+    else {
+	data->prev = 0;
+    }
 
     return bind;
 }
 
-/*
- *  call-seq:
- *     binding -> a_binding
- *  
- *  Returns a +Binding+ object, describing the variable and
- *  method bindings at the point of call. This object can be used when
- *  calling +eval+ to execute the evaluated command in this
- *  environment. Also see the description of class +Binding+.
- *     
- *     def getBinding(param)
- *       return binding
- *     end
- *     b = getBinding("hello")
- *     eval("param", b)   #=> "hello"
- */
-
 static VALUE
 rb_f_binding(self)
     VALUE self;
@@ -8292,7 +6506,6 @@ rb_f_binding(self)
     if (ruby_frame->prev) {
 	data->frame.last_func = ruby_frame->prev->last_func;
 	data->frame.last_class = ruby_frame->prev->last_class;
-	data->frame.orig_func = ruby_frame->prev->orig_func;
     }
 
     if (data->iter) {
@@ -8301,6 +6514,8 @@ rb_f_binding(self)
     else {
 	data->prev = 0;
     }
+    data->flags |= BLOCK_DYNAMIC;
+    data->tag->flags |= BLOCK_DYNAMIC;
 
     for (p = data; p; p = p->prev) {
 	for (vars = p->dyna_vars; vars; vars = vars->next) {
@@ -8314,61 +6529,77 @@ rb_f_binding(self)
     return bind;
 }
 
-#define PROC_TSHIFT (FL_USHIFT+1)
-#define PROC_TMASK  (FL_USER1|FL_USER2|FL_USER3)
-#define PROC_TMAX   (PROC_TMASK >> PROC_TSHIFT)
-
-#define SAFE_LEVEL_MAX PROC_TMASK
+#define PROC_T3    FL_USER1
+#define PROC_T4    FL_USER2
+#define PROC_TMAX  (FL_USER1|FL_USER2)
+#define PROC_TMASK (FL_USER1|FL_USER2)
 
 static void
 proc_save_safe_level(data)
     VALUE data;
 {
-    int safe = ruby_safe_level;
-    if (safe > PROC_TMAX) safe = PROC_TMAX;
-    FL_SET(data, (safe << PROC_TSHIFT) & PROC_TMASK);
+    if (OBJ_TAINTED(data)) {
+	switch (ruby_safe_level) {
+	  case 3:
+	    FL_SET(data, PROC_T3);
+	    break;
+	  case 4:
+	    FL_SET(data, PROC_T4);
+	    break;
+	  default:
+	    if (ruby_safe_level > 4) {
+		FL_SET(data, PROC_TMAX);
+	    }
+	    break;
+	}
+    }
 }
 
 static int
 proc_get_safe_level(data)
     VALUE data;
 {
-    return (RBASIC(data)->flags & PROC_TMASK) >> PROC_TSHIFT;
+    if (OBJ_TAINTED(data)) {
+	switch (RBASIC(data)->flags & PROC_TMASK) {
+	  case PROC_T3:
+	    return 3;
+	  case PROC_T4:
+	    return 4;
+	  case PROC_TMAX:
+	    return 5;
+	}
+	return 3;
+    }
+    return 0;
 }
 
 static void
 proc_set_safe_level(data)
     VALUE data;
 {
-    ruby_safe_level = proc_get_safe_level(data);
+    if (OBJ_TAINTED(data)) {
+	ruby_safe_level = proc_get_safe_level(data);
+    }
 }
 
 static VALUE
-proc_alloc(klass, proc)
+proc_new(klass)
     VALUE klass;
-    int proc;
 {
-    volatile VALUE block;
+    volatile VALUE proc;
     struct BLOCK *data, *p;
     struct RVarmap *vars;
 
     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 (!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;
-    data->block_obj = block;
     frame_dup(&data->frame);
     if (data->iter) {
 	blk_copy_prev(data);
@@ -8376,6 +6607,8 @@ proc_alloc(klass, proc)
     else {
 	data->prev = 0;
     }
+    data->flags |= BLOCK_DYNAMIC;
+    data->tag->flags |= BLOCK_DYNAMIC;
 
     for (p = data; p; p = p->prev) {
 	for (vars = p->dyna_vars; vars; vars = vars->next) {
@@ -8384,79 +6617,35 @@ proc_alloc(klass, proc)
 	}
     }
     scope_dup(data->scope);
-    proc_save_safe_level(block);
-    if (proc) {
-	data->flags |= BLOCK_LAMBDA;
-    }
-    else {
-	ruby_block->block_obj = block;
-    }
+    proc_save_safe_level(proc);
 
-    return block;
+    return proc;
 }
 
-/*
- *  call-seq:
- *     Proc.new {|...| block } => a_proc 
- *     Proc.new                => a_proc 
- *  
- *  Creates a new <code>Proc</code> object, bound to the current
- *  context. <code>Proc::new</code> may be called without a block only
- *  within a method with an attached block, in which case that block is
- *  converted to the <code>Proc</code> object.
- *     
- *     def proc_from
- *       Proc.new
- *     end
- *     proc = proc_from { "hello" }
- *     proc.call   #=> "hello"
- */
-
 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 proc = proc_new(klass);
 
-VALUE
-rb_block_proc()
-{
-    return proc_alloc(rb_cProc, Qfalse);
+    rb_obj_call_init(proc, argc, argv);
+    return proc;
 }
 
 VALUE
 rb_f_lambda()
 {
-    rb_warn("rb_f_lambda() is deprecated; use rb_block_proc() instead");
-    return proc_alloc(rb_cProc, Qtrue);
-}
-
-/*
- * call-seq:
- *   proc   { |...| block }  => a_proc
- *   lambda { |...| block }  => a_proc
- *
- * Equivalent to <code>Proc.new</code>, except the resulting Proc objects
- * check the number of parameters passed when called.
- */
-
-static VALUE
-proc_lambda()
-{
-    return proc_alloc(rb_cProc, Qtrue);
+    return proc_new(rb_cProc);
 }
 
 static int
-block_orphan(data)
+blk_orphan(data)
     struct BLOCK *data;
 {
-    if (data->scope->flags & SCOPE_NOSTACK) {
+    if ((data->tag->flags & BLOCK_ORPHAN) &&
+	(data->scope->flags & SCOPE_NOSTACK)) {
 	return 1;
     }
     if (data->orig_thread != rb_thread_current()) {
@@ -8466,159 +6655,94 @@ block_orphan(data)
 }
 
 static VALUE
-proc_invoke(proc, args, self, klass)
+proc_invoke(proc, args, pcall, self)
     VALUE proc, args;		/* OK */
-    VALUE self, klass;
+    int pcall;
+    VALUE self;
 {
     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;
-    volatile int pcall, avalue = Qtrue;
-    volatile VALUE tmp = args;
+    struct RVarmap * volatile old_dvars = ruby_dyna_vars;
 
     if (rb_block_given_p() && ruby_frame->last_func) {
-	if (klass != ruby_frame->last_class)
-	    klass = rb_obj_class(proc);
 	rb_warning("block for %s#%s is useless",
-		   rb_class2name(klass),
+		   rb_obj_classname(proc),
 		   rb_id2name(ruby_frame->last_func));
     }
 
     Data_Get_Struct(proc, struct BLOCK, data);
-    pcall = (data->flags & BLOCK_LAMBDA) ? YIELD_LAMBDA_CALL : 0;
-    if (!pcall && RARRAY(args)->len == 1) {
-	avalue = Qfalse;
-	args = RARRAY(args)->ptr[0];
-    }
+    orphan = blk_orphan(data);
 
-    PUSH_VARS();
     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;
-    _block.frame.argc = RARRAY(tmp)->len;
-    _block.frame.flags = ruby_frame->flags;
-    if (_block.frame.argc && DMETHOD_P()) {
-        NEWOBJ(scope, struct SCOPE);
-        OBJSETUP(scope, tmp, T_SCOPE);
-        scope->local_tbl = _block.scope->local_tbl;
-        scope->local_vars = _block.scope->local_vars;
-        scope->flags |= SCOPE_CLONE;
-        _block.scope = scope;
-    }
-    /* modify current frame */
+    _block.frame.self = self;
     ruby_block = &_block;
+
     PUSH_ITER(ITER_CUR);
     ruby_frame->iter = ITER_CUR;
-    PUSH_TAG(pcall ? PROT_LAMBDA : PROT_NONE);
+
+    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 (TAG_DST()) {
-	result = prot_tag->retval;
+	result = rb_yield_0(args, self, self!=Qundef?CLASS_OF(self):0, pcall, Qtrue);
     }
     POP_TAG();
+
     POP_ITER();
+    if (ruby_block->tag->dst == state) {
+	state &= TAG_MASK;
+    }
     ruby_block = old_block;
     ruby_wrapper = old_wrapper;
-    POP_VARS();
+    ruby_dyna_vars = old_dvars;
     ruby_safe_level = safe;
 
     switch (state) {
       case 0:
 	break;
-      case TAG_RETRY:
-	proc_jump_error(TAG_RETRY, Qnil); /* xxx */
-	JUMP_TAG(state);
-	break;
-      case TAG_NEXT:
       case TAG_BREAK:
-	if (!pcall && result != Qundef) {
-	    proc_jump_error(state, result);
+	if (!pcall && orphan) {
+	    localjump_error("break from proc-closure", prot_tag->retval);
 	}
+	result = prot_tag->retval;
+	break;
+      case TAG_RETRY:
+	localjump_error("retry from proc-closure", Qnil);
+	break;
       case TAG_RETURN:
-	if (result != Qundef) {
-	    if (pcall) break;
-	    return_jump(result);
+	if (orphan) {	/* orphan procedure */
+	    localjump_error("return from proc-closure", prot_tag->retval);
 	}
+	/* fall through */
       default:
 	JUMP_TAG(state);
     }
     return result;
 }
 
-/* CHECKME: are the argument checking semantics correct? */
-
-/*
- *  call-seq:
- *     prc.call(params,...)   => obj
- *     prc[params,...]        => obj
- *  
- *  Invokes the block, setting the block's parameters to the values in
- *  <i>params</i> using something close to method calling semantics.
- *  Generates a warning if multiple values are passed to a proc that
- *  expects just one (previously this silently converted the parameters
- *  to an array). 
- *
- *  For procs created using <code>Kernel.proc</code>, generates an 
- *  error if the wrong number of parameters
- *  are passed to a proc with multiple parameters. For procs created using
- *  <code>Proc.new</code>, extra parameters are silently discarded.
- *
- *  Returns the value of the last expression evaluated in the block. See
- *  also <code>Proc#yield</code>.
- *     
- *     a_proc = Proc.new {|a, *b| b.collect {|i| i*a }}
- *     a_proc.call(9, 1, 2, 3)   #=> [9, 18, 27]
- *     a_proc[9, 1, 2, 3]        #=> [9, 18, 27]
- *     a_proc = Proc.new {|a,b| a}
- *     a_proc.call(1,2,3)
- *     
- *  <em>produces:</em>
- *     
- *     prog.rb:5: wrong number of arguments (3 for 2) (ArgumentError)
- *     	from prog.rb:4:in `call'
- *     	from prog.rb:5
- */
-
 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));
-
-/*
- *  call-seq:
- *     prc.arity -> fixnum
- *  
- *  Returns the number of arguments that would not be ignored. If the block
- *  is declared to take no arguments, returns 0. If the block is known
- *  to take exactly n arguments, returns n. If the block has optional
- *  arguments, return -n-1, where n is the number of mandatory
- *  arguments. A <code>proc</code> with no argument declarations
- *  is the same a block declaring <code>||</code> as its arguments.
- *     
- *     Proc.new {}.arity          #=>  0
- *     Proc.new {||}.arity        #=>  0
- *     Proc.new {|a|}.arity       #=>  1
- *     Proc.new {|a,b|}.arity     #=>  2
- *     Proc.new {|a,b,c|}.arity   #=>  3
- *     Proc.new {|*a|}.arity      #=> -1
- *     Proc.new {|a,*b|}.arity    #=> -2
- */
+    return proc_invoke(proc, args, Qtrue, Qundef);
+}
+
+static VALUE
+proc_yield(proc, args)
+    VALUE proc, args;		/* OK */
+{
+    return proc_invoke(proc, args, Qfalse, Qundef);
+}
 
 static VALUE
 proc_arity(proc)
@@ -8629,18 +6753,12 @@ 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 == 0) return INT2FIX(-1);
     if (data->var == (NODE*)1) return INT2FIX(0);
     if (data->var == (NODE*)2) return INT2FIX(0);
     switch (nd_type(data->var)) {
       default:
-	return INT2FIX(1);
+	return INT2FIX(-1);
       case NODE_MASGN:
 	list = data->var->nd_head;
 	n = 0;
@@ -8653,14 +6771,6 @@ proc_arity(proc)
     }
 }
 
-/*
- * call-seq:
- *   prc == other_proc   =>  true or false
- *
- * Return <code>true</code> if <i>prc</i> is the same object as
- * <i>other_proc</i>, or if they are both procs with the same body.
- */
-
 static VALUE
 proc_eq(self, other)
     VALUE self, other;
@@ -8673,31 +6783,18 @@ proc_eq(self, other)
     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 Qfalse;
-    if (data->var != data2->var) return Qfalse;
-    if (data->scope != data2->scope) return Qfalse;
-    if (data->dyna_vars != data2->dyna_vars) return Qfalse;
-    if (data->flags != data2->flags) return Qfalse;
-
-    return Qtrue;
+    if (data->tag == data2->tag) return Qtrue;
+    return Qfalse;
 }
 
-/*
- * call-seq:
- *   prc.to_s   => string
- *
- * Shows the unique identifier for this proc, along with
- * an indication of where the proc was defined.
- */
-
 static VALUE
-proc_to_s(self)
-    VALUE self;
+proc_to_s(self, other)
+    VALUE self, other;
 {
     struct BLOCK *data;
     NODE *node;
     char *cname = rb_obj_classname(self);
-    const int w = (sizeof(VALUE) * CHAR_BIT) / 4;
+    const int w = (SIZEOF_LONG * CHAR_BIT) / 4;
     long len = strlen(cname)+6+w; /* 6:tags 16:addr */
     VALUE str;
 
@@ -8705,14 +6802,12 @@ proc_to_s(self)
     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);
-	snprintf(RSTRING(str)->ptr, len+1,
-		 "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->body,
-		 node->nd_file, nd_line(node));
+	sprintf(RSTRING(str)->ptr, "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->tag,
+		node->nd_file, nd_line(node));
     }
     else {
 	str = rb_str_new(0, len);
-	snprintf(RSTRING(str)->ptr, len+1,
-		 "#<%s:0x%.*lx>", cname, w, (VALUE)data->body);
+	sprintf(RSTRING(str)->ptr, "#<%s:0x%.*lx>", cname, w, (VALUE)data->tag);
     }
     RSTRING(str)->len = strlen(RSTRING(str)->ptr);
     if (OBJ_TAINTED(self)) OBJ_TAINT(str);
@@ -8720,39 +6815,13 @@ proc_to_s(self)
     return str;
 }
 
-/*
- *  call-seq:
- *     prc.to_proc -> prc
- *  
- *  Part of the protocol for converting objects to <code>Proc</code>
- *  objects. Instances of class <code>Proc</code> simply return
- *  themselves.
- */
-
 static VALUE
-proc_to_self(self)
-    VALUE self;
+proc_to_proc(proc)
+    VALUE proc;
 {
-    return self;
+    return proc;
 }
 
-/*
- *  call-seq:
- *     prc.binding    => binding
- *  
- *  Returns the binding associated with <i>prc</i>. Note that
- *  <code>Kernel#eval</code> accepts either a <code>Proc</code> or a
- *  <code>Binding</code> object as its second parameter.
- *     
- *     def fred(param)
- *       proc {}
- *     end
- *     
- *     b = fred(99)
- *     eval("param", b.binding)   #=> 99
- *     eval("param", b)           #=> 99
- */
-
 static VALUE
 proc_binding(proc)
     VALUE proc;
@@ -8780,7 +6849,7 @@ block_pass(self, node)
     VALUE self;
     NODE *node;
 {
-    VALUE proc = rb_eval(self, node->nd_body);	/* OK */
+    VALUE block = rb_eval(self, node->nd_body);	/* OK */
     VALUE b;
     struct BLOCK * volatile old_block;
     struct BLOCK _block;
@@ -8790,74 +6859,81 @@ block_pass(self, node)
     volatile int orphan;
     volatile int safe = ruby_safe_level;
 
-    if (NIL_P(proc)) {
+    if (NIL_P(block)) {
 	PUSH_ITER(ITER_NOT);
 	result = rb_eval(self, node->nd_iter);
 	POP_ITER();
 	return result;
     }
-    if (!rb_obj_is_proc(proc)) {
-	b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
+    if (!rb_obj_is_proc(block)) {
+	b = rb_check_convert_type(block, 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));
+		     rb_obj_classname(block));
 	}
-	proc = b;
+	block = b;
     }
 
-    if (ruby_safe_level >= 1 && OBJ_TAINTED(proc) &&
-	ruby_safe_level > proc_get_safe_level(proc)) {
-	rb_raise(rb_eSecurityError, "Insecure: tainted block value");
+    if (ruby_safe_level >= 1 && OBJ_TAINTED(block)) {
+	if (ruby_safe_level > proc_get_safe_level(block)) {
+	    rb_raise(rb_eSecurityError, "Insecure: tainted block value");
+	}
     }
 
-    if (ruby_block && ruby_block->block_obj == proc) {
-	PUSH_ITER(ITER_PAS);
-	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);
 
+  retry:
     /* PUSH BLOCK from data */
     old_block = ruby_block;
     _block = *data;
-    _block.outer = ruby_block;
-    if (orphan) _block.uniq = block_unique++;
     ruby_block = &_block;
     PUSH_ITER(ITER_PRE);
-    if (ruby_frame->iter == ITER_NOT)
-	ruby_frame->iter = ITER_PRE;
+    ruby_frame->iter = ITER_PRE;
 
-    PUSH_TAG(PROT_LOOP);
+    PUSH_TAG(PROT_NONE);
     state = EXEC_TAG();
     if (state == 0) {
-      retry:
-	proc_set_safe_level(proc);
+	proc_set_safe_level(block);
 	if (safe > ruby_safe_level)
 	    ruby_safe_level = safe;
 	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 (_block.tag->dst == state) {
+	if (orphan) {
+	    state &= TAG_MASK;
+	}
+	else {
+	    struct BLOCK *ptr = old_block;
+
+	    while (ptr) {
+		if (ptr->scope == _block.scope) {
+		    ptr->tag->dst = state;
+		    break;
+		}
+		ptr = ptr->prev;
+	    }
+	    if (!ptr) {
+		state &= TAG_MASK;
+	    }
+	}
+    }
     ruby_block = old_block;
     ruby_safe_level = safe;
 
-    switch (state) {/* escape from orphan block */
+    switch (state) {/* escape from orphan procedure */
       case 0:
 	break;
+      case TAG_BREAK:
+	result = prot_tag->retval;
+	break;
+      case TAG_RETRY:
+	goto retry;
       case TAG_RETURN:
 	if (orphan) {
-	    proc_jump_error(state, prot_tag->retval);
+	    localjump_error("return from proc-closure", prot_tag->retval);
 	}
       default:
 	JUMP_TAG(state);
@@ -8870,7 +6946,6 @@ struct METHOD {
     VALUE klass, rklass;
     VALUE recv;
     ID id, oid;
-    int safe_level;
     NODE *body;
 };
 
@@ -8906,10 +6981,7 @@ 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);
     data->klass = klass;
     data->recv = obj;
@@ -8917,46 +6989,11 @@ mnew(klass, obj, id, mklass)
     data->body = body;
     data->rklass = rklass;
     data->oid = oid;
-    data->safe_level = NOEX_WITH_SAFE(noex);
     OBJ_INFECT(method, klass);
 
     return method;
 }
 
-
-/**********************************************************************
- *
- * Document-class : Method
- *
- *  Method objects are created by <code>Object#method</code>, and are
- *  associated with a particular object (not just with a class). They
- *  may be used to invoke the method within the object, and as a block
- *  associated with an iterator. They may also be unbound from one
- *  object (creating an <code>UnboundMethod</code>) and bound to
- *  another.
- *     
- *     class Thing
- *       def square(n)
- *         n*n
- *       end
- *     end
- *     thing = Thing.new
- *     meth  = thing.method(:square)
- *     
- *     meth.call(9)                 #=> 81
- *     [ 1, 2, 3 ].collect(&meth)   #=> [1, 4, 9]
- *     
- */
-
-/*
- * call-seq:
- *   meth == other_meth  => true or false
- *
- * Two method objects are equal if that are bound to the same
- * object and contain the same body.
- */
-
-
 static VALUE
 method_eq(method, other)
     VALUE method, other;
@@ -8978,15 +7015,6 @@ method_eq(method, other)
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     meth.unbind    => unbound_method
- *  
- *  Dissociates <i>meth</i> from it's current receiver. The resulting
- *  <code>UnboundMethod</code> can subsequently be bound to a new object
- *  of the same class (see <code>UnboundMethod</code>).
- */
-
 static VALUE
 method_unbind(obj)
     VALUE obj;
@@ -9007,33 +7035,12 @@ method_unbind(obj)
     return method;
 }
 
-/*
- *  call-seq:
- *     obj.method(sym)    => method
- *  
- *  Looks up the named method as a receiver in <i>obj</i>, returning a
- *  <code>Method</code> object (or raising <code>NameError</code>). The
- *  <code>Method</code> object acts as a closure in <i>obj</i>'s object
- *  instance, so instance variables and the value of <code>self</code>
- *  remain available.
- *     
- *     class Demo
- *       def initialize(n)
- *         @iv = n
- *       end
- *       def hello()
- *         "Hello, @iv = #{@iv}"
- *       end
- *     end
- *     
- *     k = Demo.new(99)
- *     m = k.method(:hello)
- *     m.call   #=> "Hello, @iv = 99"
- *     
- *     l = Demo.new('Fred')
- *     m = l.method("hello")
- *     m.call   #=> "Hello, @iv = Fred"
- */
+static VALUE
+umethod_unbind(obj)
+    VALUE obj;
+{
+    return obj;
+}
 
 static VALUE
 rb_obj_method(obj, vid)
@@ -9043,38 +7050,6 @@ rb_obj_method(obj, vid)
     return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod);
 }
 
-/*
- *  call-seq:
- *     mod.instance_method(symbol)   => unbound_method
- *  
- *  Returns an +UnboundMethod+ representing the given
- *  instance method in _mod_.
- *     
- *     class Interpreter
- *       def do_a() print "there, "; end
- *       def do_d() print "Hello ";  end
- *       def do_e() print "!\n";     end
- *       def do_v() print "Dave";    end
- *       Dispatcher = {
- *        ?a => instance_method(:do_a),
- *        ?d => instance_method(:do_d),
- *        ?e => instance_method(:do_e),
- *        ?v => instance_method(:do_v)
- *       }
- *       def interpret(string)
- *         string.each_byte {|b| Dispatcher[b].bind(self).call }
- *       end
- *     end
- *     
- *     
- *     interpreter = Interpreter.new
- *     interpreter.interpret('dave')
- *     
- *  <em>produces:</em>
- *     
- *     Hello there, Dave!
- */
-
 static VALUE
 rb_mod_method(mod, vid)
     VALUE mod;
@@ -9083,10 +7058,6 @@ rb_mod_method(mod, vid)
     return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod);
 }
 
-/*
- * MISSING: documentation
- */
-
 static VALUE
 method_clone(self)
     VALUE self;
@@ -9102,203 +7073,74 @@ method_clone(self)
     return clone;
 }
 
-/*
- *  call-seq:
- *     meth.call(args, ...)    => obj
- *     meth[args, ...]         => obj
- *  
- *  Invokes the <i>meth</i> with the specified arguments, returning the
- *  method's return value.
- *     
- *     m = 12.method("+")
- *     m.call(3)    #=> 15
- *     m.call(20)   #=> 32
- */
-
 static VALUE
 method_call(argc, argv, method)
     int argc;
     VALUE *argv;
     VALUE method;
 {
-    VALUE result = Qnil;	/* OK */
+    VALUE result;	/* OK */
     struct METHOD *data;
-    int safe;
+    int state;
+    volatile int safe = ruby_safe_level;
 
     Data_Get_Struct(method, struct METHOD, data);
     if (data->recv == Qundef) {
-	rb_raise(rb_eTypeError, "can't call unbound method; bind first");
+	rb_raise(rb_eTypeError, "you cannot call unbound method; bind first");
     }
-    if (OBJ_TAINTED(method)) {
-        safe = NOEX_WITH(data->safe_level, 4)|NOEX_TAINTED;
+    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    PUSH_TAG(PROT_NONE);
+    if (OBJ_TAINTED(method) && ruby_safe_level < 4) {
+	ruby_safe_level = 4;
     }
-    else {
-	safe = data->safe_level;
+    if ((state = EXEC_TAG()) == 0) {
+	result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,0);
     }
-    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
-    result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,safe);
+    POP_TAG();
     POP_ITER();
+    ruby_safe_level = safe;
+    if (state) JUMP_TAG(state);
     return result;
 }
 
-/**********************************************************************
- *
- * Document-class: UnboundMethod
- *
- *  Ruby supports two forms of objectified methods. Class
- *  <code>Method</code> is used to represent methods that are associated
- *  with a particular object: these method objects are bound to that
- *  object. Bound method objects for an object can be created using
- *  <code>Object#method</code>.
- *     
- *  Ruby also supports unbound methods; methods objects that are not
- *  associated with a particular object. These can be created either by
- *  calling <code>Module#instance_method</code> or by calling
- *  <code>unbind</code> on a bound method object. The result of both of
- *  these is an <code>UnboundMethod</code> object.
- *     
- *  Unbound methods can only be called after they are bound to an
- *  object. That object must be be a kind_of? the method's original
- *  class.
- *     
- *     class Square
- *       def area
- *         @side * @side
- *       end
- *       def initialize(side)
- *         @side = side
- *       end
- *     end
- *     
- *     area_un = Square.instance_method(:area)
- *     
- *     s = Square.new(12)
- *     area = area_un.bind(s)
- *     area.call   #=> 144
- *     
- *  Unbound methods are a reference to the method at the time it was
- *  objectified: subsequent changes to the underlying class will not
- *  affect the unbound method.
- *     
- *     class Test
- *       def test
- *         :original
- *       end
- *     end
- *     um = Test.instance_method(:test)
- *     class Test
- *       def test
- *         :modified
- *       end
- *     end
- *     t = Test.new
- *     t.test            #=> :modified
- *     um.bind(t).call   #=> :original
- *     
- */
-
-/*
- *  call-seq:
- *     umeth.bind(obj) -> method
- *  
- *  Bind <i>umeth</i> to <i>obj</i>. If <code>Klass</code> was the class
- *  from which <i>umeth</i> was obtained,
- *  <code>obj.kind_of?(Klass)</code> must be true.
- *     
- *     class A
- *       def test
- *         puts "In test, class = #{self.class}"
- *       end
- *     end
- *     class B < A
- *     end
- *     class C < B
- *     end
- *     
- *     
- *     um = B.instance_method(:test)
- *     bm = um.bind(C.new)
- *     bm.call
- *     bm = um.bind(B.new)
- *     bm.call
- *     bm = um.bind(A.new)
- *     bm.call
- *     
- *  <em>produces:</em>
- *     
- *     In test, class = C
- *     In test, class = B
- *     prog.rb:16:in `bind': bind argument must be an instance of B (TypeError)
- *     	from prog.rb:16
- */
-
 static VALUE
 umethod_bind(method, recv)
     VALUE method, recv;
 {
     struct METHOD *data, *bound;
-    VALUE rklass = CLASS_OF(recv);
 
     Data_Get_Struct(method, struct METHOD, data);
-    if (data->rklass != rklass) {
+    if (data->rklass != CLASS_OF(recv)) {
 	if (FL_TEST(data->rklass, FL_SINGLETON)) {
-	    rb_raise(rb_eTypeError, "singleton method bound for a different object");
+	    rb_raise(rb_eTypeError, "singleton method called for a different object");
 	}
-	if (TYPE(data->rklass) == T_MODULE) {
-	    st_table *m_tbl = RCLASS(data->rklass)->m_tbl;
-	    while (RCLASS(rklass)->m_tbl != m_tbl) {
-		rklass = RCLASS(rklass)->super;
-		if (!rklass) goto not_instace;
-	    }
+	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));
 	}
-	else if (!rb_obj_is_kind_of(recv, data->rklass)) {
-	  not_instace:
+#if 0
+	if (!((TYPE(data->rklass) == T_MODULE) ?
+	      rb_obj_is_kind_of(recv, data->rklass) :
+	      rb_obj_is_instance_of(recv, data->rklass))) {
 	    rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
 		     rb_class2name(data->rklass));
 	}
+#else
+	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));
+	}
+#endif
     }
 
     method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound);
     *bound = *data;
     bound->recv = recv;
-    bound->rklass = rklass;
+    bound->rklass = CLASS_OF(recv);
 
     return method;
 }
 
-/*
- *  call-seq:
- *     meth.arity    => fixnum
- *  
- *  Returns an indication of the number of arguments accepted by a
- *  method. Returns a nonnegative integer for methods that take a fixed
- *  number of arguments. For Ruby methods that take a variable number of
- *  arguments, returns -n-1, where n is the number of required
- *  arguments. For methods written in C, returns -1 if the call takes a
- *  variable number of arguments.
- *     
- *     class C
- *       def one;    end
- *       def two(a); end
- *       def three(*a);  end
- *       def four(a, b); end
- *       def five(a, b, *c);    end
- *       def six(a, b, *c, &d); end
- *     end
- *     c = C.new
- *     c.method(:one).arity     #=> 0
- *     c.method(:two).arity     #=> 1
- *     c.method(:three).arity   #=> -1
- *     c.method(:four).arity    #=> 2
- *     c.method(:five).arity    #=> -3
- *     c.method(:six).arity     #=> -3
- *     
- *     "cat".method(:size).arity      #=> 0
- *     "cat".method(:replace).arity   #=> 1
- *     "cat".method(:squeeze).arity   #=> -1
- *     "cat".method(:count).arity     #=> -1
- */
-
 static VALUE
 method_arity(method)
     VALUE method;
@@ -9320,34 +7162,18 @@ method_arity(method)
 	return INT2FIX(1);
       case NODE_IVAR:
 	return INT2FIX(0);
-      case NODE_BMETHOD:
-	return proc_arity(body->nd_cval);
-      case NODE_DMETHOD:
-	return method_arity(body->nd_cval);
-      case NODE_SCOPE:
+      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)
+	if (body->nd_opt || body->nd_rest != -1)
 	    n = -n-1;
 	return INT2FIX(n);
-      default:
-	rb_raise(rb_eArgError, "invalid node 0x%x", nd_type(body));
-   }
+    }
 }
 
-/*
- *  call-seq:
- *   meth.to_s      =>  string
- *   meth.inspect   =>  string
- *
- *  Show the name of the underlying method.
- *
- *    "cat".method(:count).inspect   #=> "#<Method: String#count>"
- */
-
 static VALUE
 method_inspect(method)
     VALUE method;
@@ -9384,12 +7210,8 @@ method_inspect(method)
     else {
 	rb_str_buf_cat2(str, rb_class2name(data->rklass));
 	if (data->rklass != data->klass) {
-	    VALUE klass = data -> klass;
-	    if (TYPE(klass) == T_ICLASS) {
-		klass = RBASIC(klass)->klass;
-	    }
 	    rb_str_buf_cat2(str, "(");
-	    rb_str_buf_cat2(str, rb_class2name(klass));
+	    rb_str_buf_cat2(str, rb_class2name(data->klass));
 	    rb_str_buf_cat2(str, ")");
 	}
     }
@@ -9409,10 +7231,20 @@ mproc(method)
     /* emulate ruby's method call */
     PUSH_ITER(ITER_CUR);
     PUSH_FRAME();
-    proc = rb_block_proc();
+    proc = rb_f_lambda();
     POP_FRAME();
     POP_ITER();
 
+    if (method) {
+	struct METHOD *mdata;
+	struct BLOCK *bdata;
+
+	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));
+    }
+
     return proc;
 }
 
@@ -9420,13 +7252,15 @@ static VALUE
 bmcall(args, method)
     VALUE args, method;
 {
-    volatile VALUE a;
-    VALUE ret;
+    args = svalue_to_avalue(args);
+    return method_call(RARRAY(args)->len, RARRAY(args)->ptr, method);
+}
 
-    a = svalue_to_avalue(args);
-    ret = method_call(RARRAY(a)->len, RARRAY(a)->ptr, method);
-    a = Qnil; /* prevent tail call */
-    return ret;
+static VALUE
+umcall(args, method)
+    VALUE args, method;
+{
+    return method_call(0, 0, method);
 }
 
 VALUE
@@ -9434,86 +7268,23 @@ 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;
+    return rb_iterate((VALUE(*)_((VALUE)))mproc, 0, func, val);
 }
 
-/*
- *  call-seq:
- *     meth.to_proc    => prc
- *  
- *  Returns a <code>Proc</code> object corresponding to this 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;
+    return rb_iterate((VALUE(*)_((VALUE)))mproc, method, bmcall, method);
 }
 
 static VALUE
-rb_obj_is_method(m)
-    VALUE m;
+umethod_proc(method)
+    VALUE method;
 {
-    if (TYPE(m) == T_DATA && RDATA(m)->dmark == (RUBY_DATA_FUNC)bm_mark) {
-	return Qtrue;
-    }
-    return Qfalse;
+    return rb_iterate((VALUE(*)_((VALUE)))mproc, method, umcall, method);
 }
 
-/*
- *  call-seq:
- *     define_method(symbol, method)     => new_method
- *     define_method(symbol) { block }   => proc
- *  
- *  Defines an instance method in the receiver. The _method_
- *  parameter can be a +Proc+ or +Method+ object.
- *  If a block is specified, it is used as the method body. This block
- *  is evaluated using <code>instance_eval</code>, a point that is
- *  tricky to demonstrate because <code>define_method</code> is private.
- *  (This is why we resort to the +send+ hack in this example.)
- *     
- *     class A
- *       def fred
- *         puts "In Fred"
- *       end
- *       def create_method(name, &block)
- *         self.class.send(:define_method, name, &block)
- *       end
- *       define_method(:wilma) { puts "Charge it!" }
- *     end
- *     class B < A
- *       define_method(:barney, instance_method(:fred))
- *     end
- *     a = B.new
- *     a.barney
- *     a.wilma
- *     a.create_method(:betty) { p self }
- *     a.betty
- *     
- *  <em>produces:</em>
- *     
- *     In Fred
- *     Charge it!
- *     #<B:0x401b39e8>
- */
-
 static VALUE
 rb_mod_define_method(argc, argv, mod)
     int argc;
@@ -9527,18 +7298,18 @@ rb_mod_define_method(argc, argv, mod)
 
     if (argc == 1) {
 	id = rb_to_id(argv[0]);
-	body = proc_lambda();
+	body = rb_f_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)) {
+	if (!rb_obj_is_kind_of(body, rb_cMethod) && !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);
+	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));
@@ -9546,7 +7317,7 @@ rb_mod_define_method(argc, argv, mod)
     else if (RDATA(body)->dmark == (RUBY_DATA_FUNC)blk_mark) {
 	struct BLOCK *block;
 
-	body = proc_clone(body);
+	body = bind_clone(body);
 	Data_Get_Struct(body, struct BLOCK, block);
 	block->frame.last_func = id;
 	block->frame.orig_func = id;
@@ -9568,58 +7339,46 @@ rb_mod_define_method(argc, argv, mod)
 	noex = NOEX_PUBLIC;
     }
     rb_add_method(mod, id, node, noex);
+    if (scope_vmode == SCOPE_MODFUNC) {
+	rb_add_method(rb_singleton_class(mod), id, node, NOEX_PUBLIC);
+	rb_funcall(mod, singleton_added, 1, ID2SYM(id));
+    }
+    if (FL_TEST(mod, FL_SINGLETON)) {
+	rb_funcall(rb_iv_get(mod, "__attached__"), singleton_added, 1, ID2SYM(id));
+    }
+    else {
+	rb_funcall(mod, added, 1, ID2SYM(id));
+    }
     return body;
 }
 
-/*
- *  <code>Proc</code> objects are blocks of code that have been bound to
- *  a set of local variables. Once bound, the code may be called in
- *  different contexts and still access those variables.
- *     
- *     def gen_times(factor)
- *       return Proc.new {|n| n*factor }
- *     end
- *     
- *     times3 = gen_times(3)
- *     times5 = gen_times(5)
- *     
- *     times3.call(12)               #=> 36
- *     times5.call(5)                #=> 25
- *     times3.call(times5.call(4))   #=> 60
- *     
- */
-
 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);
-
-    rb_global_variable(&exception_error);
-    exception_error = rb_exc_new2(rb_eFatal, "exception reentered");
+    rb_define_method(rb_eLocalJumpError, "exitstatus", localjump_exitstatus, 0);
 
     rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
-    rb_global_variable(&sysstack_error);
-    sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep");
-    OBJ_TAINT(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_method(rb_cProc, "clone", proc_clone, 0);
-    rb_define_method(rb_cProc, "dup", proc_dup, 0);
     rb_define_method(rb_cProc, "call", proc_call, -2);
+    rb_define_method(rb_cProc, "yield", proc_yield, -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, "to_proc", proc_to_proc, 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_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_alloc_func(rb_cBinding);
+    rb_undef_method(CLASS_OF(rb_cBinding), "new");
+    rb_define_method(rb_cBinding, "clone", bind_clone, 0);
 
     rb_cMethod = rb_define_class("Method", rb_cObject);
     rb_undef_alloc_func(rb_cMethod);
@@ -9635,77 +7394,13 @@ Init_Proc()
     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_cUnboundMethod = rb_define_class("UnboundMethod", rb_cMethod);
+    rb_define_method(rb_cUnboundMethod, "to_proc", umethod_proc, 0);
     rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
+    rb_define_method(rb_cUnboundMethod, "unbind", umethod_unbind, 0);
     rb_define_method(rb_cModule, "instance_method", rb_mod_method, 1);
 }
 
-/*
- *  Objects of class <code>Binding</code> encapsulate the execution
- *  context at some particular place in the code and retain this context 
- *  for future use. The variables, methods, value of <code>self</code>,
- *  and possibly an iterator block that can be accessed in this context
- *  are all retained. Binding objects can be created using
- *  <code>Kernel#binding</code>, and are made available to the callback
- *  of <code>Kernel#set_trace_func</code>.
- *     
- *  These binding objects can be passed as the second argument of the
- *  <code>Kernel#eval</code> method, establishing an environment for the
- *  evaluation.
- *     
- *     class Demo
- *       def initialize(n)
- *         @secret = n
- *       end
- *       def getBinding
- *         return binding()
- *       end
- *     end
- *     
- *     k1 = Demo.new(99)
- *     b1 = k1.getBinding
- *     k2 = Demo.new(-3)
- *     b2 = k2.getBinding
- *     
- *     eval("@secret", b1)   #=> 99
- *     eval("@secret", b2)   #=> -3
- *     eval("@secret")       #=> nil
- *     
- *  Binding objects have no class-specific methods.
- *     
- */
-
-void 
-Init_Binding() 
-{
-    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_method(rb_cBinding, "dup", proc_dup, 0);
-    rb_define_global_function("binding", rb_f_binding, 0);
-}
-
-#ifdef __ia64__
-#if defined(__FreeBSD__)
-/*
- * FreeBSD/ia64 currently does not have a way for a process to get the
- * base address for the RSE backing store, so hardcode it.
- */
-#define __libc_ia64_register_backing_store_base (4ULL<<61)
-#else
-#pragma weak __libc_ia64_register_backing_store_base
-extern unsigned long __libc_ia64_register_backing_store_base;
-#endif
-#endif
-
 /* Windows SEH refers data on the stack. */
 #undef SAVE_WIN32_EXCEPTION_LIST
 #if defined _WIN32 || defined __CYGWIN__
@@ -9720,10 +7415,6 @@ win32_get_exception_list()
 # 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
@@ -9764,6 +7455,8 @@ win32_set_exception_list(p)
 #endif
 #endif
 
+static VALUE rb_eThreadError;
+
 int rb_thread_pending = 0;
 
 VALUE rb_cThread;
@@ -9798,21 +7491,17 @@ enum thread_status {
 
 struct thread {
     struct thread *next, *prev;
-    rb_jmpbuf_t context;
+    jmp_buf context;
 #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;
@@ -9848,7 +7537,7 @@ struct thread {
 
     int abort;
     int priority;
-    VALUE thgroup;
+    int gid;
 
     st_table *locals;
 
@@ -9909,56 +7598,30 @@ struct thread_status_t {
     (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 run_trap_eval _((VALUE));
 static VALUE
-run_trap_eval(arg)
-    VALUE arg;
-{
-    VALUE *p = (VALUE *)arg;
-    return rb_eval_cmd(p[0], p[1], (int)p[2]);
-}
-
-static VALUE
-rb_trap_eval(cmd, sig, safe)
+rb_trap_eval(cmd, sig)
     VALUE cmd;
-    int sig, safe;
+    int sig;
 {
     int state;
-    VALUE val = Qnil;		/* OK */
+    VALUE val;			/* OK */
     volatile struct thread_status_t save;
-    VALUE arg[3];
 
-    arg[0] = cmd;
-    arg[1] = rb_ary_new3(1, INT2FIX(sig));
-    arg[2] = (VALUE)safe;
     THREAD_COPY_STATUS(curr_thread, &save);
     rb_thread_ready(curr_thread);
+    PUSH_TAG(PROT_NONE);
     PUSH_ITER(ITER_NOT);
-    val = rb_protect(run_trap_eval, (VALUE)&arg, &state);
+    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;
-	rb_thread_ready(curr_thread);
 	JUMP_TAG(state);
     }
 
@@ -9994,7 +7657,6 @@ rb_set_safe_level(level)
     int level;
 {
     if (level > ruby_safe_level) {
-	if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
 	ruby_safe_level = level;
 	curr_thread->safe = level;
     }
@@ -10016,7 +7678,6 @@ safe_setter(val)
 	rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d",
 		 ruby_safe_level, level);
     }
-    if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
     ruby_safe_level = level;
     curr_thread->safe = level;
 }
@@ -10032,6 +7693,7 @@ timeofday()
 
 #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))
+
 static void
 thread_mark(th)
     rb_thread_t th;
@@ -10050,11 +7712,9 @@ thread_mark(th)
     rb_gc_mark((VALUE)th->scope);
     rb_gc_mark((VALUE)th->dyna_vars);
     rb_gc_mark(th->errinfo);
-    rb_gc_mark(th->last_status);
     rb_gc_mark(th->last_line);
     rb_gc_mark(th->last_match);
     rb_mark_tbl(th->locals);
-    rb_gc_mark(th->thgroup);
 
     /* mark data in copied stack */
     if (th == curr_thread) return;
@@ -10065,11 +7725,6 @@ 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) {
@@ -10094,16 +7749,6 @@ thread_mark(th)
     }
 }
 
-static int
-mark_loading_thread(key, value, lev)
-    ID key;
-    VALUE value;
-    int lev;
-{
-    rb_gc_mark(((rb_thread_t)value)->thread);
-    return ST_CONTINUE;
-}
-
 void
 rb_gc_mark_threads()
 {
@@ -10113,38 +7758,9 @@ rb_gc_mark_threads()
     rb_gc_mark((VALUE)ruby_cref);
 
     if (!curr_thread) return;
-    rb_gc_mark(main_thread->thread);
-    rb_gc_mark(curr_thread->thread);
-    FOREACH_THREAD_FROM(main_thread, th) {
-	switch (th->status) {
-	  case THREAD_TO_KILL:
-	  case THREAD_RUNNABLE:
-	    break;
-	  case THREAD_STOPPED:
-	    if (th->wait_for) break;
-	  default:
-	    continue;
-	}
+    FOREACH_THREAD(th) {
 	rb_gc_mark(th->thread);
-    } END_FOREACH_FROM(main_thread, th);
-    if (loading_tbl) st_foreach(loading_tbl, mark_loading_thread, 0);
-}
-
-void
-rb_gc_abort_threads()
-{
-    rb_thread_t th;
-
-    if (!main_thread)
-        return;
-
-    FOREACH_THREAD_FROM(main_thread, th) {
-	if (FL_TEST(th->thread, FL_MARK)) continue;
-	if (th->status == THREAD_STOPPED) {
-	    th->status = THREAD_TO_KILL;
-	    rb_gc_mark(th->thread);
-	}
-    } END_FOREACH_FROM(main_thread, th);
+    } END_FOREACH(th);
 }
 
 static void
@@ -10153,10 +7769,6 @@ thread_free(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;
@@ -10178,10 +7790,11 @@ rb_thread_check(data)
 
 static VALUE rb_thread_raise _((int, VALUE*, rb_thread_t));
 
-static VALUE th_raise_exception;
+static int   th_raise_argc;
+static VALUE th_raise_argv[2];
 static NODE *th_raise_node;
 static VALUE th_cmd;
-static int   th_sig, th_safe;
+static int   th_sig;
 static char *th_signm;
 
 #define RESTORE_NORMAL		1
@@ -10190,7 +7803,6 @@ static char *th_signm;
 #define RESTORE_TRAP		4
 #define RESTORE_RAISE		5
 #define RESTORE_SIGNAL		6
-#define RESTORE_EXIT		7
 
 extern VALUE *rb_gc_stack_start;
 
@@ -10204,40 +7816,21 @@ rb_thread_save_context(th)
 
     len = ruby_stack_length(&pos);
     th->stk_len = 0;
-    th->stk_pos = pos;
+    th->stk_pos = (rb_gc_stack_start<pos)?rb_gc_stack_start
+				         :rb_gc_stack_start - len;
     if (len > th->stk_max) {
-	VALUE *ptr = realloc(th->stk_ptr, sizeof(VALUE) * len);
-	if (!ptr) rb_memerror();
-	th->stk_ptr = ptr;
+	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;
-    ruby_scope->flags |= SCOPE_DONT_RECYCLE;
     th->klass = ruby_class;
     th->wrapper = ruby_wrapper;
     th->cref = ruby_cref;
@@ -10262,7 +7855,7 @@ rb_thread_save_context(th)
 }
 
 static int
-rb_thread_switch(n)
+thread_switch(n)
     int n;
 {
     rb_trap_immediate = (curr_thread->flags&0x100)?1:0;
@@ -10276,24 +7869,16 @@ rb_thread_switch(n)
 	rb_interrupt();
 	break;
       case RESTORE_TRAP:
-	rb_trap_eval(th_cmd, th_sig, th_safe);
+	rb_trap_eval(th_cmd, th_sig);
 	break;
       case RESTORE_RAISE:
 	ruby_frame->last_func = 0;
 	ruby_current_node = th_raise_node;
-	rb_raise_jump(th_raise_exception);
+	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_exception;
-	ruby_current_node = th_raise_node;
-	if (!rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	    terminate_process(EXIT_FAILURE, ruby_errinfo);
-	}
-	rb_exc_raise(th_raise_exception);
-	break;
       case RESTORE_NORMAL:
       default:
 	break;
@@ -10303,13 +7888,10 @@ rb_thread_switch(n)
 
 #define THREAD_SAVE_CONTEXT(th) \
     (rb_thread_save_context(th),\
-     rb_thread_switch((FLUSH_REGISTER_WINDOWS, ruby_setjmp((th)->context))))
+     thread_switch((FLUSH_REGISTER_WINDOWS, setjmp((th)->context))))
 
-NORETURN(static void rb_thread_restore_context _((rb_thread_t,int)));
+static void rb_thread_restore_context _((rb_thread_t,int));
 
-# if defined(_MSC_VER) && _MSC_VER >= 1300
-__declspec(noinline) static void stack_extend(rb_thread_t, int);
-# endif
 static void
 stack_extend(th, exit)
     rb_thread_t th;
@@ -10333,11 +7915,6 @@ rb_thread_restore_context(th, exit)
 
     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);
@@ -10346,7 +7923,6 @@ 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;
@@ -10373,9 +7949,6 @@ rb_thread_restore_context(th, exit)
     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);
@@ -10384,7 +7957,7 @@ rb_thread_restore_context(th, exit)
     rb_backref_set(tmp->last_match);
     tmp->last_match = tval;
 
-    ruby_longjmp(tmp->context, ex);
+    longjmp(tmp->context, ex);
 }
 
 static void
@@ -10401,7 +7974,7 @@ static void
 rb_thread_die(th)
     rb_thread_t th;
 {
-    th->thgroup = 0;
+    th->gid = 0;
     th->status = THREAD_KILLED;
     if (th->stk_ptr) free(th->stk_ptr);
     th->stk_ptr = 0;
@@ -10433,11 +8006,7 @@ rb_thread_fd_close(fd)
     rb_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)))) {
+	if ((th->wait_for & WAIT_FD) && fd == th->fd) {
 	    VALUE exc = rb_exc_new2(rb_eIOError, "stream closed");
 	    rb_thread_raise(1, &exc, th);
 	}
@@ -10445,19 +8014,6 @@ rb_thread_fd_close(fd)
     END_FOREACH(th);
 }
 
-NORETURN(static void rb_thread_main_jump _((VALUE, int)));
-static void
-rb_thread_main_jump(err, tag)
-    VALUE err;
-    int tag;
-{
-    curr_thread = main_thread;
-    th_raise_exception = 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()
 {
@@ -10469,7 +8025,11 @@ rb_thread_deadlock()
     if (curr_thread == main_thread) {
 	rb_exc_raise(e);
     }
-    rb_thread_main_jump(e, RESTORE_RAISE);
+    curr_thread = main_thread;
+    th_raise_argc = 1;
+    th_raise_argv[0] = e;
+    th_raise_node = ruby_current_node;
+    rb_thread_restore_context(main_thread, RESTORE_RAISE);
 }
 
 static void
@@ -10515,7 +8075,7 @@ intersect_fds(src, dst, max)
 	    if (FD_ISSET(i, src)) {
 		/* Wake up only one thread per fd. */
 		FD_CLR(i, src);
-		n++;
+		++n;
 	    }
 	    else {
 		FD_CLR(i, dst);
@@ -10558,11 +8118,6 @@ rb_thread_schedule()
     int need_select = 0;
     int select_timeout = 0;
 
-#ifdef HAVE_NATIVETHREAD
-    if (!is_ruby_native_thread()) {
-	rb_bug("cross-thread violation on rb_thread_schedule()");
-    }
-#endif
     rb_thread_pending = 0;
     if (curr_thread == curr_thread->next
 	&& curr_thread->status == THREAD_RUNNABLE)
@@ -10629,7 +8184,7 @@ rb_thread_schedule()
 	}
     }
     END_FOREACH_FROM(curr, th);
-
+    
     /* Do the select if needed */
     if (need_select) {
 	/* Convert delay to a timeval */
@@ -10681,16 +8236,16 @@ rb_thread_schedule()
  		    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);
+                    intersect_fds(&readfds, &th->readfds, max);
+                    intersect_fds(&writefds, &th->writefds, max);
+                    intersect_fds(&exceptfds, &th->exceptfds, max);
 		}
 	    }
 	    END_FOREACH_FROM(curr, th);
 	}
 	if (n > 0) {
 	    now = -1.0;
-	    /* Some descriptors are ready.
+	    /* 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)) {
@@ -10729,11 +8284,11 @@ rb_thread_schedule()
 	    break;
 	}
 	if (th->status == THREAD_RUNNABLE && th->stk_ptr) {
-	    if (!next || next->priority < th->priority)
+	    if (!next || next->priority < th->priority) 
 	       next = th;
 	}
     }
-    END_FOREACH_FROM(curr, th);
+    END_FOREACH_FROM(curr, th); 
 
     if (!next) {
 	/* raise fatal error to main thread */
@@ -10744,20 +8299,21 @@ rb_thread_schedule()
 	    TRAP_END;
 	}
 	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);
+	    fprintf(stderr, "deadlock 0x%lx: %s:",
+		    th->thread, thread_status_name(th->status));
+	    if (th->wait_for & WAIT_FD) fprintf(stderr, "F(%d)", th->fd);
+	    if (th->wait_for & WAIT_SELECT) fprintf(stderr, "S");
+	    if (th->wait_for & WAIT_TIME) fprintf(stderr, "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, "J(0x%lx)", th->join ? th->join->thread : 0);
+	    if (th->wait_for & WAIT_PID) fprintf(stderr, "P");
+	    if (!th->wait_for) fprintf(stderr, "-");
+	    fprintf(stderr, " %s - %s:%d\n",
+		    th==main_thread ? "(main)" : "",
+		    th->node->nd_file, nd_line(th->node));
 	}
 	END_FOREACH_FROM(curr, th);
+	fflush(stderr);
 	next = main_thread;
 	rb_thread_ready(next);
 	next->status = THREAD_TO_KILL;
@@ -10794,7 +8350,6 @@ 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;
 
@@ -10811,7 +8366,6 @@ rb_thread_fd_writable(fd)
     if (rb_thread_critical) return Qtrue;
     if (curr_thread == curr_thread->next) return Qtrue;
     if (curr_thread->status == THREAD_TO_KILL) return Qtrue;
-    if (curr_thread->status == THREAD_KILLED) return Qtrue;
 
     curr_thread->status = THREAD_STOPPED;
     FD_ZERO(&curr_thread->readfds);
@@ -10834,16 +8388,13 @@ rb_thread_wait_for(time)
 	curr_thread == curr_thread->next ||
 	curr_thread->status == THREAD_TO_KILL) {
 	int n;
-	int thr_critical = rb_thread_critical;
 #ifndef linux
 	double d, limit;
 	limit = timeofday()+(double)time.tv_sec+(double)time.tv_usec*1e-6;
 #endif
 	for (;;) {
-	    rb_thread_critical = Qtrue;
 	    TRAP_BEG;
 	    n = select(0, 0, 0, 0, &time);
-	    rb_thread_critical = thr_critical;
 	    TRAP_END;
 	    if (n == 0) return;
 	    if (n < 0) {
@@ -10852,7 +8403,7 @@ rb_thread_wait_for(time)
 #ifdef ERESTART
 		  case ERESTART:
 #endif
-		    break;
+		    return;
 		  default:
 		    rb_sys_fail("sleep");
 		}
@@ -10892,9 +8443,7 @@ rb_thread_select(max, read, write, except, timeout)
     fd_set *read, *write, *except;
     struct timeval *timeout;
 {
-#ifndef linux
     double limit;
-#endif
     int n;
 
     if (!read && !write && !except) {
@@ -10906,12 +8455,10 @@ rb_thread_select(max, read, write, except, timeout)
 	return 0;
     }
 
-#ifndef linux
     if (timeout) {
 	limit = timeofday()+
 	    (double)timeout->tv_sec+(double)timeout->tv_usec*1e-6;
     }
-#endif
 
     if (rb_thread_critical ||
 	curr_thread == curr_thread->next ||
@@ -11009,59 +8556,17 @@ rb_thread_join(th, limit)
     if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED)) {
 	VALUE oldbt = get_backtrace(th->errinfo);
 	VALUE errat = make_backtrace();
-	VALUE errinfo = rb_obj_dup(th->errinfo);
 
 	if (TYPE(oldbt) == T_ARRAY && RARRAY(oldbt)->len > 0) {
 	    rb_ary_unshift(errat, rb_ary_entry(oldbt, 0));
 	}
-	set_backtrace(errinfo, errat);
-	rb_exc_raise(errinfo);
+	set_backtrace(th->errinfo, errat);
+	rb_exc_raise(th->errinfo);
     }
 
     return Qtrue;
 }
 
-
-/*
- *  call-seq:
- *     thr.join          => thr
- *     thr.join(limit)   => thr
- *  
- *  The calling thread will suspend execution and run <i>thr</i>. Does not
- *  return until <i>thr</i> exits or until <i>limit</i> seconds have passed. If
- *  the time limit expires, <code>nil</code> will be returned, otherwise
- *  <i>thr</i> is returned.
- *     
- *  Any threads not joined will be killed when the main program exits.  If
- *  <i>thr</i> had previously raised an exception and the
- *  <code>abort_on_exception</code> and <code>$DEBUG</code> flags are not set
- *  (so the exception has not yet been processed) it will be processed at this
- *  time.
- *     
- *     a = Thread.new { print "a"; sleep(10); print "b"; print "c" }
- *     x = Thread.new { print "x"; Thread.pass; print "y"; print "z" }
- *     x.join # Let x thread finish, a will be killed on exit.
- *     
- *  <em>produces:</em>
- *     
- *     axyz
- *     
- *  The following example illustrates the <i>limit</i> parameter.
- *     
- *     y = Thread.new { 4.times { sleep 0.1; puts 'tick... ' }}
- *     puts "Waiting" until y.join(0.15)
- *     
- *  <em>produces:</em>
- *     
- *     tick...
- *     Waiting
- *     tick...
- *     Waitingtick...
- *     
- *     
- *     tick...
- */
-
 static VALUE
 rb_thread_join_m(argc, argv, thread)
     int argc;
@@ -11079,59 +8584,18 @@ rb_thread_join_m(argc, argv, thread)
     return thread;
 }
 
-
-/*
- *  call-seq:
- *     Thread.current   => thread
- *  
- *  Returns the currently executing thread.
- *     
- *     Thread.current   #=> #<Thread:0x401bdf4c run>
- */
-
 VALUE
 rb_thread_current()
 {
     return curr_thread->thread;
 }
 
-
-/*
- *  call-seq:
- *     Thread.main   => thread
- *  
- *  Returns the main thread for the process.
- *     
- *     Thread.main   #=> #<Thread:0x401bdf4c run>
- */
-
 VALUE
 rb_thread_main()
 {
     return main_thread->thread;
 }
 
-
-/*
- *  call-seq:
- *     Thread.list   => array
- *  
- *  Returns an array of <code>Thread</code> objects for all threads that are
- *  either runnable or stopped.
- *     
- *     Thread.new { sleep(200) }
- *     Thread.new { 1000000.times {|i| i*i } }
- *     Thread.new { Thread.stop }
- *     Thread.list.each {|t| p t}
- *     
- *  <em>produces:</em>
- *     
- *     #<Thread:0x401b3e84 sleep>
- *     #<Thread:0x401b3f38 run>
- *     #<Thread:0x401b3fb0 sleep>
- *     #<Thread:0x401bdf4c run>
- */
-
 VALUE
 rb_thread_list()
 {
@@ -11153,22 +8617,6 @@ rb_thread_list()
     return ary;
 }
 
-
-/*
- *  call-seq:
- *     thr.wakeup   => thr
- *  
- *  Marks <i>thr</i> as eligible for scheduling (it may still remain blocked on
- *  I/O, however). Does not invoke the scheduler (see <code>Thread#run</code>).
- *     
- *     c = Thread.new { Thread.stop; puts "hey!" }
- *     c.wakeup
- *     
- *  <em>produces:</em>
- *     
- *     hey!
- */
-
 VALUE
 rb_thread_wakeup(thread)
     VALUE thread;
@@ -11182,27 +8630,6 @@ rb_thread_wakeup(thread)
     return thread;
 }
 
-
-/*
- *  call-seq:
- *     thr.run   => thr
- *  
- *  Wakes up <i>thr</i>, making it eligible for scheduling. If not in a critical
- *  section, then invokes the scheduler.
- *     
- *     a = Thread.new { puts "a"; Thread.stop; puts "c" }
- *     Thread.pass
- *     puts "Got here"
- *     a.run
- *     a.join
- *     
- *  <em>produces:</em>
- *     
- *     a
- *     Got here
- *     c
- */
-
 VALUE
 rb_thread_run(thread)
     VALUE thread;
@@ -11213,20 +8640,7 @@ rb_thread_run(thread)
     return thread;
 }
 
-
-/*
- *  call-seq:
- *     thr.exit        => thr or nil
- *     thr.kill        => thr or nil
- *     thr.terminate   => thr or nil
- *  
- *  Terminates <i>thr</i> and schedules another thread to be run. If this thread
- *  is already marked to be killed, <code>exit</code> returns the
- *  <code>Thread</code>. If this is the main thread, or the last thread, exits
- *  the process.
- */
-
-VALUE
+static VALUE
 rb_thread_kill(thread)
     VALUE thread;
 {
@@ -11236,30 +8650,16 @@ rb_thread_kill(thread)
 	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->gid = 0;
     th->status = THREAD_TO_KILL;
     if (!rb_thread_critical) rb_thread_schedule();
     return thread;
 }
 
-
-/*
- *  call-seq:
- *     Thread.kill(thread)   => thread
- *  
- *  Causes the given <em>thread</em> to exit (see <code>Thread::exit</code>).
- *     
- *     count = 0
- *     a = Thread.new { loop { count += 1 } }
- *     sleep(0.1)       #=> 0
- *     Thread.kill(a)   #=> #<Thread:0x401b3d30 dead>
- *     count            #=> 93947
- *     a.alive?         #=> false
- */
-
 static VALUE
 rb_thread_s_kill(obj, th)
     VALUE obj, th;
@@ -11267,44 +8667,12 @@ rb_thread_s_kill(obj, th)
     return rb_thread_kill(th);
 }
 
-
-/*
- *  call-seq:
- *     Thread.exit   => thread
- *  
- *  Terminates the currently running thread and schedules another thread to be
- *  run. If this thread is already marked to be killed, <code>exit</code>
- *  returns the <code>Thread</code>. If this is the main thread, or the last
- *  thread, exit the process.
- */
-
 static VALUE
 rb_thread_exit()
 {
     return rb_thread_kill(curr_thread->thread);
 }
 
-
-/*
- *  call-seq:
- *     Thread.pass   => nil
- *  
- *  Invokes the thread scheduler to pass execution to another thread.
- *     
- *     a = Thread.new { print "a"; Thread.pass;
- *                      print "b"; Thread.pass;
- *                      print "c" }
- *     b = Thread.new { print "x"; Thread.pass;
- *                      print "y"; Thread.pass;
- *                      print "z" }
- *     a.join
- *     b.join
- *     
- *  <em>produces:</em>
- *     
- *     axbycz
- */
-
 static VALUE
 rb_thread_pass()
 {
@@ -11312,26 +8680,6 @@ rb_thread_pass()
     return Qnil;
 }
 
-
-/*
- *  call-seq:
- *     Thread.stop   => nil
- *  
- *  Stops execution of the current thread, putting it into a ``sleep'' state,
- *  and schedules execution of another thread. Resets the ``critical'' condition
- *  to <code>false</code>.
- *     
- *     a = Thread.new { print "a"; Thread.stop; print "c" }
- *     Thread.pass
- *     print "b"
- *     a.run
- *     a.join
- *     
- *  <em>produces:</em>
- *     
- *     abc
- */
-
 VALUE
 rb_thread_stop()
 {
@@ -11379,13 +8727,10 @@ rb_thread_sleep(sec)
 void
 rb_thread_sleep_forever()
 {
-    int thr_critical = rb_thread_critical;
     if (curr_thread == curr_thread->next ||
 	curr_thread->status == THREAD_TO_KILL) {
-	rb_thread_critical = Qtrue;
 	TRAP_BEG;
 	pause();
-	rb_thread_critical = thr_critical;
 	TRAP_END;
 	return;
     }
@@ -11396,17 +8741,6 @@ rb_thread_sleep_forever()
     rb_thread_schedule();
 }
 
-
-/*
- *  call-seq:
- *     thr.priority   => integer
- *  
- *  Returns the priority of <i>thr</i>. Default is zero; higher-priority threads
- *  will run before lower-priority threads.
- *     
- *     Thread.current.priority   #=> 0
- */
-
 static VALUE
 rb_thread_priority(thread)
     VALUE thread;
@@ -11414,30 +8748,6 @@ rb_thread_priority(thread)
     return INT2NUM(rb_thread_check(thread)->priority);
 }
 
-
-/*
- *  call-seq:
- *     thr.priority= integer   => thr
- *  
- *  Sets the priority of <i>thr</i> to <i>integer</i>. Higher-priority threads
- *  will run before lower-priority threads.
- *     
- *     count1 = count2 = 0
- *     a = Thread.new do
- *           loop { count1 += 1 }
- *         end
- *     a.priority = -1
- *     
- *     b = Thread.new do
- *           loop { count2 += 1 }
- *         end
- *     b.priority = -2
- *     sleep 1   #=> 1
- *     Thread.critical = 1
- *     count1    #=> 622504
- *     count2    #=> 5832
- */
-
 static VALUE
 rb_thread_priority_set(thread, prio)
     VALUE thread, prio;
@@ -11452,19 +8762,6 @@ rb_thread_priority_set(thread, prio)
     return prio;
 }
 
-
-/*
- *  call-seq:
- *     thr.safe_level   => integer
- *  
- *  Returns the safe level in effect for <i>thr</i>. Setting thread-local safe
- *  levels can help when implementing sandboxes which run insecure code.
- *     
- *     thr = Thread.new { $SAFE = 3; sleep }
- *     Thread.current.safe_level   #=> 0
- *     thr.safe_level              #=> 3
- */
-
 static VALUE
 rb_thread_safe_level(thread)
     VALUE thread;
@@ -11478,72 +8775,23 @@ rb_thread_safe_level(thread)
     return INT2NUM(th->safe);
 }
 
-static int ruby_thread_abort;
-static VALUE thgroup_default;
-
-
-/*
- *  call-seq:
- *     Thread.abort_on_exception   => true or false
- *  
- *  Returns the status of the global ``abort on exception'' condition.  The
- *  default is <code>false</code>. When set to <code>true</code>, or if the
- *  global <code>$DEBUG</code> flag is <code>true</code> (perhaps because the
- *  command line option <code>-d</code> was specified) all threads will abort
- *  (the process will <code>exit(0)</code>) if an exception is raised in any
- *  thread. See also <code>Thread::abort_on_exception=</code>.
- */
+static int thread_abort;
 
 static VALUE
 rb_thread_s_abort_exc()
 {
-    return ruby_thread_abort?Qtrue:Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     Thread.abort_on_exception= boolean   => true or false
- *  
- *  When set to <code>true</code>, all threads will abort if an exception is
- *  raised. Returns the new state.
- *     
- *     Thread.abort_on_exception = true
- *     t1 = Thread.new do
- *       puts  "In new thread"
- *       raise "Exception from thread"
- *     end
- *     sleep(1)
- *     puts "not reached"
- *     
- *  <em>produces:</em>
- *     
- *     In new thread
- *     prog.rb:4: Exception from thread (RuntimeError)
- *     	from prog.rb:2:in `initialize'
- *     	from prog.rb:2:in `new'
- *     	from prog.rb:2
- */
+    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;
 }
 
-
-/*
- *  call-seq:
- *     thr.abort_on_exception   => true or false
- *  
- *  Returns the status of the thread-local ``abort on exception'' condition for
- *  <i>thr</i>. The default is <code>false</code>. See also
- *  <code>Thread::abort_on_exception=</code>.
- */
-
 static VALUE
 rb_thread_abort_exc(thread)
     VALUE thread;
@@ -11551,16 +8799,6 @@ rb_thread_abort_exc(thread)
     return rb_thread_check(thread)->abort?Qtrue:Qfalse;
 }
 
-
-/*
- *  call-seq:
- *     thr.abort_on_exception= boolean   => true or false
- *  
- *  When set to <code>true</code>, causes all threads (including the main
- *  program) to abort if an exception is raised in <i>thr</i>. The process will
- *  effectively <code>exit(0)</code>.
- */
-
 static VALUE
 rb_thread_abort_exc_set(thread, val)
     VALUE thread, val;
@@ -11570,34 +8808,6 @@ rb_thread_abort_exc_set(thread, val)
     return val;
 }
 
-
-/*
- *  call-seq:
- *     thr.group   => thgrp or nil
- *  
- *  Returns the <code>ThreadGroup</code> which contains <i>thr</i>, or nil if
- *  the thread is not a member of any group.
- *     
- *     Thread.main.group   #=> #<ThreadGroup:0x4029d914>
- */
-
-VALUE
-rb_thread_group(thread)
-    VALUE thread;
-{
-    VALUE group = rb_thread_check(thread)->thgroup;
-    if (!group) {
-	group = Qnil;
-    }
-    return group;
-}
-
-#ifdef __ia64__
-# define IA64_INIT(x) x
-#else
-# define IA64_INIT(x)
-#endif
-
 #define THREAD_ALLOC(th) do {\
     th = ALLOC(struct thread);\
 \
@@ -11612,8 +8822,6 @@ rb_thread_group(thread)
     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);\
@@ -11636,9 +8844,8 @@ rb_thread_group(thread)
     th->last_match = Qnil;\
     th->abort = 0;\
     th->priority = 0;\
-    th->thgroup = thgroup_default;\
+    th->gid = 1;\
     th->locals = 0;\
-    th->thread = 0;\
 } while (0)
 
 static rb_thread_t
@@ -11658,9 +8865,7 @@ rb_thread_alloc(klass)
     return th;
 }
 
-static int thread_init = 0;
-
-#if defined(_THREAD_SAFE)
+#if defined(HAVE_SETITIMER)
 static void
 catch_timer(sig)
     int sig;
@@ -11668,59 +8873,19 @@ catch_timer(sig)
 #if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL)
     signal(sig, catch_timer);
 #endif
-    /* cause EINTR */
-}
-
-static pthread_t time_thread;
-
-static void*
-thread_timer(dummy)
-    void *dummy;
-{
-    for (;;) {
-#ifdef HAVE_NANOSLEEP
-	struct timespec req, rem;
-
-	req.tv_sec = 0;
-	req.tv_nsec = 10000000;
-	nanosleep(&req, &rem);
-#else
-	struct timeval tv;
-	tv.tv_sec = 0;
-	tv.tv_usec = 10000;
-	select(0, NULL, NULL, NULL, &tv);
-#endif
-	if (!rb_thread_critical) {
-	    rb_thread_pending = 1;
-	    if (rb_trap_immediate) {
-		pthread_kill(ruby_thid, SIGVTALRM);
-	    }
+    if (!rb_thread_critical) {
+	if (rb_trap_immediate) {
+	    rb_thread_schedule();
 	}
+	else rb_thread_pending = 1;
     }
 }
-
-void
-rb_thread_start_timer()
-{
-}
-
-void
-rb_thread_stop_timer()
-{
-}
-#elif defined(HAVE_SETITIMER)
-static void
-catch_timer(sig)
-    int sig;
-{
-#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL)
-    signal(sig, catch_timer);
+#else
+int rb_thread_tick = THREAD_TICK;
 #endif
-    if (!rb_thread_critical) {
-	rb_thread_pending = 1;
-    }
-    /* cause EINTR */
-}
+
+#if defined(HAVE_SETITIMER)
+static int thread_init = 0;
 
 void
 rb_thread_start_timer()
@@ -11745,43 +8910,32 @@ rb_thread_stop_timer()
     tval.it_value = tval.it_interval;
     setitimer(ITIMER_VIRTUAL, &tval, NULL);
 }
-#else  /* !(_THREAD_SAFE || HAVE_SETITIMER) */
-int rb_thread_tick = THREAD_TICK;
 #endif
 
 static VALUE
-rb_thread_start_0(fn, arg, th)
+rb_thread_start_0(fn, arg, th_arg)
     VALUE (*fn)();
     void *arg;
-    rb_thread_t th;
+    rb_thread_t th_arg;
 {
-    volatile rb_thread_t th_save = th;
+    volatile rb_thread_t th = th_arg;
     volatile VALUE thread = th->thread;
-    struct BLOCK *volatile saved_block = 0;
+    struct BLOCK* saved_block = 0;
     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 (!thread_init) {
-	thread_init = 1;
-#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
-#if defined(POSIX_SIGNAL)
+#ifdef POSIX_SIGNAL
 	posix_signal(SIGVTALRM, catch_timer);
 #else
 	signal(SIGVTALRM, catch_timer);
 #endif
 
-#ifdef _THREAD_SAFE
-	pthread_create(&time_thread, 0, thread_timer, 0);
-#else
+	thread_init = 1;
 	rb_thread_start_timer();
-#endif
-#endif
     }
+#endif
 
     if (THREAD_SAVE_CONTEXT(curr_thread)) {
 	return thread;
@@ -11803,7 +8957,7 @@ rb_thread_start_0(fn, arg, th)
 	th->next = curr_thread->next;
 	curr_thread->next = th;
 	th->priority = curr_thread->priority;
-	th->thgroup = curr_thread->thgroup;
+	th->gid = curr_thread->gid;
     }
 
     PUSH_TAG(PROT_THREAD);
@@ -11812,11 +8966,6 @@ rb_thread_start_0(fn, arg, th)
 	    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;
@@ -11824,13 +8973,18 @@ rb_thread_start_0(fn, arg, th)
     if (th == main_thread) ruby_stop(state);
     rb_thread_remove(th);
 
-    if (saved_block) {
-	blk_free(saved_block);
+    while (saved_block) {
+	struct BLOCK *tmp = saved_block;
+
+	if (tmp->frame.argc > 0)
+	    free(tmp->frame.argv);
+	saved_block = tmp->prev;
+	free(tmp);
     }
 
     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();
@@ -11844,13 +8998,14 @@ rb_thread_start_0(fn, arg, th)
 	    }
 	    else {
 		/* delegate exception to main_thread */
-		rb_thread_main_jump(ruby_errinfo, RESTORE_RAISE);
+		rb_thread_raise(1, &ruby_errinfo, main_thread);
 	    }
 	}
-	else if (th->safe < 4 && (ruby_thread_abort || th->abort || RTEST(ruby_debug))) {
-	    /* exit on main_thread */
+	else if (th->safe < 4 && (thread_abort || th->abort || RTEST(ruby_debug))) {
+	    VALUE err = system_exit(1, 0, 0);
 	    error_print();
-	    rb_thread_main_jump(ruby_errinfo, RESTORE_EXIT);
+	    /* exit on main_thread */
+	    rb_thread_raise(1, &err, main_thread);
 	}
 	else {
 	    th->errinfo = ruby_errinfo;
@@ -11871,7 +9026,7 @@ rb_thread_create(fn, arg)
 }
 
 static VALUE
-rb_thread_yield(arg, th)
+rb_thread_yield(arg, th) 
     VALUE arg;
     rb_thread_t th;
 {
@@ -11892,27 +9047,9 @@ rb_thread_yield(arg, th)
     rb_dvar_push('~', Qnil);
     ruby_block->dyna_vars = ruby_dyna_vars;
 
-    return rb_yield_0(arg, 0, 0, YIELD_LAMBDA_CALL, Qtrue);
+    return rb_yield_0(arg, 0, 0, Qtrue, Qtrue);
 }
 
-/*
- *  call-seq:
- *     Thread.new([arg]*) {|args| block }   => thread
- *  
- *  Creates and runs a new thread to execute the instructions given in
- *  <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed
- *  into the block.
- *     
- *     x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" }
- *     a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" }
- *     x.join # Let the threads finish before
- *     a.join # main thread exits...
- *     
- *  <em>produces:</em>
- *     
- *     abxyzc
- */
-
 static VALUE
 rb_thread_s_new(argc, argv, klass)
     int argc;
@@ -11932,57 +9069,16 @@ rb_thread_s_new(argc, argv, klass)
     return th->thread;
 }
 
-
-/*
- *  call-seq:
- *     Thread.new([arg]*) {|args| block }   => thread
- *  
- *  Creates and runs a new thread to execute the instructions given in
- *  <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed
- *  into the block.
- *     
- *     x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" }
- *     a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" }
- *     x.join # Let the threads finish before
- *     a.join # main thread exits...
- *     
- *  <em>produces:</em>
- *     
- *     abxyzc
- */
-
 static VALUE
 rb_thread_initialize(thread, args)
     VALUE thread, args;
 {
-    rb_thread_t th;
-
     if (!rb_block_given_p()) {
 	rb_raise(rb_eThreadError, "must be called with a block");
     }
-    th = rb_thread_check(thread);
-    if (th->stk_max) {
-	NODE *node = th->node;
-	if (!node) {
-	    rb_raise(rb_eThreadError, "already initialized thread");
-	}
-	rb_raise(rb_eThreadError, "already initialized thread - %s:%d",
-		 node->nd_file, nd_line(node));
-    }
-    return rb_thread_start_0(rb_thread_yield, args, th);
+    return rb_thread_start_0(rb_thread_yield, args, rb_thread_check(thread));
 }
 
-
-/*
- *  call-seq:
- *     Thread.start([args]*) {|args| block }   => thread
- *     Thread.fork([args]*) {|args| block }    => thread
- *  
- *  Basically the same as <code>Thread::new</code>. However, if class
- *  <code>Thread</code> is subclassed, then calling <code>start</code> in that
- *  subclass will not invoke the subclass's <code>initialize</code> method.
- */
-
 static VALUE
 rb_thread_start(klass, args)
     VALUE klass, args;
@@ -11993,18 +9089,6 @@ rb_thread_start(klass, args)
     return rb_thread_start_0(rb_thread_yield, args, rb_thread_alloc(klass));
 }
 
-
-/*
- *  call-seq:
- *     thr.value   => obj
- *  
- *  Waits for <i>thr</i> to complete (via <code>Thread#join</code>) and returns
- *  its value.
- *     
- *     a = Thread.new { 2 + 2 }
- *     a.value   #=> 4
- */
-
 static VALUE
 rb_thread_value(thread)
     VALUE thread;
@@ -12016,30 +9100,6 @@ rb_thread_value(thread)
     return th->result;
 }
 
-
-/*
- *  call-seq:
- *     thr.status   => string, false or nil
- *  
- *  Returns the status of <i>thr</i>: ``<code>sleep</code>'' if <i>thr</i> is
- *  sleeping or waiting on I/O, ``<code>run</code>'' if <i>thr</i> is executing,
- *  ``<code>aborting</code>'' if <i>thr</i> is aborting, <code>false</code> if
- *  <i>thr</i> terminated normally, and <code>nil</code> if <i>thr</i>
- *  terminated with an exception.
- *     
- *     a = Thread.new { raise("die now") }
- *     b = Thread.new { Thread.stop }
- *     c = Thread.new { Thread.exit }
- *     d = Thread.new { sleep }
- *     Thread.critical = true
- *     d.kill                  #=> #<Thread:0x401b3678 aborting>
- *     a.status                #=> nil
- *     b.status                #=> "sleep"
- *     c.status                #=> false
- *     d.status                #=> "aborting"
- *     Thread.current.status   #=> "run"
- */
-
 static VALUE
 rb_thread_status(thread)
     VALUE thread;
@@ -12055,19 +9115,6 @@ rb_thread_status(thread)
     return rb_str_new2(thread_status_name(th->status));
 }
 
-
-/*
- *  call-seq:
- *     thr.alive?   => true or false
- *  
- *  Returns <code>true</code> if <i>thr</i> is running or sleeping.
- *     
- *     thr = Thread.new { }
- *     thr.join                #=> #<Thread:0x401b3fb0 dead>
- *     Thread.current.alive?   #=> true
- *     thr.alive?              #=> false
- */
-
 static VALUE
 rb_thread_alive_p(thread)
     VALUE thread;
@@ -12078,19 +9125,6 @@ rb_thread_alive_p(thread)
     return Qtrue;
 }
 
-
-/*
- *  call-seq:
- *     thr.stop?   => true or false
- *  
- *  Returns <code>true</code> if <i>thr</i> is dead or sleeping.
- *     
- *     a = Thread.new { Thread.stop }
- *     b = Thread.current
- *     a.stop?   #=> true
- *     b.stop?   #=> false
- */
-
 static VALUE
 rb_thread_stop_p(thread)
     VALUE thread;
@@ -12136,9 +9170,9 @@ rb_thread_cleanup()
     FOREACH_THREAD_FROM(curr, th) {
 	if (th->status != THREAD_KILLED) {
 	    rb_thread_ready(th);
+	    th->gid = 0;
+	    th->priority = 0;
 	    if (th != main_thread) {
-		th->thgroup = 0;
-		th->priority = 0;
 		th->status = THREAD_TO_KILL;
 		RDATA(th->thread)->dfree = NULL;
 	    }
@@ -12149,35 +9183,12 @@ rb_thread_cleanup()
 
 int rb_thread_critical;
 
-
-/*
- *  call-seq:
- *     Thread.critical   => true or false
- *  
- *  Returns the status of the global ``thread critical'' condition.
- */
-
 static VALUE
 rb_thread_critical_get()
 {
     return rb_thread_critical?Qtrue:Qfalse;
 }
 
-
-/*
- *  call-seq:
- *     Thread.critical= boolean   => true or false
- *  
- *  Sets the status of the global ``thread critical'' condition and returns
- *  it. When set to <code>true</code>, prohibits scheduling of any existing
- *  thread. Does not block new threads from being created and run. Certain
- *  thread operations (such as stopping or killing a thread, sleeping in the
- *  current thread, and raising an exception) may cause a thread to be scheduled
- *  even when in a critical section.  <code>Thread::critical</code> is not
- *  intended for daily use: it is primarily there to support folks writing
- *  threading libraries.
- */
-
 static VALUE
 rb_thread_critical_set(obj, val)
     VALUE obj, val;
@@ -12225,47 +9236,37 @@ rb_thread_signal_raise(sig)
 }
 
 void
-rb_thread_trap_eval(cmd, sig, safe)
+rb_thread_trap_eval(cmd, sig)
     VALUE cmd;
-    int sig, safe;
+    int sig;
 {
+#if 0
     rb_thread_critical = 0;
-    if (curr_thread == main_thread) {
-	rb_trap_eval(cmd, sig, safe);
+    if (!rb_thread_dead(curr_thread)) {
+	rb_thread_ready(curr_thread);
+	rb_trap_eval(cmd, sig);
 	return;
     }
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return;
-	}
+    rb_thread_ready(main_thread);
+    if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	return;
     }
     th_cmd = cmd;
     th_sig = sig;
-    th_safe = safe;
     curr_thread = main_thread;
     rb_thread_restore_context(curr_thread, RESTORE_TRAP);
-}
-
-void
-rb_thread_signal_exit()
-{
-    VALUE args[2];
-
+#else
     rb_thread_critical = 0;
-    if (curr_thread == main_thread) {
-	rb_thread_ready(curr_thread);
-	rb_exit(EXIT_SUCCESS);
-    }
-    args[0] = INT2NUM(EXIT_SUCCESS);
-    args[1] = rb_str_new2("exit");
-    rb_thread_ready(main_thread);
     if (!rb_thread_dead(curr_thread)) {
 	if (THREAD_SAVE_CONTEXT(curr_thread)) {
 	    return;
 	}
     }
-    rb_thread_main_jump(rb_class_new_instance(2, args, rb_eSystemExit), 
-			RESTORE_EXIT);
+    th_cmd = cmd;
+    th_sig = sig;
+    curr_thread = main_thread;
+    rb_thread_restore_context(curr_thread, RESTORE_TRAP);
+#endif
 }
 
 static VALUE
@@ -12274,53 +9275,27 @@ rb_thread_raise(argc, argv, th)
     VALUE *argv;
     rb_thread_t th;
 {
-    volatile rb_thread_t th_save = th;
-    VALUE exc;
-
-    if (!th->next) {
-	rb_raise(rb_eArgError, "unstarted thread");
-    }
     if (rb_thread_dead(th)) return Qnil;
-    exc = rb_make_exception(argc, argv);
     if (curr_thread == th) {
-	rb_raise_jump(exc);
+	rb_f_raise(argc, argv);
     }
 
     if (!rb_thread_dead(curr_thread)) {
 	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return th_save->thread;
+	    return th->thread;
 	}
     }
 
+    rb_scan_args(argc, argv, "11", &th_raise_argv[0], &th_raise_argv[1]);
     rb_thread_ready(th);
     curr_thread = th;
 
-    th_raise_exception = exc;
+    th_raise_argc = argc;
     th_raise_node = ruby_current_node;
     rb_thread_restore_context(curr_thread, RESTORE_RAISE);
     return Qnil;		/* not reached */
 }
 
-
-/*
- *  call-seq:
- *     thr.raise(exception)
- *  
- *  Raises an exception (see <code>Kernel::raise</code>) from <i>thr</i>. The
- *  caller does not have to be <i>thr</i>.
- *     
- *     Thread.abort_on_exception = true
- *     a = Thread.new { sleep(200) }
- *     a.raise("Gotcha")
- *     
- *  <em>produces:</em>
- *     
- *     prog.rb:3: Gotcha (RuntimeError)
- *     	from prog.rb:2:in `initialize'
- *     	from prog.rb:2:in `new'
- *     	from prog.rb:2
- */
-
 static VALUE
 rb_thread_raise_m(argc, argv, thread)
     int argc;
@@ -12355,28 +9330,6 @@ rb_thread_local_aref(thread, id)
     return Qnil;
 }
 
-
-/*
- *  call-seq:
- *      thr[sym]   => obj or nil
- *  
- *  Attribute Reference---Returns the value of a thread-local variable, using
- *  either a symbol or a string name. If the specified variable does not exist,
- *  returns <code>nil</code>.
- *     
- *     a = Thread.new { Thread.current["name"] = "A"; Thread.stop }
- *     b = Thread.new { Thread.current[:name]  = "B"; Thread.stop }
- *     c = Thread.new { Thread.current["name"] = "C"; Thread.stop }
- *     Thread.list.each {|x| puts "#{x.inspect}: #{x[:name]}" }
- *     
- *  <em>produces:</em>
- *     
- *     #<Thread:0x401b3b3c sleep>: C
- *     #<Thread:0x401b3bc8 sleep>: B
- *     #<Thread:0x401b3c68 sleep>: A
- *     #<Thread:0x401bdf4c run>:
- */
-
 static VALUE
 rb_thread_aref(thread, id)
     VALUE thread, id;
@@ -12401,7 +9354,7 @@ rb_thread_local_aset(thread, id, val)
 	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);
@@ -12409,15 +9362,6 @@ rb_thread_local_aset(thread, id, val)
     return val;
 }
 
-
-/*
- *  call-seq:
- *      thr[sym] = obj   => obj
- *  
- *  Attribute Assignment---Sets or creates the value of a thread-local variable,
- *  using either a symbol or a string. See also <code>Thread#[]</code>.
- */
-
 static VALUE
 rb_thread_aset(thread, id, val)
     VALUE thread, id, val;
@@ -12425,20 +9369,6 @@ rb_thread_aset(thread, id, val)
     return rb_thread_local_aset(thread, rb_to_id(id), val);
 }
 
-
-/*
- *  call-seq:
- *     thr.key?(sym)   => true or false
- *  
- *  Returns <code>true</code> if the given string (or symbol) exists as a
- *  thread-local variable.
- *     
- *     me = Thread.current
- *     me[:oliver] = "a"
- *     me.key?(:oliver)    #=> true
- *     me.key?(:stanley)   #=> false
- */
-
 static VALUE
 rb_thread_key_p(thread, id)
     VALUE thread, id;
@@ -12460,21 +9390,6 @@ thread_keys_i(key, value, ary)
     return ST_CONTINUE;
 }
 
-
-/*
- *  call-seq:
- *     thr.keys   => array
- *  
- *  Returns an an array of the names of the thread-local variables (as Symbols).
- *     
- *     thr = Thread.new do
- *       Thread.current[:cat] = 'meow'
- *       Thread.current["dog"] = 'woof'
- *     end
- *     thr.join   #=> #<Thread:0x401b3f10 dead>
- *     thr.keys   #=> [:dog, :cat]
- */
-
 static VALUE
 rb_thread_keys(thread)
     VALUE thread;
@@ -12488,13 +9403,6 @@ rb_thread_keys(thread)
     return ary;
 }
 
-/*
- * call-seq:
- *   thr.inspect   => string
- *
- * Dump the name, id, and status of _thr_ to a string.
- */
-
 static VALUE
 rb_thread_inspect(thread)
     VALUE thread;
@@ -12503,10 +9411,9 @@ rb_thread_inspect(thread)
     rb_thread_t th = rb_thread_check(thread);
     const char *status = thread_status_name(th->status);
     VALUE str;
-    size_t len = strlen(cname)+7+16+9+1;
 
-    str = rb_str_new(0, len); /* 7:tags 16:addr 9:status 1:nul */
-    snprintf(RSTRING(str)->ptr, len, "#<%s:0x%lx %s>", cname, thread, status);
+    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);
 
@@ -12530,69 +9437,7 @@ rb_thread_atfork()
     curr_thread->prev = curr_thread;
 }
 
-
-/*
- *  Document-class: Continuation
- *
- *  Continuation objects are generated by
- *  <code>Kernel#callcc</code>. They hold a return address and execution
- *  context, allowing a nonlocal return to the end of the
- *  <code>callcc</code> block from anywhere within a program.
- *  Continuations are somewhat analogous to a structured version of C's
- *  <code>setjmp/longjmp</code> (although they contain more state, so
- *  you might consider them closer to threads).
- *     
- *  For instance:
- *     
- *     arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ]
- *     callcc{|$cc|}
- *     puts(message = arr.shift)
- *     $cc.call unless message =~ /Max/
- *     
- *  <em>produces:</em>
- *     
- *     Freddie
- *     Herbie
- *     Ron
- *     Max
- *     
- *  This (somewhat contrived) example allows the inner loop to abandon
- *  processing early:
- *     
- *     callcc {|cont|
- *       for i in 0..4
- *         print "\n#{i}: "
- *         for j in i*5...(i+1)*5
- *           cont.call() if j == 17
- *           printf "%3d", j
- *         end
- *       end
- *     }
- *     print "\n"
- *     
- *  <em>produces:</em>
- *     
- *     0:   0  1  2  3  4
- *     1:   5  6  7  8  9
- *     2:  10 11 12 13 14
- *     3:  15 16
- */
-
-VALUE rb_cCont;
-
-/*
- *  call-seq:
- *     callcc {|cont| block }   =>  obj
- *  
- *  Generates a <code>Continuation</code> object, which it passes to the
- *  associated block. Performing a <em>cont</em><code>.call</code> will
- *  cause the <code>callcc</code> to return (as will falling through the
- *  end of the block). The value returned by the <code>callcc</code> is
- *  the value of the block, or the value passed to
- *  <em>cont</em><code>.call</code>. See class <code>Continuation</code> 
- *  for more details. Also see <code>Kernel::throw</code> for
- *  an alternative mechanism for unwinding a call stack.
- */
+static VALUE rb_cCont;
 
 static VALUE
 rb_callcc(self)
@@ -12600,7 +9445,6 @@ rb_callcc(self)
 {
     volatile VALUE cont;
     rb_thread_t th;
-    volatile rb_thread_t th_save;
     struct tag *tag;
     struct RVarmap *vars;
 
@@ -12611,38 +9455,29 @@ rb_callcc(self)
     for (tag=prot_tag; tag; tag=tag->prev) {
 	scope_dup(tag->scope);
     }
+    if (ruby_block) {
+	struct BLOCK *block = ruby_block;
+
+	while (block) {
+	    block->tag->flags |= BLOCK_DYNAMIC;
+	    block = block->prev;
+	}
+    }
     th->thread = curr_thread->thread;
-    th->thgroup = cont_protect;
 
-    for (vars = ruby_dyna_vars; vars; vars = vars->next) {
+    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;
+	return th->result;
     }
     else {
 	return rb_yield(cont);
     }
 }
 
-/*
- *  call-seq:
- *     cont.call(args, ...) 
- *     cont[args, ...]
- *  
- *  Invokes the continuation. The program continues from the end of the
- *  <code>callcc</code> block. If no arguments are given, the original
- *  <code>callcc</code> returns <code>nil</code>. If one argument is
- *  given, <code>callcc</code> returns it. Otherwise, an array
- *  containing <i>args</i> is returned.
- *     
- *     callcc {|cont|  cont.call }           #=> nil
- *     callcc {|cont|  cont.call 1 }         #=> 1
- *     callcc {|cont|  cont.call 1, 2, 3 }   #=> [1, 2, 3]
- */
-
 static VALUE
 rb_cont_call(argc, argv, cont)
     int argc;
@@ -12654,9 +9489,6 @@ rb_cont_call(argc, argv, cont)
     if (th->thread != curr_thread->thread) {
 	rb_raise(rb_eRuntimeError, "continuation called across threads");
     }
-    if (th->thgroup != cont_protect) {
-	rb_raise(rb_eRuntimeError, "continuation called across trap");
-    }
     switch (argc) {
       case 0:
 	th->result = Qnil;
@@ -12674,23 +9506,9 @@ rb_cont_call(argc, argv, cont)
 }
 
 struct thgroup {
-    int enclosed;
-    VALUE group;
+    int gid;
 };
 
-
-/*
- * Document-class: ThreadGroup
- *
- *  <code>ThreadGroup</code> provides a means of keeping track of a number of
- *  threads as a group. A <code>Thread</code> can belong to only one
- *  <code>ThreadGroup</code> at a time; adding a thread to a new group will
- *  remove it from any previous group.
- *     
- *  Newly created threads belong to the same group as the thread from which they
- *  were created.
- */
-
 static VALUE thgroup_s_alloc _((VALUE));
 static VALUE
 thgroup_s_alloc(klass)
@@ -12698,25 +9516,14 @@ thgroup_s_alloc(klass)
 {
     VALUE group;
     struct thgroup *data;
+    static int serial = 1;
 
     group = Data_Make_Struct(klass, struct thgroup, 0, free, data);
-    data->enclosed = 0;
-    data->group = group;
+    data->gid = serial++;
 
     return group;
 }
 
-
-/*
- *  call-seq:
- *     thgrp.list   => array
- *  
- *  Returns an array of all existing <code>Thread</code> objects that belong to
- *  this group.
- *     
- *     ThreadGroup::Default.list   #=> [#<Thread:0x401bdf4c run>]
- */
-
 static VALUE
 thgroup_list(group)
     VALUE group;
@@ -12729,7 +9536,7 @@ thgroup_list(group)
     ary = rb_ary_new();
 
     FOREACH_THREAD(th) {
-	if (th->thgroup == data->group) {
+	if (th->gid == data->gid) {
 	    rb_ary_push(ary, th->thread);
 	}
     }
@@ -12738,84 +9545,6 @@ thgroup_list(group)
     return ary;
 }
 
-
-/*
- *  call-seq:
- *     thgrp.enclose   => thgrp
- *  
- *  Prevents threads from being added to or removed from the receiving
- *  <code>ThreadGroup</code>. New threads can still be started in an enclosed
- *  <code>ThreadGroup</code>.
- *     
- *     ThreadGroup::Default.enclose        #=> #<ThreadGroup:0x4029d914>
- *     thr = Thread::new { Thread.stop }   #=> #<Thread:0x402a7210 sleep>
- *     tg = ThreadGroup::new               #=> #<ThreadGroup:0x402752d4>
- *     tg.add thr
- *
- *  <em>produces:</em>
- *
- *     ThreadError: can't move from the enclosed thread group
- */
-
-static VALUE
-thgroup_enclose(group)
-    VALUE group;
-{
-    struct thgroup *data;
-
-    Data_Get_Struct(group, struct thgroup, data);
-    data->enclosed = 1;
-
-    return group;
-}
-
-
-/*
- *  call-seq:
- *     thgrp.enclosed?   => true or false
- *  
- *  Returns <code>true</code> if <em>thgrp</em> is enclosed. See also
- *  ThreadGroup#enclose.
- */
-
-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;
-}
-
-
-/*
- *  call-seq:
- *     thgrp.add(thread)   => thgrp
- *  
- *  Adds the given <em>thread</em> to this group, removing it from any other
- *  group to which it may have previously belonged.
- *     
- *     puts "Initial group is #{ThreadGroup::Default.list}"
- *     tg = ThreadGroup.new
- *     t1 = Thread.new { sleep }
- *     t2 = Thread.new { sleep }
- *     puts "t1 is #{t1}"
- *     puts "t2 is #{t2}"
- *     tg.add(t1)
- *     puts "Initial group now #{ThreadGroup::Default.list}"
- *     puts "tg group now #{tg.list}"
- *     
- *  <em>produces:</em>
- *     
- *     Initial group is #<Thread:0x401bdf4c>
- *     t1 is #<Thread:0x401b3c90>
- *     t2 is #<Thread:0x401b3c18>
- *     Initial group now #<Thread:0x401b3c18>#<Thread:0x401bdf4c>
- *     tg group now #<Thread:0x401b3c90>
- */
-
 static VALUE
 thgroup_add(group, thread)
     VALUE group, thread;
@@ -12825,44 +9554,12 @@ thgroup_add(group, thread)
 
     rb_secure(4);
     th = rb_thread_check(thread);
-    if (!th->next || !th->prev) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
-		 rb_obj_classname(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;
+    th->gid = data->gid;
     return group;
 }
 
-
-/*
- *  +Thread+ encapsulates the behavior of a thread of
- *  execution, including the main thread of the Ruby script.
- *     
- *  In the descriptions of the methods in this class, the parameter _sym_
- *  refers to a symbol, which is either a quoted string or a 
- *  +Symbol+ (such as <code>:name</code>).
- */
-
 void
 Init_Thread()
 {
@@ -12909,7 +9606,6 @@ Init_Thread()
     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);
@@ -12918,73 +9614,37 @@ Init_Thread()
 
     rb_define_method(rb_cThread, "inspect", rb_thread_inspect, 0);
 
+    /* allocate main thread */
+    main_thread = rb_thread_alloc(rb_cThread);
+    curr_thread = main_thread->prev = main_thread->next = main_thread;
+
     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);
-    rb_global_variable(&cont_protect);
 
     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);
-    rb_global_variable(&thgroup_default);
-    thgroup_default = rb_obj_alloc(cThGroup);
-    rb_define_const(cThGroup, "Default", thgroup_default);
-
-    /* allocate main thread */
-    main_thread = rb_thread_alloc(rb_cThread);
-    curr_thread = main_thread->prev = main_thread->next = main_thread;
+    rb_define_const(cThGroup, "Default", rb_obj_alloc(cThGroup));
 }
 
-/*
- *  call-seq:
- *     catch(symbol) {| | block }  > obj
- *  
- *  +catch+ executes its block. If a +throw+ is
- *  executed, Ruby searches up its stack for a +catch+ block
- *  with a tag corresponding to the +throw+'s
- *  _symbol_. If found, that block is terminated, and
- *  +catch+ returns the value given to +throw+. If
- *  +throw+ is not called, the block terminates normally, and
- *  the value of +catch+ is the value of the last expression
- *  evaluated. +catch+ expressions may be nested, and the
- *  +throw+ call need not be in lexical scope.
- *     
- *     def routine(n)
- *       puts n
- *       throw :done if n <= 0
- *       routine(n-1)
- *     end
- *     
- *     
- *     catch(:done) { routine(3) }
- *     
- *  <em>produces:</em>
- *     
- *     3
- *     2
- *     1
- *     0
- */
-
 static VALUE
 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, 0, Qfalse);
     }
-    else if (state == TAG_THROW && tag == prot_tag->dst) {
+    else if (state == TAG_THROW && t == prot_tag->dst) {
 	val = prot_tag->retval;
 	state = 0;
     }
@@ -12996,59 +9656,48 @@ 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_funcall(Qnil, rb_intern("catch"), 1, ID2SYM(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((VALUE(*)_((VALUE)))catch_i, rb_intern(tag), proc, data);
 }
 
-/*
- *  call-seq:
- *     throw(symbol [, obj])
- *  
- *  Transfers control to the end of the active +catch+ block
- *  waiting for _symbol_. Raises +NameError+ if there
- *  is no +catch+ block for the symbol. The optional second
- *  parameter supplies a return value for the +catch+ block,
- *  which otherwise defaults to +nil+. For examples, see
- *  <code>Kernel::catch</code>.
- */
-
 static VALUE
 rb_f_throw(argc, argv)
     int argc;
     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_id2name(t),
 		     curr_thread);
 	}
 	tt = tt->prev;
     }
     if (!tt) {
-	rb_name_error(SYM2ID(tag), "uncaught throw `%s'", rb_id2name(SYM2ID(tag)));
+	rb_name_error(t, "uncaught throw `%s'", rb_id2name(t));
     }
+    return_value(value);
     rb_trap_restore_mask();
     JUMP_TAG(TAG_THROW);
 #ifndef __GNUC__
@@ -13062,18 +9711,26 @@ rb_throw(tag, val)
     VALUE val;
 {
     VALUE argv[2];
+    ID t = rb_intern(tag);
 
-    argv[0] = ID2SYM(rb_intern(tag));
+    argv[0] = ID2SYM(t);
     argv[1] = val;
     rb_f_throw(2, argv);
 }
 
-/* flush_register_windows must not be inlined because flushrs doesn't flush
- * current frame in register stack. */
-#ifdef __ia64__
-void flush_register_windows(void)
+static void
+return_check()
 {
-    __asm__ ("flushrs");
-}
-#endif
+    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%lx",
+		     curr_thread);
+	}
+	tt = tt->prev;
+    }
+}
diff --git a/ext/.document b/ext/.document
deleted file mode 100644
index ba8182593e..0000000000
--- a/ext/.document
+++ /dev/null
@@ -1,11 +0,0 @@
-# Add files to this as they become documented
-
-enumerator/enumerator.c
-iconv/iconv.c
-nkf/lib/kconv.rb
-nkf/nkf.c
-socket/socket.c
-stringio/stringio.c
-strscan/strscan.c
-win32ole
-zlib/zlib.c
diff --git a/ext/Setup b/ext/Setup
index 7b214abde3..be5f73a3c9 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -1,7 +1,6 @@
 #option nodynamic
 
 #Win32API
-#bigdecimal
 #curses
 #dbm
 #digest
@@ -10,24 +9,19 @@
 #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.atheos b/ext/Setup.atheos
index 9b1bdecb95..8f04f06a4b 100644
--- a/ext/Setup.atheos
+++ b/ext/Setup.atheos
@@ -1,7 +1,5 @@
 option nodynamic
 
-#Win32API
-bigdecimal
 curses
 dbm
 digest
@@ -10,24 +8,20 @@ digest/rmd160
 digest/sha1
 digest/sha2
 dl
-enumerator
 etc
 fcntl
 gdbm
 iconv
-io/wait
+marshal
 nkf
 pty
-#openssl
 racc/parse
 readline
 sdbm
 socket
 stringio
 strscan
-syck
 syslog
-#tcltklib
 #tk
-#win32ole
-zlib
+#tcltklib
+#gtk
diff --git a/ext/Setup.dj b/ext/Setup.dj
index f2ed3a4f16..b6b5165bce 100644
--- a/ext/Setup.dj
+++ b/ext/Setup.dj
@@ -1,8 +1,7 @@
 option nodynamic
 
 #Win32API
-bigdecimal
-curses
+#curses
 dbm
 digest
 digest/md5
@@ -10,24 +9,19 @@ digest/rmd160
 digest/sha1
 digest/sha2
 #dl
-etc
-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.emx b/ext/Setup.emx
index 7ea04543c5..90e1873702 100644
--- a/ext/Setup.emx
+++ b/ext/Setup.emx
@@ -1,7 +1,6 @@
 option nodynamic
 
 #Win32API
-bigdecimal
 curses
 #dbm
 digest
@@ -10,24 +9,19 @@ 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..02638c8eab 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -1,7 +1,6 @@
 #option nodynamic
 
 Win32API
-bigdecimal
 #curses
 #dbm
 digest
@@ -9,25 +8,20 @@ digest/md5
 digest/rmd160
 digest/sha1
 digest/sha2
-dl
-enumerator
-etc
+#dl
+#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.x68 b/ext/Setup.x68
index 9b9563d941..a5e4bc64bb 100644
--- a/ext/Setup.x68
+++ b/ext/Setup.x68
@@ -1,7 +1,6 @@
 option nodynamic
 
 #Win32API
-bigdecimal
 #curses
 dbm
 digest
@@ -11,23 +10,18 @@ digest/sha1
 digest/sha2
 #dl
 #etc
-enumerator
 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/Win32API/MANIFEST b/ext/Win32API/MANIFEST
new file mode 100644
index 0000000000..7cc9ac445e
--- /dev/null
+++ b/ext/Win32API/MANIFEST
@@ -0,0 +1,7 @@
+MANIFEST
+depend
+MANIFEST
+Win32API.c
+extconf.rb
+getch.rb
+point.rb
diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
index a4fd0396f0..ee9a1e0569 100644
--- a/ext/Win32API/Win32API.c
+++ b/ext/Win32API/Win32API.c
@@ -8,11 +8,27 @@
 #include <stdio.h>
 #endif
 
+#if defined(_MSC_VER)
+#if defined(_M_ALPHA)
+#ifdef __cplusplus
+extern "C" { long __asm(char *,...); };
+#else
+long __asm(char *,...);
+#endif
+#pragma intrinsic(__asm)
+#endif
+#endif
+
 #define _T_VOID     0
 #define _T_NUMBER   1
 #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 {
@@ -46,19 +62,19 @@ Win32API_initialize(self, dllname, proc, import, export)
     char *s;
     int i;
     int len;
-    int ex = _T_VOID;
+    int ex;
 
     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, (void*)hdll));
-    hproc = (HANDLE)GetProcAddress(hdll, RSTRING(proc)->ptr);
+    rb_iv_set(self, "__hdll__", Data_Wrap_Struct(self, 0, Win32API_FreeLibrary, hdll));
+    hproc = GetProcAddress(hdll, RSTRING(proc)->ptr);
     if (!hproc) {
 	str = rb_str_new3(proc);
 	str = rb_str_cat(str, "A", 1);
-	hproc = (HANDLE)GetProcAddress(hdll, RSTRING(str)->ptr);
+	hproc = GetProcAddress(hdll, RSTRING(str)->ptr);
 	if (!hproc)
 	    rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
 		RSTRING(proc)->ptr, RSTRING(str)->ptr);
@@ -69,48 +85,43 @@ Win32API_initialize(self, dllname, proc, import, export)
 
     a_import = rb_ary_new();
     switch (TYPE(import)) {
-    case T_NIL:
+      case T_NIL:
 	break;
-    case T_ARRAY:
+      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':
+	      case 'N': case 'n': case 'L': case 'l':
 		rb_ary_push(a_import, INT2FIX(_T_NUMBER));
 		break;
-	    case 'P': case 'p':
+	      case 'P': case 'p':
 		rb_ary_push(a_import, INT2FIX(_T_POINTER));
 		break;
-	    case 'I': case 'i':
+	      case 'I': case 'i':
 		rb_ary_push(a_import, INT2FIX(_T_INTEGER));
 		break;
 	    }
 	}
         break;
-    default:
+      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':
+	      case 'N': case 'n': case 'L': case 'l':
 		rb_ary_push(a_import, INT2FIX(_T_NUMBER));
 		break;
-	    case 'P': case 'p':
+	      case 'P': case 'p':
 		rb_ary_push(a_import, INT2FIX(_T_POINTER));
 		break;
-	    case 'I': case 'i':
+	      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: %ld\n", RARRAY(a_import)->len);
-    }
-
     rb_iv_set(self, "__import__", a_import);
 
     if (NIL_P(export)) {
@@ -118,16 +129,16 @@ Win32API_initialize(self, dllname, proc, import, export)
     } else {
 	SafeStringValue(export);
 	switch (*RSTRING(export)->ptr) {
-        case 'V': case 'v':
+	  case 'V': case 'v':
 	    ex = _T_VOID;
 	    break;
-	case 'N': case 'n': case 'L': case 'l':
+	  case 'N': case 'n': case 'L': case 'l':
 	    ex = _T_NUMBER;
 	    break;
-	case 'P': case 'p':
+	  case 'P': case 'p':
 	    ex = _T_POINTER;
 	    break;
-	case 'I': case 'i':
+	  case 'I': case 'i':
 	    ex = _T_INTEGER;
 	    break;
 	}
@@ -137,9 +148,15 @@ Win32API_initialize(self, dllname, proc, import, export)
     return Qnil;
 }
 
-#ifdef _MSC_VER
-#pragma optimize("g", off)
+#ifdef __BORLANDC__ 
+int c_m( FARPROC api, long* p )
+{
+  long pp[16];
+  memcpy( pp, p, 16*sizeof(long) );
+  return api();
+}
 #endif
+
 static VALUE
 Win32API_Call(argc, argv, obj)
     int argc;
@@ -147,62 +164,171 @@ 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;
+    int ret;
+#ifdef __BORLANDC__ 
+    long* ptr;
+    long p[16];
+#endif
+
+    items = rb_scan_args(argc, argv, "0*", &args);
+
+    obj_proc = rb_iv_get(obj, "__proc__");
+
+    ApiFunction = (FARPROC)NUM2ULONG(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",
+	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) {
+#ifdef __BORLANDC__ 
+       ptr = p + ( nimport - 1 );
+#endif
+	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);
-		rb_str_modify(str);
-		lParam = (unsigned long)StringValuePtr(str);
+	    import_type = rb_ary_entry(obj_import, i);
+	    timport = FIX2INT(import_type);
+	    switch (timport) {
+	    case _T_NUMBER:
+	    case _T_INTEGER:
+		lParam = NUM2ULONG(rb_ary_entry(args, i));
+#if defined(_MSC_VER) || defined(__LCC__)
+#if defined(_M_IX86)
+		_asm {
+		    mov     eax, lParam
+		    push    eax
+		}
+#elif defined(_M_ALPHA)
+		__asm(
+			"ldl r0, 0(%0);"
+			"stq r0, -(sp);"
+			, lParam
+		);
+#else
+#error
+#endif
+#elif defined(__BORLANDC__)
+		*ptr = lParam;
+		--ptr;
+#elif defined __GNUC__
+		asm volatile ("pushl %0" :: "g" (lParam));
+#else
+#error
+#endif
+		break;
+	    case _T_POINTER:
+		str = rb_ary_entry(args, i);
+		if (NIL_P(str)) {
+		    pParam = 0;
+		} else if (FIXNUM_P(str)){
+		    pParam = (char *)NUM2ULONG(str);
+		} else {
+		    StringValue(str);
+		    rb_str_modify(str);
+		    pParam = StringValuePtr(str);
+		}
+#if defined(_MSC_VER) || defined(__LCC__)
+#if defined(_M_IX86)
+		_asm {
+		    mov     eax, pParam
+		    push    eax
+		}
+#elif defined(_M_ALPHA)
+		__asm(
+			"ldl r0, 0(%0);"
+			"stq r0, -(sp);"
+			, pParam
+		);
+#else
+#error
+#endif
+#elif defined(__BORLANDC__)
+		*ptr = (long)pParam;
+		--ptr;
+#elif defined __GNUC__
+		asm volatile ("pushl %0" :: "g" (pParam));
+#else
+#error
+#endif
+		break;
 	    }
-	    break;
 	}
-	params[i] = lParam;
     }
 
-    ret = ApiFunction(param);
-
-    switch (FIX2INT(obj_export)) {
+#if defined __GNUC__
+    asm volatile ("call *%1" : "=r" (ret) : "g" (ApiFunction));
+    switch (texport) {
     case _T_NUMBER:
     case _T_INTEGER:
-	return INT2NUM(ret);
+	Return = INT2NUM(ret);
+	break;
+    case _T_POINTER:
+	Return = rb_str_new2((char *)ret);
+	break;
+    case _T_VOID:
+    default:
+	Return = INT2NUM(0);
+	break;
+    }
+#else
+    switch (texport) {
+    case _T_NUMBER:
+#if defined(__BORLANDC__)
+	Return = INT2NUM((long)c_m(ApiFunction, p));
+#else
+	ApiFunctionNumber = (ApiNumber *) ApiFunction;
+	Return = INT2NUM(ApiFunctionNumber());
+#endif
+	break;
     case _T_POINTER:
-	return rb_str_new2((char *)ret);
+#if defined(__BORLANDC__)
+	Return = rb_str_new2((char *)c_m(ApiFunction, p));
+#else
+	ApiFunctionPointer = (ApiPointer *) ApiFunction;
+	Return = rb_str_new2((char *)ApiFunctionPointer());
+#endif
+	break;
+    case _T_INTEGER:
+#if defined(__BORLANDC__)
+	Return = INT2NUM((int)c_m(ApiFunction, p));
+#else
+	ApiFunctionInteger = (ApiInteger *) ApiFunction;
+	Return = INT2NUM(ApiFunctionInteger());
+#endif
+	break;
     case _T_VOID:
     default:
-	return INT2NUM(0);
+	ApiFunctionVoid = (ApiVoid *) ApiFunction;
+	ApiFunctionVoid();
+	Return = INT2NUM(0);
+	break;
     }
+#endif
+    return Return;
 }
 
 void
diff --git a/ext/Win32API/extconf.rb b/ext/Win32API/extconf.rb
index 865788556f..8117a38720 100644
--- a/ext/Win32API/extconf.rb
+++ b/ext/Win32API/extconf.rb
@@ -1,6 +1,8 @@
 require 'mkmf'
 
-dir_config("win32")
 if have_header("windows.h") and have_library("kernel32")
+  if Config::CONFIG["CC"] =~ /gcc/
+    $CFLAGS += " -fno-defer-pop -fno-omit-frame-pointer"
+  end
   create_makefile("Win32API")
 end
diff --git a/ext/Win32API/lib/win32/registry.rb b/ext/Win32API/lib/win32/registry.rb
index 2671551a33..7e34301247 100644
--- a/ext/Win32API/lib/win32/registry.rb
+++ b/ext/Win32API/lib/win32/registry.rb
@@ -269,12 +269,9 @@ module Win32
       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
+      HKEY_PERFORMANCE_DATA = 0x80000003
+      HKEY_CURRENT_CONFIG = 0x80000004
+      HKEY_DYN_DATA = 0x80000005
       
       REG_NONE = 0
       REG_SZ = 1
@@ -333,10 +330,11 @@ module Win32
     #
     # Error
     #
-    class Error < ::StandardError
+    class Error < ::SystemCallError
       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
@@ -366,7 +364,7 @@ module Win32
       end
       
       # Make all
-      Constants.constants.grep(/^HKEY_/) do |c|
+      Constants.constants.select { |c| /^HKEY_/ =~ c }.each do |c|
         Registry.const_set c, new(Constants.const_get(c), c)
       end
     end
@@ -402,7 +400,6 @@ module Win32
       end
       
       def unpackdw(dw)
-        dw += [0].pack('V')
         dw.unpack('V')[0]
       end
       
@@ -726,17 +723,17 @@ module Win32
     def write(name, type, data)
       case type
       when REG_SZ, REG_EXPAND_SZ
-        data = data.to_s + "\0"
+        data += "\0"
       when REG_MULTI_SZ
-        data = data.to_a.join("\0") + "\0\0"
+        data = data.join("\0") + "\0\0"
       when REG_BINARY
-        data = data.to_s
+        #
       when REG_DWORD
-        data = API.packdw(data.to_i)
+        data = API.packdw(data)
       when REG_DWORD_BIG_ENDIAN
-        data = [data.to_i].pack('N')
+        data = [data].pack('N')
       when REG_QWORD
-        data = API.packqw(data.to_i)
+        data = API.packqw(data)
       else
         raise TypeError, "Unsupported type #{type}"
       end
@@ -749,9 +746,9 @@ module Win32
       else
         case value = rtype
         when Integer
-          write name, REG_DWORD, value
+          write name, REG_DWORD, value.to_i
         when String
-          write name, REG_SZ, value
+          write name, REG_SZ, value.to_s
         when Array
           write name, REG_MULTI_SZ, value
         else
diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb
deleted file mode 100644
index 6534d20760..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]\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]\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/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/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 fd0cd65418..0000000000
--- a/ext/bigdecimal/bigdecimal.c
+++ /dev/null
@@ -1,4689 +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 "ruby.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <float.h>
-#include <math.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)
-
-#if 0
-/* BigDecimal provides arbitrary-precision floating point decimal arithmetic.
- *
- * 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 the BigDecimal distribution.
- *
- * Documented by mathew <meta@pobox.com>.
- *
- * = Introduction
- *
- * Ruby provides built-in support for arbitrary precision integer arithmetic.
- * For example:
- *
- * 42**13   ->   1265437718438866624512
- *
- * BigDecimal provides similar support for very large or very accurate floating
- * point numbers.
- *
- * Decimal arithmetic is also useful for general calculation, because it
- * provides the correct answers people expect--whereas normal binary floating
- * point arithmetic often introduces subtle errors because of the conversion
- * between base 10 and base 2. For example, try:
- *
- *   sum = 0
- *   for i in (1..10000)
- *     sum = sum + 0.0001
- *   end
- *   print sum
- *
- * and contrast with the output from:
- *
- *   require 'bigdecimal'
- *
- *   sum = BigDecimal.new("0")
- *   for i in (1..10000)
- *     sum = sum + BigDecimal.new("0.0001")
- *   end
- *   print sum
- *
- * Similarly:
- *
- * (BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") -> true
- *
- * (1.2 - 1.0) == 0.2 -> false
- *
- * = Special features of accurate decimal arithmetic
- *
- * Because BigDecimal is more accurate than normal binary floating point
- * arithmetic, it requires some special values.
- *
- * == Infinity
- *
- * BigDecimal sometimes needs to return infinity, for example if you divide
- * a value by zero.
- *
- * BigDecimal.new("1.0") / BigDecimal.new("0.0")  -> infinity
- *
- * BigDecimal.new("-1.0") / BigDecimal.new("0.0")  -> -infinity
- *
- * You can represent infinite numbers to BigDecimal using the strings
- * 'Infinity', '+Infinity' and '-Infinity' (case-sensitive)
- *
- * == Not a Number
- *
- * When a computation results in an undefined value, the special value NaN
- * (for 'not a number') is returned.
- *
- * Example:
- *
- * BigDecimal.new("0.0") / BigDecimal.new("0.0") -> NaN
- *
- * You can also create undefined values.  NaN is never considered to be the
- * same as any other value, even NaN itself:
- *
- * n = BigDecimal.new('NaN')
- *
- * n == 0.0 -> nil
- *
- * n == n -> nil
- *
- * == Positive and negative zero
- *
- * If a computation results in a value which is too small to be represented as
- * a BigDecimal within the currently specified limits of precision, zero must
- * be returned.
- *
- * If the value which is too small to be represented is negative, a BigDecimal
- * value of negative zero is returned. If the value is positive, a value of
- * positive zero is returned.
- *
- * BigDecimal.new("1.0") / BigDecimal.new("-Infinity") -> -0.0
- *
- * BigDecimal.new("1.0") / BigDecimal.new("Infinity") -> 0.0
- *
- * (See BigDecimal.mode for how to specify limits of precision.)
- *
- * Note that -0.0 and 0.0 are considered to be the same for the purposes of
- * comparison.
- *
- * Note also that in mathematics, there is no particular concept of negative 
- * or positive zero; true mathematical zero has no sign.
- */
-void
-Init_BigDecimal()
-{
-    /* This is a #if-ed out function to fool Rdoc into documenting the class. */
-    /* The real init function is Init_bigdecimal() further down. */
-}
-#endif
-
-/*
- * Returns the BigDecimal version number.
- *
- * Ruby 1.8.0 returns 1.0.0.
- * Ruby 1.8.1 thru 1.8.3 return 1.0.1.
- */
-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, "%ld", FIX2LONG(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 */
-}
-
-/* call-seq:
- * BigDecimal.double_fig
- *
- * The BigDecimal.double_fig class method returns the number of digits a
- * Float number is allowed to have. The result depends upon the CPU and OS
- * in use.
- */
-static VALUE
-BigDecimal_double_fig(VALUE self)
-{
-    return INT2FIX(VpDblFig());
-}
-
-/* call-seq:
- * precs
- *
- * Returns an Array of two Integer values.
- *
- * The first value is the current number of significant digits in the 
- * BigDecimal. The second value is the maximum number of significant digits
- * for the BigDecimal.
- */
-static VALUE
-BigDecimal_prec(VALUE self)
-{
-    ENTER(1);
-    Real *p;
-    VALUE obj;
-
-    GUARD_OBJ(p,GetVpValue(self,1));
-    obj = rb_assoc_new(INT2NUM(p->Prec*VpBaseFig()),
-		       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);
-}
-
-/*
- * Internal method used to provide marshalling support. See the Marshal module.
- */
-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);
-}
-
- /* call-seq:
-  * BigDecimal.mode(mode, value)
-  *
-  * Controls handling of arithmetic exceptions and rounding. If no value
-  * is supplied, the current value is returned.
-  *
-  * Six values of the mode parameter control the handling of arithmetic
-  * exceptions:
-  *
-  * BigDecimal::EXCEPTION_NaN
-  * BigDecimal::EXCEPTION_INFINITY
-  * BigDecimal::EXCEPTION_UNDERFLOW
-  * BigDecimal::EXCEPTION_OVERFLOW
-  * BigDecimal::EXCEPTION_ZERODIVIDE
-  * BigDecimal::EXCEPTION_ALL
-  *
-  * For each mode parameter above, if the value set is false, computation 
-  * continues after an arithmetic exception of the appropriate type. 
-  * When computation continues, results are as follows:
-  *
-  * EXCEPTION_NaN:: NaN
-  * EXCEPTION_INFINITY:: +infinity or -infinity
-  * EXCEPTION_UNDERFLOW:: 0
-  * EXCEPTION_OVERFLOW:: +infinity or -infinity
-  * EXCEPTION_ZERODIVIDE:: +infinity or -infinity
-  *
-  * One value of the mode parameter controls the rounding of numeric values:
-  * BigDecimal::ROUND_MODE. The values it can take are:
-  *
-  * ROUND_UP:: round away from zero
-  * ROUND_DOWN:: round towards zero (truncate)
-  * ROUND_HALF_UP:: round up if the appropriate digit >= 5, otherwise truncate (default)
-  * ROUND_HALF_DOWN:: round up if the appropriate digit >= 6, otherwise truncate
-  * ROUND_HALF_EVEN:: round towards the even neighbor (Banker's rounding)
-  * ROUND_CEILING:: round towards positive infinity (ceil)
-  * ROUND_FLOOR:: round towards negative infinity (floor)
-  *
-  */
-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, "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, "first argument for BigDecimal#mode 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;
-}
-
-/* Returns True if the value is Not a Number */
-static VALUE
-BigDecimal_IsNaN(VALUE self)
-{
-    Real *p = GetVpValue(self,1);
-    if(VpIsNaN(p))  return Qtrue;
-    return Qfalse;
-}
-
-/* Returns True if the value is infinite */
-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;
-}
-
-/* Returns True if the value is finite (not NaN or infinite) */
-static VALUE
-BigDecimal_IsFinite(VALUE self)
-{
-    Real *p = GetVpValue(self,1);
-    if(VpIsNaN(p)) return Qfalse;
-    if(VpIsInf(p)) return Qfalse;
-    return Qtrue;
-}
-
-/* Returns the value as an integer (Fixnum or Bignum).
- *
- * If the BigNumber is infinity or NaN, returns nil.
- */
-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;
-}
-
-/* Returns a new Float object having approximately the same value as the
- * BigDecimal number. Normal accuracy limits and built-in errors of binary
- * Float arithmetic apply.
- */
-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);
-}
-
-/* The coerce method provides support for Ruby type coercion. It is not
- * enabled by default.
- * 
- * This means that binary operations like + * / or - can often be performed 
- * on a BigDecimal and an object of another type, if the other object can
- * be coerced into a BigDecimal value.
- *
- * e.g.
- * a = BigDecimal.new("1.0")
- * b = a / 2.0  -> 0.5
- *
- * Note that coercing a String to a BigDecimal is not supported by default;
- * it requires a special compile-time option when building Ruby.
- */
-static VALUE
-BigDecimal_coerce(VALUE self, VALUE other)
-{
-    ENTER(2);
-    VALUE obj;
-    Real *b;
-    if(TYPE(other) == T_FLOAT) {
-       obj = rb_assoc_new(other, BigDecimal_to_f(self));
-    } else {
-       GUARD_OBJ(b,GetVpValue(other,1));
-       obj = rb_assoc_new(b->obj, self);
-    }
-    return obj;
-}
-
-static VALUE
-BigDecimal_uplus(VALUE self)
-{
-    return self;
-}
-
- /* call-seq:
-  * add(value, digits)
-  *
-  * Add the specified value. 
-  *
-  * e.g.
-  *   c = a.add(b,n)
-  *   c = a + b
-  *
-  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
-  */
-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);
-}
-
- /* call-seq:
-  * sub(value, digits)
-  *
-  * Subtract the specified value. 
-  *
-  * e.g.
-  *   c = a.sub(b,n)
-  *   c = a - b
-  *
-  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
-  */
-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()");
-}
-
-/* Returns True if the value is zero. */
-static VALUE
-BigDecimal_zero(VALUE self)
-{
-    Real *a = GetVpValue(self,1);
-    return VpIsZero(a) ? Qtrue : Qfalse;
-}
-
-/* Returns True if the value is non-zero. */
-static VALUE
-BigDecimal_nonzero(VALUE self)
-{
-    Real *a = GetVpValue(self,1);
-    return VpIsZero(a) ? Qnil : self;
-}
-
-/* The comparison operator.
- * a <=> b is 0 if a == b, 1 if a > b, -1 if a < b.
- */
-static VALUE
-BigDecimal_comp(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '*');
-}
-
-/*
- * Tests for value equality; returns true if the values are equal.
- *
- * The == and === operators and the eql? method have the same implementation 
- * for BigDecimal.
- *
- * Values may be coerced to perform the comparison:
- *
- * BigDecimal.new('1.0') == 1.0  -> true
- */
-static VALUE
-BigDecimal_eq(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '=');
-}
-
-/* Returns true if the values are not equal in value. Values may be coerced
- * to perform the comparison:
- *
- * BigDecimal.new('1.0') != 1.0  -> false
- */
-static VALUE
-BigDecimal_ne(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '!');
-}
-
-/* call-seq:
- * a < b
- *
- * Returns true if a is less than b. Values may be coerced to perform the
- * comparison (see ==, coerce).
- */
-static VALUE
-BigDecimal_lt(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '<');
-}
-
-/* call-seq:
- * a <= b
- *
- * Returns true if a is less than or equal to b. Values may be coerced to 
- * perform the comparison (see ==, coerce).
- */
-static VALUE
-BigDecimal_le(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, 'L');
-}
-
-/* call-seq:
- * a > b
- *
- * Returns true if a is greater than b.  Values may be coerced to 
- * perform the comparison (see ==, coerce).
- */
-static VALUE
-BigDecimal_gt(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, '>');
-}
-
-/* call-seq:
- * a >= b
- *
- * Returns true if a is greater than or equal to b. Values may be coerced to 
- * perform the comparison (see ==, coerce)
- */
-static VALUE
-BigDecimal_ge(VALUE self, VALUE r)
-{
-    return BigDecimalCmp(self, r, 'G');
-}
-
-static VALUE
-BigDecimal_neg(VALUE self)
-{
-    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);
-}
-
- /* call-seq:
-  * mult(value, digits)
-  *
-  * Multiply by the specified value. 
-  *
-  * e.g.
-  *   c = a.mult(b,n)
-  *   c = a * b
-  *
-  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
-  */
-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;
-}
-
- /* call-seq:
-  * div(value, digits)
-  * quo(value)
-  *
-  * Divide by the specified value. 
-  *
-  * e.g.
-  *   c = a.div(b,n)
-  *
-  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
-  * 
-  * If digits is 0, the result is the same as the / operator. If not, the
-  * result is an integer BigDecimal, by analogy with Float#div.
-  *
-  * The alias quo is provided since div(value, 0) is the same as computing
-  * the quotient; see divmod.
-  */
-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;
-}
-
-/* call-seq:
- * a % b
- * a.modulo(b)
- *
- * Returns the modulus from dividing by b. See divmod.
- */
-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;
-}
-
-/* Returns the remainder from dividing by the value.
- *
- * If the values divided are of the same sign, the remainder is the same as
- * the modulus (see divmod).
- *
- * Otherwise, the remainder is the modulus minus the value divided by.
- */
-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);
-}
-
-/* Divides by the specified value, and returns the quotient and modulus
- * as BigDecimal numbers. The quotient is rounded towards negative infinity.
- *
- * For example:
- *
- * require 'bigdecimal'
- *
- * a = BigDecimal.new("42")
- * b = BigDecimal.new("9")
- *
- * q,m = a.divmod(b)
- *
- * c = q * b + m
- *
- * a == c  -> true
- *
- * The quotient q is (a/b).floor, and the modulus is the amount that must be 
- * added to q * b to get a.
- */
-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_assoc_new(ToValue(div), 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);
-    }
-}
-
-/* Returns the absolute value.
- *
- * BigDecimal('5').abs -> 5
- *
- * BigDecimal('-3').abs -> 3
- */
-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);
-}
-
-/* call-seq:
- * sqrt(n)
- *
- * Returns the square root of the value.
- *
- * If n is specified, returns at least that many significant digits.
- */
-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);
-}
-
-/* Return the integer part of the number.
- */
-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);
-}
-
-/* call-seq:
- * round(n,mode)
- *
- * Round to the nearest 1 (by default), returning the result as a BigDecimal.
- *
- * BigDecimal('3.14159').round -> 3
- *
- * BigDecimal('8.7').round -> 9
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits. 
- *
- * If n is specified and negative, at least that many digits to the left of the
- * decimal point will be 0 in the result.
- *
- * BigDecimal('3.14159').round(3) -> 3.142
- *
- * BigDecimal('13345.234').round(-2) -> 13300.0
- *
- * The value of the optional mode argument can be used to determine how 
- * rounding is performed; see BigDecimal.mode.
- */
-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);
-}
-
-/* call-seq:
- * truncate(n)
- *
- * Truncate to the nearest 1, returning the result as a BigDecimal.
- *
- * BigDecimal('3.14159').truncate -> 3
- *
- * BigDecimal('8.7').truncate -> 8
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits. 
- *
- * If n is specified and negative, at least that many digits to the left of the
- * decimal point will be 0 in the result.
- *
- * BigDecimal('3.14159').truncate(3) -> 3.141
- *
- * BigDecimal('13345.234').truncate(-2) -> 13300.0
- */
-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);
-}
-
-/* Return the fractional part of the number.
- */
-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);
-}
-
-/* call-seq:
- * floor(n)
- *
- * Return the largest integer less than or equal to the value, as a BigDecimal.
- *
- * BigDecimal('3.14159').floor -> 3
- *
- * BigDecimal('-9.1').floor -> -10
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.  
- *
- * If n is specified and negative, at least that
- * many digits to the left of the decimal point will be 0 in the result.
- *
- * BigDecimal('3.14159').floor(3) -> 3.141
- *
- * BigDecimal('13345.234').floor(-2) -> 13300.0
- */
-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);
-}
-
-/* call-seq:
- * ceil(n)
- *
- * Return the smallest integer greater than or equal to the value, as a BigDecimal.
- *
- * BigDecimal('3.14159').ceil -> 4
- *
- * BigDecimal('-9.1').ceil -> -9
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.  
- *
- * If n is specified and negative, at least that
- * many digits to the left of the decimal point will be 0 in the result.
- *
- * BigDecimal('3.14159').ceil(3) -> 3.142
- *
- * BigDecimal('13345.234').ceil(-2) -> 13400.0
- */
-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);
-}
-
-/* call-seq:
- * to_s(s)
- *
- * Converts the value to a string.
- *
- * The default format looks like  0.xxxxEnn.
- *
- * The optional parameter s consists of either an integer; or an optional '+'
- * or ' ', followed by an optional number, followed by an optional 'E' or 'F'.
- *
- * If there is a '+' at the start of s, positive values are returned with
- * a leading '+'.
- *
- * A space at the start of s returns positive values with a leading space.
- *
- * If s contains a number, a space is inserted after each group of that many 
- * fractional digits.
- *
- * If s ends with an 'E', engineering notation (0.xxxxEnn) is used.
- *
- * If s ends with an 'F', conventional floating point notation is used.
- *
- * Examples:
- *
- * BigDecimal.new('-123.45678901234567890').to_s('5F') -> '-123.45678 90123 45678 9'
- *
- * BigDecimal.new('123.45678901234567890').to_s('+8F') -> '+123.45678901 23456789'
- *
- * BigDecimal.new('123.45678901234567890').to_s(' F') -> ' 123.4567890123456789'
- */
-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);
-}
-
-/* Splits a BigDecimal number into four parts, returned as an array of values.
- *
- * The first value represents the sign of the BigDecimal, and is -1 or 1, or 0
- * if the BigDecimal is Not a Number.
- *
- * The second value is a string representing the significant digits of the
- * BigDecimal, with no leading zeros.
- *
- * The third value is the base used for arithmetic (currently always 10) as an
- * Integer.
- *
- * The fourth value is an Integer exponent.
- *
- * If the BigDecimal can be represented as 0.xxxxxx*10**n, then xxxxxx is the 
- * string of significant digits with no leading zeros, and n is the exponent.
- *
- * From these values, you can translate a BigDecimal to a float as follows:
- *
- *   sign, significant_digits, base, exponent = a.split
- *   f = sign * "0.#{significant_digits}".to_f * (base ** exponent)
- *
- * (Note that the to_f method is provided as a more convenient way to translate 
- * a BigDecimal to a Float.)
- */
-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_new2(4);
-    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;
-}
-
-/* Returns the exponent of the BigDecimal number, as an Integer.
- *
- * If the number can be represented as 0.xxxxxx*10**n where xxxxxx is a string
- * of digits with no leading zeros, then n is the exponent.
- */
-static VALUE
-BigDecimal_exponent(VALUE self)
-{
-    S_LONG e = VpExponent10(GetVpValue(self,1));
-    return INT2NUM(e);
-}
-
-/* Returns debugging information about the value as a string of comma-separated
- * values in angle brackets with a leading #:
- *
- * BigDecimal.new("1234.5678").inspect ->
- * "#<BigDecimal:b7ea1130,'0.12345678E4',8(12)>"
- *
- * The first part is the address, the second is the value as a string, and
- * the final part ss(mm) is the current number of significant digits and the
- * maximum number of significant digits, respectively.
- */
-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;
-}
-
-/* call-seq:
- * power(n)
- *
- * Returns the value raised to the power of n. Note that n must be an Integer.
- *
- * Also available as the operator **
- */
-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);
-}
-
- /* call-seq:
-  * new(initial, digits)
-  *
-  * Create a new BigDecimal object.
-  *
-  * initial:: The initial value, as a String. Spaces are ignored, unrecognized characters terminate the value.
-  *
-  * digits:: The number of significant digits, as a Fixnum. If omitted or 0, the number of significant digits is determined from the initial value.
-  *
-  * The actual number of significant digits used in computation is usually
-  * larger than the specified number.
-  */
-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);
-}
-
- /* call-seq:
-  * BigDecimal.limit(digits)
-  *
-  * Limit the number of significant digits in newly created BigDecimal 
-  * numbers to the specified value. Rounding is performed as necessary, 
-  * as specified by BigDecimal.mode.
-  *
-  * A limit of 0, the default, means no upper limit.
-  *
-  * The limit specified by this method takes priority over any limit 
-  * specified to instance methods such as ceil, floor, truncate, or round.
-  */
-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;
-}
-
-/* Returns the sign of the value.
- *
- * Returns a positive value if > 0, a negative value if < 0, and a 
- * zero if == 0.
- *
- * The specific value returned indicates the type and sign of the BigDecimal, 
- * as follows:
- *
- * BigDecimal::SIGN_NaN:: value is Not a Number
- * BigDecimal::SIGN_POSITIVE_ZERO:: value is +0
- * BigDecimal::SIGN_NEGATIVE_ZERO:: value is -0
- * BigDecimal::SIGN_POSITIVE_INFINITE:: value is +infinity
- * BigDecimal::SIGN_NEGATIVE_INFINITE:: value is -infinity
- * BigDecimal::SIGN_POSITIVE_FINITE:: value is positive
- * BigDecimal::SIGN_NEGATIVE_FINITE:: value is negative
- */
-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 */
-
-    /* 
-     * Base value used in internal calculations.  On a 32 bit system, BASE 
-     * is 10000, indicating that calculation is done in groups of 4 digits.  
-     * (If it were larger, BASE**2 wouldn't fit in 32 bits, so you couldn't
-     * guarantee that two groups could always be multiplied together without 
-     * overflow.) 
-     */
-    rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((S_INT)VpBaseVal()));
-
-    /* Exceptions */
-
-    /*
-     * Determines whether overflow, underflow or zero divide result in 
-     * an exception being thrown. See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_ALL",INT2FIX(VP_EXCEPTION_ALL));
-
-    /* 
-     * Determines what happens when the result of a computation is not a 
-     * number (NaN). See BigDecimal.mode. 
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_NaN",INT2FIX(VP_EXCEPTION_NaN));
-
-    /* 
-     * Determines what happens when the result of a computation is infinity.
-     * See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_INFINITY",INT2FIX(VP_EXCEPTION_INFINITY));
-
-    /* 
-     * Determines what happens when the result of a computation is an underflow
-     * (a result too small to be represented). See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_UNDERFLOW",INT2FIX(VP_EXCEPTION_UNDERFLOW));
-
-    /* 
-     * Determines what happens when the result of a computation is an underflow
-     * (a result too large to be represented). See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW",INT2FIX(VP_EXCEPTION_OVERFLOW));
-
-    /* 
-     * Determines what happens when a division by zero is performed.
-     * See BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE",INT2FIX(VP_EXCEPTION_ZERODIVIDE));
-
-    /* 
-     * Determines what happens when a result must be rounded in order to
-     * fit in the appropriate number of significant digits. See 
-     * BigDecimal.mode.
-     */
-    rb_define_const(rb_cBigDecimal, "ROUND_MODE",INT2FIX(VP_ROUND_MODE));
-
-    /* Indicates that values should be rounded away from zero. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_UP",INT2FIX(VP_ROUND_UP));
-    /* Indicates that values should be rounded towards zero. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_DOWN",INT2FIX(VP_ROUND_DOWN));
-    /* Indicates that digits >= 5 should be rounded up, others rounded down. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_UP",INT2FIX(VP_ROUND_HALF_UP));
-    /* Indicates that digits >= 6 should be rounded up, others rounded down. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_DOWN",INT2FIX(VP_ROUND_HALF_DOWN));
-    /* Round towards +infinity. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_CEILING",INT2FIX(VP_ROUND_CEIL));
-    /* Round towards -infinity. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_FLOOR",INT2FIX(VP_ROUND_FLOOR));
-    /* Round towards the even neighbor. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_EVEN",INT2FIX(VP_ROUND_HALF_EVEN));
-
-    /* Indicates that a value is not a number. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NaN",INT2FIX(VP_SIGN_NaN));
-    /* Indicates that a value is +0. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_ZERO",INT2FIX(VP_SIGN_POSITIVE_ZERO));
-    /* Indicates that a value is -0. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_ZERO",INT2FIX(VP_SIGN_NEGATIVE_ZERO));
-    /* Indicates that a value is positive and finite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_FINITE",INT2FIX(VP_SIGN_POSITIVE_FINITE));
-    /* Indicates that a value is negative and finite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_FINITE",INT2FIX(VP_SIGN_NEGATIVE_FINITE));
-    /* Indicates that a value is positive and infinite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_INFINITE",INT2FIX(VP_SIGN_POSITIVE_INFINITE));
-    /* Indicates that a value is negative and infinite. See BigDecimal.sign. */
-    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 '_' after digit: 2006-6-30 */
-    ni = 0;
-    psz = ALLOCA_N(char,strlen(szVal)+1);
-    i   = 0;
-    ipn = 0;
-    while(psz[i]=szVal[ipn]) {
-        if(ISDIGIT(psz[i])) ++ni;
-        if(psz[i]=='_') {
-            if(ni>0) {ipn++;continue;}
-            psz[i]=0;
-            break;
-        }
-        ++i; ++ipn;
-    }
-    /* Skip trailing spaces */
-    while((--i)>0) {
-        if(ISSPACE(psz[i])) psz[i] = 0;
-        else                break;
-    }
-    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) {
-            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->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) {
-        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) {
-        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) {
-        while(b_pos + word_shift > a_pos) {
-            --c_pos;
-            if(b_pos > 0) {
-                c->frac[c_pos] = BASE - b->frac[--b_pos] - borrow;
-            } else {
-                --word_shift;
-                c->frac[c_pos] = BASE - borrow;
-            }
-            borrow = 1;
-        }
-    }
-    /* 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->frac[--c_pos] = a->frac[--a_pos];
-    }
-
-    /* Now perform subtraction until every digits of b will be */
-    /* exhausted. */
-    while(b_pos > 0) {
-        --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;
-        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.
- */
-{
-    /* fracf: any positive digit under rounding position? */
-    /* exptoadd: number of digits needed to compensate negative nf */
-    int n,i,ix,ioffset,fracf,exptoadd;
-    U_LONG v,shifter;
-    U_LONG div;
-
-    nf += y->exponent*((int)BASE_FIG);
-    exptoadd=0;
-    if (nf < 0) {
-        exptoadd = -nf;
-        nf = 0;
-    }
-    /* ix: x->fraq[ix] contains round position */
-    ix = nf/(int)BASE_FIG;
-    if(((U_LONG)ix)>=y->Prec) return 0; /* Unable to round */
-    ioffset = nf - ix*((int)BASE_FIG);
-
-    v = y->frac[ix];
-    /* drop digits after pointed digit */
-    n = BASE_FIG - ioffset - 1;
-    for(shifter=1,i=0;i<n;++i) shifter *= 10;
-    fracf = (v%(shifter*10) > 0);
-    v /= shifter;
-    div = v/10;
-    v = v - div*10;
-    if (fracf == 0) {
-        for(i=ix+1;i<y->Prec;i++) {
-            if (y->frac[i]%BASE) {
-                fracf = 1;
-                break;
-            }
-        }
-    }
-    memset(y->frac+ix+1, 0, (y->Prec - (ix+1)) * sizeof(U_LONG));
-    switch(f) {
-    case VP_ROUND_DOWN: /* Truncate */
-         break;
-    case VP_ROUND_UP:   /* Roundup */
-        if(fracf) ++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(fracf && (VpGetSign(y)>0)) ++div;
-        break;
-    case VP_ROUND_FLOOR: /* floor */
-        if(fracf && (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) {
-        if(ix) {
-            y->frac[ix] = 0;
-            VpRdup(y,ix);
-        } else {
-            S_INT s = VpGetSign(y);
-            int e = y->exponent;
-            VpSetOne(y);
-            VpSetSign(y,s);
-            y->exponent = e+1;
-        }
-    } else {
-        y->frac[ix] = div;
-        VpNmlz(y);
-    }
-    if (exptoadd > 0) {
-        y->exponent += exptoadd/BASE_FIG;
-        exptoadd %= BASE_FIG;
-        for(i=0;i<exptoadd;i++) {
-            y->frac[0] *= 10;
-            if (y->frac[0] >= BASE) {
-                y->frac[0] /= BASE;
-                y->exponent++;
-            }
-        }
-    }
-    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 8fd95a6fe3..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 d80eeab901..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# require 'bigdecimal/jacobian'
-#
-# Provides methods to compute the Jacobian matrix of a set of equations at a
-# point x. In the methods below:
-#
-# f is an Object which is used to compute the Jacobian matrix of the equations.
-# It must provide the following methods:
-#
-# f.values(x):: returns the 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:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
-#
-# x is the point at which to compute the Jacobian.
-#
-# fx is f.values(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
-  #++
-
-  # Computes the derivative of f[i] at x[i].
-  # fx is the value of f at x.
-  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
-
-  # Computes the Jacobian of f at x. fx is the value of f at x.
-  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 8f4888725e..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Solves a*x = b for x, using LU decomposition.
-#
-module LUSolve
-  # Performs LU decomposition of the n by n matrix a.
-  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
-
-  # Solves a*x = b for x, using LU decomposition.
-  #
-  # a is a matrix, b is a constant vector, x is the solution vector.
-  #
-  # ps is the pivot, a vector which indicates the permutation of rows performed
-  # during LU decomposition.
-  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 f3248a3c5c..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ /dev/null
@@ -1,235 +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.
-#++
-#
-# Provides mathematical functions.
-#
-# Example:
-#
-#   require "bigdecimal"
-#   require "bigdecimal/math"
-#
-#   include BigMath
-#
-#   a = BigDecimal((PI(100)/2).to_s)
-#   puts sin(a,100) # -> 0.10000000000000000000......E1
-#
-module BigMath
-
-  # Computes the square root of x to the specified number of digits of 
-  # precision.
-  #
-  # BigDecimal.new('2').sqrt(16).to_s 
-  #  -> "0.14142135623730950488016887242096975E1"
-  #
-  def sqrt(x,prec)
-    x.sqrt(prec)
-  end
-
-  # Computes the sine of x to the specified number of digits of precision.
-  #
-  # If x is infinite or NaN, returns NaN.
-  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
-
-  # Computes the cosine of x to the specified number of digits of precision.
-  #
-  # If x is infinite or NaN, returns NaN.
-  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
-
-  # Computes the arctangent of x to the specified number of digits of precision.
-  #
-  # If x is infinite or NaN, returns NaN.
-  # Raises an argument error if x > 1.
-  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
-
-  # Computes the value of e (the base of natural logarithms) raised to the 
-  # power of x, to the specified number of digits of precision.
-  #
-  # If x is infinite or NaN, returns NaN.
-  #
-  # BigMath::exp(BigDecimal.new('1'), 10).to_s
-  # -> "0.271828182845904523536028752390026306410273E1"
-  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
-
-  # Computes the natural logarithm of x to the specified number of digits 
-  # of precision.
-  #
-  # Returns x if x is infinite or NaN.
-  #
-  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
-
-  # Computes the value of pi to the specified number of digits of precision.
-  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
-
-  # Computes e (the base of natural logarithms) to the specified number of
-  # digits of precision.
-  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 59ac0f7f04..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# newton.rb 
-#
-# Solves the 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 initial value vector
-#        f is an Object which is used to compute the values of the equations to be solved.
-# It must provide the following methods:
-#
-# f.values(x):: returns the 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:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
-#
-# On exit, x is the solution vector.
-#
-require "bigdecimal/ludcmp"
-require "bigdecimal/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
-          raise "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/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
deleted file mode 100644
index 09e926acd5..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# BigDecimal utility library.
-#
-# To use these functions, require 'bigdecimal/util'
-#
-# The following methods are provided to convert other types to BigDecimals:
-#
-#   String#to_d -> BigDecimal
-#   Float#to_d -> BigDecimal
-#   Rational#to_d -> BigDecimal
-#
-# The following method is provided to convert BigDecimals to other types:
-#
-#   BigDecimal#to_r -> Rational
-#
-# ----------------------------------------------------------------------
-#
-class Float < Numeric
-  def to_d
-    BigDecimal(self.to_s)
-  end
-end
-
-class String
-  def to_d
-    BigDecimal(self)
-  end
-end
-
-class BigDecimal < Numeric
-  # Converts a BigDecimal to a String of the form "nnnnnn.mmm".
-  # This method is deprecated; 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
-
-  # Converts a BigDecimal to a 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
-        Rational(numerator,base ** (-denomi_power))
-     else
-        Rational(numerator * (base ** denomi_power),1)
-     end
-  end
-end
-
-class Rational < Numeric
-  # Converts a Rational to a 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 88a62ffa71..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 "bigdecimal/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 7f729e6aaa..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 "bigdecimal/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/configsub.rb b/ext/configsub.rb
new file mode 100644
index 0000000000..47689d7ec0
--- /dev/null
+++ b/ext/configsub.rb
@@ -0,0 +1,32 @@
+#!./miniruby -ps
+
+BEGIN {
+  CONFIG = {}
+
+  RUBY_VERSION.scan(/(\d+)\.(\d+)\.(\d+)/) do
+    # overridden if config.status has version
+    CONFIG['MAJOR'] = $1
+    CONFIG['MINOR'] = $2
+    CONFIG['TEENY'] = $3
+  end
+
+  File.foreach($config || "config.status") do |line|
+    next if /^#/ =~ line
+    if /^s[%,]@(\w+)@[%,](.*)[%,][g;]/ =~ line
+      name = $1
+      val = $2 || ""
+      next if /^(INSTALL|DEFS|configure_input|srcdir)$/ =~ name
+      val.gsub!(/\$\{([^{}]+)\}/) { "$(#{$1})" }
+      CONFIG[name] = val
+    end
+  end
+
+  CONFIG['top_srcdir'] = File.expand_path($srcdir || ".")
+  CONFIG['RUBY_INSTALL_NAME'] = $install_name if $install_name
+  CONFIG['RUBY_SO_NAME'] = $so_name if $so_name
+  $defout = open($output, 'w') if $output
+}
+
+gsub!(/@(\w+)@/) {CONFIG[$1] || $&}
+
+# vi:set sw=2:
diff --git a/ext/curses/MANIFEST b/ext/curses/MANIFEST
new file mode 100644
index 0000000000..5882d682f0
--- /dev/null
+++ b/ext/curses/MANIFEST
@@ -0,0 +1,9 @@
+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 4e84b0837f..fa29263bcd 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: curses.c,v 1.24.2.8 2006/07/18 05:08:34 matz Exp $
+ * $Id$
  *
  * ext/curses/curses.c
  * 
@@ -13,35 +13,26 @@
  * - Takaaki Tateishi (ttate@kt.jaist.ac.jp)
  */
 
-#include "ruby.h"
-#include "rubyio.h"
-
 #if defined(HAVE_NCURSES_H)
 # include <ncurses.h>
 #elif defined(HAVE_NCURSES_CURSES_H)
 # include <ncurses/curses.h>
 #elif defined(HAVE_CURSES_COLR_CURSES_H)
-# ifdef HAVE_STDARG_PROTOTYPES
-#  include <stdarg.h>
-# else
-#  include <varargs.h>
-# endif
+# include <varargs.h>
 # include <curses_colr/curses.h>
 #else
 # include <curses.h>
-# if defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)
-#  if !defined(_maxx)
+# if (defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)) && !defined(_maxx)
 #  define _maxx maxx
-#  endif
-#  if !defined(_maxy)
+# endif
+# if (defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)) && !defined(_maxy)
 #  define _maxy maxy
-#  endif
-#  if !defined(_begx)
+# endif
+# if (defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)) && !defined(_begx)
 #  define _begx begx
-#  endif
-#  if !defined(_begy)
+# endif
+# if (defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)) && !defined(_begy)
 #  define _begy begy
-#  endif
 # endif
 #endif
 
@@ -54,8 +45,9 @@
 # define USE_MOUSE 1
 #endif
 
-#define NUM2CH NUM2LONG
-#define CH2FIX LONG2FIX
+#include <stdio.h>
+#include "ruby.h"
+#include "rubyio.h"
 
 static VALUE mCurses;
 static VALUE mKey;
@@ -83,8 +75,6 @@ no_window()
 }
 
 #define GetWINDOW(obj, winp) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted window");\
     Data_Get_Struct(obj, struct windata, winp);\
     if (winp->window == 0) no_window();\
 } while (0)
@@ -123,11 +113,10 @@ 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, "can't initialize curses");
+	rb_raise(rb_eRuntimeError, "cannot initialize curses");
     }
     clear();
     rb_stdscr = prep_window(cWindow, stdscr);
@@ -150,7 +139,7 @@ curses_close_screen()
 }
 
 static void
-curses_finalize(VALUE dummy)
+curses_finalize()
 {
     if (stdscr
 #ifdef HAVE_ISENDWIN
@@ -181,26 +170,15 @@ static VALUE
 curses_clear(obj)
     VALUE obj;
 {
-    curses_stdscr();
     wclear(stdscr);
     return Qnil;
 }
 
-/* def clrtoeol */
-static VALUE
-curses_clrtoeol()
-{
-    curses_stdscr();
-    clrtoeol();
-    return Qnil;
-}
-
 /* def refresh */
 static VALUE
 curses_refresh(obj)
     VALUE obj;
 {
-    curses_stdscr();
     refresh();
     return Qnil;
 }
@@ -210,7 +188,6 @@ static VALUE
 curses_doupdate(obj)
     VALUE obj;
 {
-    curses_stdscr();
 #ifdef HAVE_DOUPDATE
     doupdate();
 #else
@@ -224,7 +201,6 @@ static VALUE
 curses_echo(obj)
     VALUE obj;
 {
-    curses_stdscr();
     echo();
     return Qnil;
 }
@@ -234,7 +210,6 @@ static VALUE
 curses_noecho(obj)
     VALUE obj;
 {
-    curses_stdscr();
     noecho();
     return Qnil;
 }
@@ -244,7 +219,6 @@ static VALUE
 curses_raw(obj)
     VALUE obj;
 {
-    curses_stdscr();
     raw();
     return Qnil;
 }
@@ -254,7 +228,6 @@ static VALUE
 curses_noraw(obj)
     VALUE obj;
 {
-    curses_stdscr();
     noraw();
     return Qnil;
 }
@@ -264,7 +237,6 @@ static VALUE
 curses_cbreak(obj)
     VALUE obj;
 {
-    curses_stdscr();
     cbreak();
     return Qnil;
 }
@@ -274,7 +246,6 @@ static VALUE
 curses_nocbreak(obj)
     VALUE obj;
 {
-    curses_stdscr();
     nocbreak();
     return Qnil;
 }
@@ -284,7 +255,6 @@ static VALUE
 curses_nl(obj)
     VALUE obj;
 {
-    curses_stdscr();
     nl();
     return Qnil;
 }
@@ -294,7 +264,6 @@ static VALUE
 curses_nonl(obj)
     VALUE obj;
 {
-    curses_stdscr();
     nonl();
     return Qnil;
 }
@@ -305,7 +274,6 @@ curses_beep(obj)
     VALUE obj;
 {
 #ifdef HAVE_BEEP
-    curses_stdscr();
     beep();
 #endif
     return Qnil;
@@ -317,7 +285,6 @@ curses_flash(obj)
     VALUE obj;
 {
 #ifdef HAVE_FLASH
-    curses_stdscr();
     flash();
 #endif
     return Qnil;
@@ -330,7 +297,6 @@ curses_ungetch(obj, ch)
     VALUE ch;
 {
 #ifdef HAVE_UNGETCH
-    curses_stdscr();
     ungetch(NUM2INT(ch));
 #else
     rb_notimplement();
@@ -345,7 +311,6 @@ curses_setpos(obj, y, x)
     VALUE y;
     VALUE x;
 {
-    curses_stdscr();
     move(NUM2INT(y), NUM2INT(x));
     return Qnil;
 }
@@ -373,8 +338,7 @@ static VALUE
 curses_inch(obj)
     VALUE obj;
 {
-    curses_stdscr();
-    return CH2FIX(inch());
+    return CHR2FIX(inch());
 }
 
 /* def addch(ch) */
@@ -383,8 +347,7 @@ curses_addch(obj, ch)
     VALUE obj;
     VALUE ch;
 {
-    curses_stdscr();
-    addch(NUM2CH(ch));
+    addch(NUM2CHR(ch));
     return Qnil;
 }
 
@@ -394,8 +357,7 @@ curses_insch(obj, ch)
     VALUE obj;
     VALUE ch;
 {
-    curses_stdscr();
-    insch(NUM2CH(ch));
+    insch(NUM2CHR(ch));
     return Qnil;
 }
 
@@ -405,7 +367,6 @@ curses_addstr(obj, str)
     VALUE obj;
     VALUE str;
 {
-    curses_stdscr();
     if (!NIL_P(str)) {
 	addstr(STR2CSTR(str));
     }
@@ -418,7 +379,6 @@ curses_getch(obj)
     VALUE obj;
 {
     rb_read_check(stdin);
-    curses_stdscr();
     return UINT2NUM(getch());
 }
 
@@ -458,17 +418,6 @@ curses_deleteln(obj)
     return Qnil;
 }
 
-/* def insertln */
-static VALUE
-curses_insertln(obj)
-    VALUE obj;
-{
-#if defined(HAVE_INSERTLN) || defined(insertln)
-    insertln();
-#endif
-    return Qnil;
-}
-
 /* def keyname */
 static VALUE
 curses_keyname(obj, c)
@@ -504,34 +453,22 @@ curses_cols()
 static VALUE
 curses_curs_set(VALUE obj, VALUE visibility)
 {
-#ifdef HAVE_CURS_SET
   int n;
   return (n = curs_set(NUM2INT(visibility)) != ERR) ? INT2FIX(n) : Qnil;
-#else
-  return Qnil;
-#endif
 }
 
 static VALUE
 curses_scrl(VALUE obj, VALUE n)
 {
   /* may have to raise exception on ERR */
-#ifdef HAVE_SCRL
   return (scrl(NUM2INT(n)) == OK) ? Qtrue : Qfalse;
-#else
-  return Qfalse;
-#endif
 }
 
 static VALUE
 curses_setscrreg(VALUE obj, VALUE top, VALUE bottom)
 {
   /* may have to raise exception on ERR */
-#ifdef HAVE_SETSCRREG
   return (setscrreg(NUM2INT(top), NUM2INT(bottom)) == OK) ? Qtrue : Qfalse;
-#else
-  return Qfalse;
-#endif
 }
 
 static VALUE
@@ -558,27 +495,21 @@ curses_attrset(VALUE obj, VALUE attrs)
 static VALUE
 curses_bkgdset(VALUE obj, VALUE ch)
 {
-#ifdef HAVE_BKGDSET
-  bkgdset(NUM2CH(ch));
-#endif
+  bkgdset(NUM2CHR(ch));
   return Qnil;
 }
 
 static VALUE
 curses_bkgd(VALUE obj, VALUE ch)
 {
-#ifdef HAVE_BKGD
-  return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
-#else
-  return Qfalse;
-#endif
+  return CHR2FIX(bkgd(NUM2CHR(ch)));
 }
 
 static VALUE
-curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
+curses_resizeterm(VALUE obj, VALUE lines, VALUE columns)
 {
 #if defined(HAVE_RESIZETERM)
-  return (resizeterm(NUM2INT(lin),NUM2INT(col)) == OK) ? Qtrue : Qfalse;
+  return (resizeterm(NUM2INT(lines),NUM2INT(columns)) == OK) ? Qtrue : Qfalse;
 #else
   return Qnil;
 #endif
@@ -648,7 +579,7 @@ curses_pair_number(VALUE obj, VALUE attrs)
 {
   return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
 }
-#endif /* USE_COLOR */
+#endif
 
 #ifdef USE_MOUSE
 struct mousedata {
@@ -662,8 +593,6 @@ no_mevent()
 }
 
 #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)
@@ -683,7 +612,7 @@ curses_getmouse(VALUE obj)
 
   val = Data_Make_Struct(cMouseEvent,struct mousedata,
 			 0,curses_mousedata_free,mdata);
-  mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT));
+  mdata->mevent = (MEVENT*)malloc(sizeof(MEVENT));
   return (getmouse(mdata->mevent) == OK) ? val : Qnil;
 }
 
@@ -724,42 +653,12 @@ DEFINE_MOUSE_GET_MEMBER(curs_mouse_bstate, bstate)
 #undef define_curs_mouse_member
 #endif /* USE_MOUSE */
 
-static VALUE
-curses_timeout(VALUE obj, VALUE delay)
-{
-#ifdef HAVE_TIMEOUT
-  timeout(NUM2INT(delay));
-  return Qnil;
-#else
-    rb_notimplement();
-#endif
-}
-
-static VALUE
-curses_def_prog_mode(VALUE obj)
-{
-#ifdef HAVE_DEF_PROG_MODE
-  return def_prog_mode() == OK ? Qtrue : Qfalse;
-#else
-    rb_notimplement();
-#endif
-}
-
-static VALUE
-curses_reset_prog_mode(VALUE obj)
-{
-#ifdef HAVE_RESET_PROG_MODE
-  return reset_prog_mode() == OK ? Qtrue : Qfalse;
-#else
-    rb_notimplement();
-#endif
-}
-
 /*-------------------------- class Window --------------------------*/
 
 /* def self.allocate */
 static VALUE
-window_s_allocate(VALUE class)
+window_s_allocate(class)
+    VALUE class;
 {
     struct windata *winp;
 
@@ -778,7 +677,6 @@ window_initialize(obj, h, w, top, left)
     struct windata *winp;
     WINDOW *window;
 
-    rb_secure(4);
     curses_init_screen();
     Data_Get_Struct(obj, struct windata, winp);
     if (winp->window) delwin(winp->window);
@@ -789,26 +687,22 @@ window_initialize(obj, h, w, top, left)
     return obj;
 }
 
-/* def subwin(height, width, top, left) */
+/* def subwin(h, w, top, left) */
 static VALUE
-window_subwin(obj, height, width, top, left)
+window_subwin(obj, h, w, top, left)
     VALUE obj;
-    VALUE height;
-    VALUE width;
+    VALUE h;
+    VALUE w;
     VALUE top;
     VALUE left;
 {
     struct windata *winp;
     WINDOW *window;
     VALUE win;
-    int h, w, t, l;
 
-    h = NUM2INT(height);
-    w = NUM2INT(width);
-    t = NUM2INT(top);
-    l = NUM2INT(left);
     GetWINDOW(obj, winp);
-    window = subwin(winp->window, h, w, t, l);
+    window = subwin(winp->window, NUM2INT(h), NUM2INT(w),
+		                  NUM2INT(top), NUM2INT(left));
     win = prep_window(rb_obj_class(obj), window);
 
     return win;
@@ -841,19 +735,6 @@ window_clear(obj)
     return Qnil;
 }
 
-/* def clrtoeol */
-static VALUE
-window_clrtoeol(obj)
-    VALUE obj;
-{
-    struct windata *winp;
-    
-    GetWINDOW(obj, winp);
-    wclrtoeol(winp->window);
-    
-    return Qnil;
-}
-
 /* def refresh */
 static VALUE
 window_refresh(obj)
@@ -1027,13 +908,13 @@ window_box(argc, argv, self)
     rb_scan_args(argc, argv, "21", &vert, &hor, &corn);
 
     GetWINDOW(self, winp);
-    box(winp->window, NUM2CH(vert), NUM2CH(hor));
+    box(winp->window, NUM2CHR(vert), NUM2CHR(hor));
 
     if (!NIL_P(corn)) {
       int cur_x, cur_y, x, y;
-      chtype c;
+      char c;
 
-      c = NUM2CH(corn);
+      c = NUM2CHR(corn);
       getyx(winp->window, cur_y, cur_x);
       x = NUM2INT(window_maxx(self)) - 1;
       y = NUM2INT(window_maxy(self)) - 1;
@@ -1083,7 +964,7 @@ window_inch(obj)
     struct windata *winp;
     
     GetWINDOW(obj, winp);
-    return CH2FIX(winch(winp->window));
+    return CHR2FIX(winch(winp->window));
 }
 
 /* def addch(ch) */
@@ -1095,7 +976,7 @@ window_addch(obj, ch)
     struct windata *winp;
     
     GetWINDOW(obj, winp);
-    waddch(winp->window, NUM2CH(ch));
+    waddch(winp->window, NUM2CHR(ch));
     
     return Qnil;
 }
@@ -1109,7 +990,7 @@ window_insch(obj, ch)
     struct windata *winp;
     
     GetWINDOW(obj, winp);
-    winsch(winp->window, NUM2CH(ch));
+    winsch(winp->window, NUM2CHR(ch));
     
     return Qnil;
 }
@@ -1195,20 +1076,6 @@ window_deleteln(obj)
     return Qnil;
 }
 
-/* def insertln */
-static VALUE
-window_insertln(obj)
-    VALUE obj;
-{
-#if defined(HAVE_WINSERTLN) || defined(winsertln)
-    struct windata *winp;
-    
-    GetWINDOW(obj, winp);
-    winsertln(winp->window);
-#endif
-    return Qnil;
-}
-
 static VALUE
 window_scrollok(VALUE obj, VALUE bf)
 {
@@ -1232,7 +1099,6 @@ window_idlok(VALUE obj, VALUE bf)
 static VALUE
 window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
 {
-#ifdef HAVE_WSETSCRREG
   struct windata *winp;
   int res;
 
@@ -1240,25 +1106,8 @@ window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
   res = wsetscrreg(winp->window, NUM2INT(top), NUM2INT(bottom));
   /* may have to raise exception on ERR */
   return (res == OK) ? Qtrue : Qfalse;
-#else
-  return Qfalse;
-#endif
 }
 
-#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
-static VALUE
-window_color_set(VALUE obj, VALUE col) 
-{
-  struct windata *winp;
-  int res;
-
-  GetWINDOW(obj, winp);
-  res = wcolor_set(winp->window, NUM2INT(col), NULL);
-  return (res == OK) ? Qtrue : Qfalse;
-  return Qfalse;
-}
-#endif /* USE_COLOR */
-
 static VALUE
 window_scroll(VALUE obj)
 {
@@ -1272,34 +1121,25 @@ window_scroll(VALUE obj)
 static VALUE
 window_scrl(VALUE obj, VALUE n)
 {
-#ifdef HAVE_WSCRL
   struct windata *winp;
 
   GetWINDOW(obj, winp);
   /* may have to raise exception on ERR */
   return (wscrl(winp->window,NUM2INT(n)) == OK) ? Qtrue : Qfalse;
-#else
-  return Qfalse;
-#endif
 }
 
 static VALUE
 window_attroff(VALUE obj, VALUE attrs)
 {
-#ifdef HAVE_WATTROFF
   struct windata *winp;
 
   GetWINDOW(obj,winp);
   return INT2FIX(wattroff(winp->window,NUM2INT(attrs)));
-#else
-  return Qtrue;
-#endif
 }
 
 static VALUE
 window_attron(VALUE obj, VALUE attrs)
 {
-#ifdef HAVE_WATTRON
   struct windata *winp;
   VALUE val;
 
@@ -1313,81 +1153,63 @@ window_attron(VALUE obj, VALUE attrs)
   else{
     return val;
   }
-#else
-  return Qtrue;
-#endif
 }
 
 static VALUE
 window_attrset(VALUE obj, VALUE attrs)
 {
-#ifdef HAVE_WATTRSET
   struct windata *winp;
 
   GetWINDOW(obj,winp);
   return INT2FIX(wattrset(winp->window,NUM2INT(attrs)));
-#else
-  return Qtrue;
-#endif
 }
 
 static VALUE
 window_bkgdset(VALUE obj, VALUE ch)
 {
-#ifdef HAVE_WBKGDSET
   struct windata *winp;
 
   GetWINDOW(obj,winp);
-  wbkgdset(winp->window, NUM2CH(ch));
-#endif
+  wbkgdset(winp->window, NUM2CHR(ch));
   return Qnil;
 }
 
 static VALUE
 window_bkgd(VALUE obj, VALUE ch)
 {
-#ifdef HAVE_WBKGD
   struct windata *winp;
 
   GetWINDOW(obj,winp);
-  return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
-#else
-  return Qfalse;
-#endif
+  return CHR2FIX(wbkgd(winp->window, NUM2CHR(ch)));
 }
 
 static VALUE
 window_getbkgd(VALUE obj)
 {
-#ifdef HAVE_WGETBKGD
-  chtype c;
   struct windata *winp;
 
   GetWINDOW(obj,winp);
-  return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
-#else
-  return Qnil;
-#endif
+  return CHR2FIX(getbkgd(winp->window));
 }
 
 static VALUE
-window_resize(VALUE obj, VALUE lin, VALUE col)
+window_resize(VALUE obj, VALUE lines, VALUE columns)
 {
 #if defined(HAVE_WRESIZE)
   struct windata *winp;
 
   GetWINDOW(obj,winp);
-  return wresize(winp->window, NUM2INT(lin), NUM2INT(col)) == OK ? Qtrue : Qfalse;
+  return wresize(winp->window, NUM2INT(lines), NUM2INT(columns)) == OK ? Qtrue : Qfalse;
 #else
   return Qnil;
 #endif
 }
 
 
+#ifdef HAVE_KEYPAD
 static VALUE
 window_keypad(VALUE obj, VALUE val)
 {
-#ifdef HAVE_KEYPAD
   struct windata *winp;
 
   GetWINDOW(obj,winp);
@@ -1400,43 +1222,8 @@ window_keypad(VALUE obj, VALUE val)
   return (keypad(winp->window,RTEST(val) ? TRUE : FALSE)) == OK ?
     Qtrue : Qfalse;
 #endif
-#else
-    rb_notimplement();
-#endif /* HAVE_KEYPAD */
-}
-
-static VALUE
-window_nodelay(VALUE obj, VALUE val)
-{
-#ifdef HAVE_NODELAY
-  struct windata *winp;
-  GetWINDOW(obj,winp);
-
-  /* nodelay() of NetBSD's libcurses returns no value */
-#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
-  nodelay(winp->window, RTEST(val) ? TRUE : FALSE);
-  return Qnil;
-#else
-  return nodelay(winp->window,RTEST(val) ? TRUE : FALSE) == OK ? Qtrue : Qfalse;
-#endif
-#else
-    rb_notimplement();
-#endif
-}
-
-static VALUE
-window_timeout(VALUE obj, VALUE delay)
-{
-#ifdef HAVE_WTIMEOUT
-  struct windata *winp;
-  GetWINDOW(obj,winp);
-
-  wtimeout(winp->window,NUM2INT(delay));
-  return Qnil;
-#else
-    rb_notimplement();
-#endif
 }
+#endif /* HAVE_KEYPAD */
 
 /*------------------------- Initialization -------------------------*/
 void
@@ -1464,7 +1251,6 @@ Init_curses()
     rb_define_module_function(mCurses, "refresh", curses_refresh, 0);
     rb_define_module_function(mCurses, "doupdate", curses_doupdate, 0);
     rb_define_module_function(mCurses, "clear", curses_clear, 0);
-    rb_define_module_function(mCurses, "clrtoeol", curses_clrtoeol, 0);
     rb_define_module_function(mCurses, "echo", curses_echo, 0);
     rb_define_module_function(mCurses, "noecho", curses_noecho, 0);
     rb_define_module_function(mCurses, "raw", curses_raw, 0);
@@ -1489,7 +1275,6 @@ 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, "insertln", curses_insertln, 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);
@@ -1517,30 +1302,22 @@ Init_curses()
 #endif /* USE_COLOR */
 #ifdef USE_MOUSE
     rb_define_module_function(mCurses, "getmouse", curses_getmouse, 0);
-    rb_define_module_function(mCurses, "ungetmouse", curses_ungetmouse, 1);
+    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 */
 
-    rb_define_module_function(mCurses, "timeout=", curses_timeout, 1);
-    rb_define_module_function(mCurses, "def_prog_mode", curses_def_prog_mode, 0);
-    rb_define_module_function(mCurses, "reset_prog_mode", curses_reset_prog_mode, 0);
-
     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);
     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, "clrtoeol", window_clrtoeol, 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, "move", window_move, 2);
     rb_define_method(cWindow, "setpos", window_setpos, 2);
-#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
-    rb_define_method(cWindow, "color_set", window_color_set, 1);
-#endif /* USE_COLOR && HAVE_WCOLOR_SET */
     rb_define_method(cWindow, "cury", window_cury, 0);
     rb_define_method(cWindow, "curx", window_curx, 0);
     rb_define_method(cWindow, "maxy", window_maxy, 0);
@@ -1558,25 +1335,25 @@ 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, "insertln", window_insertln, 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 */
 
-    rb_define_method(cWindow, "nodelay=", window_nodelay, 1);
-    rb_define_method(cWindow, "timeout=", window_timeout, 1);
 
 #define rb_curses_define_const(c) rb_define_const(mCurses,#c,UINT2NUM(c))
 
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index 01fe971093..94443b45e6 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -6,26 +6,22 @@ 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")
+if have_header("ncurses.h") and have_library("ncurses", "initscr")
   make=true
-elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
+elsif have_header("ncurses/curses.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")
-  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_header("curses.h") and have_library("curses", "initscr")
+    make=true
+  end
 end
 
 if make
-  for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set)
+  for f in %w(isendwin ungetch beep getnstr wgetnstr doupdate flash deleteln wdeleteln keypad keyname init_color wresize resizeterm)
     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/view.rb b/ext/curses/view.rb
index d9a82a57db..5ba1a8413c 100644
--- a/ext/curses/view.rb
+++ b/ext/curses/view.rb
@@ -49,7 +49,7 @@ while TRUE
   n = 0
   while TRUE
     c = getch.chr
-    if c =~ /[0-9]/
+    if c =~ "[0-9]" then
       n = 10 * n + c.to_i
     else
       break
diff --git a/ext/dbm/MANIFEST b/ext/dbm/MANIFEST
new file mode 100644
index 0000000000..c8719f62a7
--- /dev/null
+++ b/ext/dbm/MANIFEST
@@ -0,0 +1,5 @@
+MANIFEST
+dbm.c
+depend
+extconf.rb
+testdbm.rb
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 83e6a9893b..ad84589640 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -2,8 +2,8 @@
 
   dbm.c -
 
-  $Author: usa $
-  $Date: 2005/06/20 07:53:19 $
+  $Author$
+  $Date$
   created at: Mon Jan 24 15:59:52 JST 1994
 
   Copyright (C) 1995-2001 Yukihiro Matsumoto
@@ -24,8 +24,6 @@
 
 static VALUE rb_cDBM, rb_eDBMError;
 
-#define RUBY_DBM_RW_BIT 0x20000000
-
 struct dbmdata {
     int  di_size;
     DBM *di_dbm;
@@ -43,11 +41,6 @@ closed_dbm()
     if (dbmp->di_dbm == 0) closed_dbm();\
 }
 
-#define GetDBM2(obj, data, dbm) {\
-    GetDBM(obj, data);\
-    (dbm) = dbmp->di_dbm;\
-}
-
 static void
 free_dbm(dbmp)
     struct dbmdata *dbmp;
@@ -71,21 +64,6 @@ fdbm_close(obj)
     return Qnil;
 }
 
-static VALUE
-fdbm_closed(obj)
-    VALUE obj;
-{
-    struct dbmdata *dbmp;
-
-    Data_Get_Struct(obj, struct dbmdata, dbmp);
-    if (dbmp == 0)
-	return Qtrue;
-    if (dbmp->di_dbm == 0)
-	return Qtrue;
-
-    return Qfalse;
-}
-
 static VALUE fdbm_alloc _((VALUE));
 static VALUE
 fdbm_alloc(klass)
@@ -100,12 +78,12 @@ fdbm_initialize(argc, argv, obj)
     VALUE *argv;
     VALUE obj;
 {
-    VALUE file, vmode, vflags;
+    VALUE file, vmode;
     DBM *dbm;
     struct dbmdata *dbmp;
-    int mode, flags = 0;
+    int mode;
 
-    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)) {
@@ -114,27 +92,17 @@ fdbm_initialize(argc, argv, obj)
     else {
 	mode = NUM2INT(vmode);
     }
-
-    if (!NIL_P(vflags))
-        flags = NUM2INT(vflags);
-
     SafeStringValue(file);
 
-    if (flags & RUBY_DBM_RW_BIT) {
-        flags &= ~RUBY_DBM_RW_BIT;
-        dbm = dbm_open(RSTRING(file)->ptr, flags, mode);
+    dbm = 0;
+    if (mode >= 0) {
+	dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
     }
-    else {
-        dbm = 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, 0);
+    }
+    if (!dbm) {
+	dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
     }
 
     if (!dbm) {
@@ -181,7 +149,8 @@ fdbm_fetch(obj, keystr, ifnone)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (ifnone == Qnil && rb_block_given_p())
@@ -226,7 +195,8 @@ fdbm_index(obj, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    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 &&
@@ -271,22 +241,19 @@ fdbm_select(argc, argv, obj)
 	if (argc > 0) {
 	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
 	}
-        GetDBM2(obj, dbmp, dbm);
+        GetDBM(obj, dbmp);
+        dbm = dbmp->di_dbm;
+
         for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-            VALUE assoc, v;
+            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));
-	    v = rb_yield(assoc);
-	    if (RTEST(v)) {
-		rb_ary_push(new, assoc);
-	    }
-	    GetDBM2(obj, dbmp, dbm);
-	}
+            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));
         }
@@ -296,30 +263,6 @@ fdbm_select(argc, argv, obj)
 }
 
 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));
-    }
-
-    return new;
-}
-
-static void
-fdbm_modify(obj)
-    VALUE obj;
-{
-    rb_secure(4);
-    if (OBJ_FROZEN(obj)) rb_error_frozen("DBM");
-}
-
-static VALUE
 fdbm_delete(obj, keystr)
     VALUE obj, keystr;
 {
@@ -328,12 +271,14 @@ fdbm_delete(obj, keystr)
     DBM *dbm;
     VALUE valstr;
 
-    fdbm_modify(obj);
+    rb_secure(4);
     StringValue(keystr);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (rb_block_given_p()) return rb_yield(keystr);
@@ -362,8 +307,9 @@ fdbm_shift(obj)
     DBM *dbm;
     VALUE keystr, valstr;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
 
     key = dbm_firstkey(dbm); 
@@ -387,8 +333,9 @@ fdbm_delete_if(obj)
     VALUE ret, ary = rb_ary_new();
     int i, status = 0, n;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     n = dbmp->di_size;
     dbmp->di_size = -1;
 
@@ -399,12 +346,10 @@ fdbm_delete_if(obj)
         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);
-	GetDBM2(obj, dbmp, dbm);
     }
 
     for (i = 0; i < RARRAY(ary)->len; i++) {
 	keystr = RARRAY(ary)->ptr[i];
-	StringValue(keystr);
 	key.dptr = RSTRING(keystr)->ptr;
 	key.dsize = RSTRING(keystr)->len;
 	if (dbm_delete(dbm, key)) {
@@ -425,8 +370,9 @@ fdbm_clear(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
     while (key = dbm_firstkey(dbm), key.dptr) {
 	if (dbm_delete(dbm, key)) {
@@ -448,7 +394,8 @@ fdbm_invert(obj)
     VALUE keystr, valstr;
     VALUE hash = rb_hash_new();
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     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);
@@ -458,8 +405,6 @@ fdbm_invert(obj)
     return hash;
 }
 
-static VALUE each_pair _((VALUE));
-
 static VALUE
 each_pair(obj)
     VALUE obj;
@@ -506,18 +451,19 @@ fdbm_store(obj, keystr, valstr)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    fdbm_modify(obj);
+    rb_secure(4);
     keystr = rb_obj_as_string(keystr);
-    valstr = rb_obj_as_string(valstr);
 
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
+    valstr = rb_obj_as_string(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     dbmp->di_size = -1;
+    dbm = dbmp->di_dbm;
     if (dbm_store(dbm, key, val, DBM_REPLACE)) {
 #ifdef HAVE_DBM_CLEARERR
 	dbm_clearerr(dbm);
@@ -538,8 +484,9 @@ fdbm_length(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+    dbm = dbmp->di_dbm;
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	i++;
@@ -558,7 +505,7 @@ fdbm_empty_p(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     if (dbmp->di_size < 0) {
 	dbm = dbmp->di_dbm;
 
@@ -581,11 +528,11 @@ fdbm_each_value(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
-	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -598,10 +545,10 @@ fdbm_each_key(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
-	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -615,14 +562,14 @@ fdbm_each_pair(obj)
     struct dbmdata *dbmp;
     VALUE keystr, valstr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
 
     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);
 	rb_yield(rb_assoc_new(keystr, valstr));
-	GetDBM2(obj, dbmp, dbm);
     }
 
     return obj;
@@ -637,7 +584,8 @@ fdbm_keys(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
 
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
@@ -656,7 +604,9 @@ fdbm_values(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
@@ -678,7 +628,8 @@ fdbm_has_key(obj, keystr)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     val = dbm_fetch(dbm, key);
     if (val.dptr) return Qtrue;
     return Qfalse;
@@ -696,7 +647,8 @@ fdbm_has_value(obj, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    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 &&
@@ -715,12 +667,14 @@ fdbm_to_a(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_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)));
+				rb_tainted_str_new(val.dptr, val.dsize)));
     }
 
     return ary;
@@ -735,7 +689,9 @@ fdbm_to_hash(obj)
     DBM *dbm;
     VALUE hash;
 
-    GetDBM2(obj, dbmp, dbm);
+    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);
@@ -765,7 +721,6 @@ Init_dbm()
 
     rb_define_method(rb_cDBM, "initialize", fdbm_initialize, -1);
     rb_define_method(rb_cDBM, "close", fdbm_close, 0);
-    rb_define_method(rb_cDBM, "closed?", fdbm_closed, 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);
@@ -774,7 +729,6 @@ Init_dbm()
     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);
@@ -803,14 +757,4 @@ Init_dbm()
 
     rb_define_method(rb_cDBM, "to_a", fdbm_to_a, 0);
     rb_define_method(rb_cDBM, "to_hash", fdbm_to_hash, 0);
-
-    /* flags for dbm_open() */
-    rb_define_const(rb_cDBM, "READER",  INT2FIX(O_RDONLY|RUBY_DBM_RW_BIT));
-    rb_define_const(rb_cDBM, "WRITER",  INT2FIX(O_RDWR|RUBY_DBM_RW_BIT));
-    rb_define_const(rb_cDBM, "WRCREAT", INT2FIX(O_RDWR|O_CREAT|RUBY_DBM_RW_BIT));
-    rb_define_const(rb_cDBM, "NEWDB",   INT2FIX(O_RDWR|O_CREAT|O_TRUNC|RUBY_DBM_RW_BIT));
-
-#ifdef DB_VERSION_STRING
-    rb_define_const(rb_cDBM, "VERSION",  rb_str_new2(DB_VERSION_STRING));
-#endif
 }
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 52ec688952..7f59ebd218 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -11,7 +11,6 @@ $dbm_conf_headers = {
   "dbm" => ["ndbm.h"],
   "gdbm" => ["gdbm-ndbm.h", "ndbm.h"],
   "gdbm_compat" => ["gdbm-ndbm.h", "ndbm.h"],
-  "qdbm" => ["relic.h"],
 }
 
 def db_check(db)
@@ -32,8 +31,8 @@ def db_check(db)
 
   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)
-	$defs << hsearch << '-DDBM_HDR="<'+hdr+'>"'
+      if have_header(hdr.dup)
+	$CFLAGS += " " + hsearch + '-DDBM_HDR="<'+hdr+'>"'
 	return true
       end
     end
@@ -46,16 +45,16 @@ def db_prefix(func)
 end
 
 if dblib
-  dbm_hdr = db_check(dblib)
+  db_check(dblib)
 else
-  dbm_hdr = %w(db db2 db1 dbm gdbm gdbm_compat qdbm).any? do |dblib|
-    db_check(dblib)
+  for dblib in %w(db db2 db1 dbm gdbm)
+    db_check(dblib) and break
   end
 end
 
 have_header("cdefs.h") 
 have_header("sys/cdefs.h") 
-if dbm_hdr and have_func(db_prefix("dbm_open"))
+if /DBM_HDR/ =~ $CFLAGS and have_func(db_prefix("dbm_open"))
   have_func(db_prefix("dbm_clearerr")) unless $dbm_conf_have_gdbm
   create_makefile("dbm")
 end
diff --git a/ext/dbm/testdbm.rb b/ext/dbm/testdbm.rb
new file mode 100644
index 0000000000..0be627d346
--- /dev/null
+++ b/ext/dbm/testdbm.rb
@@ -0,0 +1,590 @@
+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", 0400) {|dbm|
+      dbm['foo'] = 'FOO'
+    }
+    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) {
+	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) {
+      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_select
+    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.select(*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/MANIFEST b/ext/digest/MANIFEST
new file mode 100644
index 0000000000..e1cd49dfa8
--- /dev/null
+++ b/ext/digest/MANIFEST
@@ -0,0 +1,45 @@
+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.rb
+test.sh
+depend
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
index d51c627cf9..8e44cf6fa2 100644
--- a/ext/digest/defs.h
+++ b/ext/digest/defs.h
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: defs.h,v 1.7 2003/06/01 15:39:52 eban Exp $
+ * $Id$
  */
 
 #ifndef DEFS_H
@@ -18,7 +18,7 @@
 
 #if defined(HAVE_INTTYPES_H)
 # include <inttypes.h>
-#elif !defined __CYGWIN__ || !defined __uint8_t_defined
+#else
   typedef unsigned char uint8_t;
   typedef unsigned int  uint32_t;
 # if SIZEOF_LONG == 8
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 957fe4f6ea..a170678cf0 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -2,14 +2,14 @@
 
   digest.c -
 
-  $Author: matz $
+  $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: digest.c,v 1.14.2.2 2005/12/12 00:36:51 matz Exp $
+  $Id$
 
 ************************************************/
 
@@ -73,8 +73,7 @@ rb_digest_base_alloc(klass)
 
     algo = get_digest_base_metadata(klass);
 
-    /* XXX: An uninitialized buffer leads ALGO_Equal() to fail */
-    pctx = xcalloc(algo->ctx_size, 1);
+    pctx = xmalloc(algo->ctx_size);
     algo->init_func(pctx);
 
     obj = Data_Wrap_Struct(klass, 0, free, pctx);
@@ -91,7 +90,7 @@ rb_digest_base_s_digest(klass, str)
     void *pctx;
     size_t len;
     unsigned char *digest;
-    volatile VALUE obj = rb_digest_base_alloc(klass);
+    VALUE obj = rb_digest_base_alloc(klass);
 
     algo = get_digest_base_metadata(klass);
     Data_Get_Struct(obj, void, pctx);
@@ -120,7 +119,7 @@ rb_digest_base_s_hexdigest(klass, str)
     void *pctx;
     size_t len;
     unsigned char *hexdigest;
-    volatile VALUE obj = rb_digest_base_alloc(klass);
+    VALUE obj = rb_digest_base_alloc(klass);
 
     algo = get_digest_base_metadata(klass);
     Data_Get_Struct(obj, void, pctx);
@@ -149,8 +148,8 @@ rb_digest_base_copy(copy, obj)
 
     if (copy == obj) return copy;
     rb_check_frozen(copy);
-    algo = get_digest_base_metadata(rb_obj_class(copy));
-    if (algo != get_digest_base_metadata(rb_obj_class(obj))) {
+    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);
@@ -168,7 +167,7 @@ rb_digest_base_update(self, str)
     void *pctx;
 
     StringValue(str);
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_base_metadata(CLASS_OF(self));
     Data_Get_Struct(self, void, pctx);
 
     algo->update_func(pctx, RSTRING(str)->ptr, RSTRING(str)->len);
@@ -201,7 +200,7 @@ rb_digest_base_digest(self)
     size_t len;
     VALUE str;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_base_metadata(CLASS_OF(self));
     Data_Get_Struct(self, void, pctx1);
 
     len = algo->ctx_size;
@@ -232,7 +231,7 @@ rb_digest_base_hexdigest(self)
     size_t len;
     VALUE str;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_base_metadata(CLASS_OF(self));
     Data_Get_Struct(self, void, pctx1);
 
     len = algo->ctx_size;
@@ -261,10 +260,10 @@ rb_digest_base_equal(self, other)
     VALUE klass;
     VALUE str1, str2;
 
-    klass = rb_obj_class(self);
+    klass = CLASS_OF(self);
     algo = get_digest_base_metadata(klass);
 
-    if (rb_obj_class(other) == klass) {
+    if (CLASS_OF(other) == klass) {
 	void *pctx1, *pctx2;
 
 	Data_Get_Struct(self, void, pctx1);
@@ -304,7 +303,7 @@ Init_digest()
     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, "copy_object",  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);
diff --git a/ext/digest/digest.h b/ext/digest/digest.h
index 578be0a3c4..5e846df040 100644
--- a/ext/digest/digest.h
+++ b/ext/digest/digest.h
@@ -2,14 +2,14 @@
 
   digest.c -
 
-  $Author: knu $
+  $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: digest.h,v 1.1 2001/07/13 20:06:13 knu Exp $
+  $Id$
 
 ************************************************/
 
diff --git a/ext/digest/digest.txt b/ext/digest/digest.txt
index 4969a9da90..5797dd18f9 100644
--- a/ext/digest/digest.txt
+++ b/ext/digest/digest.txt
@@ -1,6 +1,6 @@
 .\" 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: digest.txt,v 1.1 2001/07/13 20:06:13 knu Exp $
+$Id$
 
 ** MD5(Class)
 
diff --git a/ext/digest/digest.txt.ja b/ext/digest/digest.txt.ja
index 7078c83573..8997d25b9d 100644
--- a/ext/digest/digest.txt.ja
+++ b/ext/digest/digest.txt.ja
@@ -1,6 +1,6 @@
 .\" 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: digest.txt.ja,v 1.1 2001/07/19 05:42:07 knu Exp $
+$Id$
 
 ** MD5(���饹)
 
diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb
index 3e35bf5064..cd512622a4 100644
--- a/ext/digest/extconf.rb
+++ b/ext/digest/extconf.rb
@@ -1,5 +1,5 @@
 # $RoughId: extconf.rb,v 1.6 2001/07/13 15:38:27 knu Exp $
-# $Id: extconf.rb,v 1.1 2001/07/13 20:06:13 knu Exp $
+# $Id$
 
 require "mkmf"
 
diff --git a/ext/digest/lib/md5.rb b/ext/digest/lib/md5.rb
index 6867fdc71b..1d05d7d04e 100644
--- a/ext/digest/lib/md5.rb
+++ b/ext/digest/lib/md5.rb
@@ -1,7 +1,7 @@
 # just for compatibility; requiring "md5" is obsoleted
 #
 # $RoughId: md5.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
-# $Id: md5.rb,v 1.1 2001/07/13 20:06:14 knu Exp $
+# $Id$
 
 require 'digest/md5'
 
diff --git a/ext/digest/lib/sha1.rb b/ext/digest/lib/sha1.rb
index 12fb5cdfa4..c4ac6f66ea 100644
--- a/ext/digest/lib/sha1.rb
+++ b/ext/digest/lib/sha1.rb
@@ -1,7 +1,7 @@
 # just for compatibility; requiring "sha1" is obsoleted
 #
 # $RoughId: sha1.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
-# $Id: sha1.rb,v 1.1 2001/07/13 20:06:14 knu Exp $
+# $Id$
 
 require 'digest/sha1'
 
diff --git a/ext/digest/md5/MANIFEST b/ext/digest/md5/MANIFEST
new file mode 100644
index 0000000000..e371e075e9
--- /dev/null
+++ b/ext/digest/md5/MANIFEST
@@ -0,0 +1,7 @@
+extconf.rb
+md5.c
+md5.h
+md5init.c
+md5ossl.c
+md5ossl.h
+depend
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
index ea29c9c5f8..0db0404dbe 100644
--- a/ext/digest/md5/extconf.rb
+++ b/ext/digest/md5/extconf.rb
@@ -1,10 +1,9 @@
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
-# $Id: extconf.rb,v 1.4.2.2 2006/05/25 23:44:05 nobu Exp $
+# $Id$
 
 require "mkmf"
 
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [ "md5init.#{$OBJEXT}" ]
 
@@ -14,6 +13,7 @@ if !with_config("bundled-md5") &&
     have_library("crypto") && have_header("openssl/md5.h")
   $objs << "md5ossl.#{$OBJEXT}"
 
+  $libs << " -lcrypto"
 else
   $objs << "md5.#{$OBJEXT}"
 end
diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c
index ed32cf95c1..6b61f031c4 100644
--- a/ext/digest/md5/md5.c
+++ b/ext/digest/md5/md5.c
@@ -43,7 +43,7 @@
 
 /*$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: md5.c,v 1.1 2001/07/13 20:06:14 knu Exp $ */
+/*$Id$ */
 
 #include "md5.h"
 
diff --git a/ext/digest/md5/md5.h b/ext/digest/md5/md5.h
index 736e034512..fc41380d38 100644
--- a/ext/digest/md5/md5.h
+++ b/ext/digest/md5/md5.h
@@ -41,7 +41,7 @@
 
 /* $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: md5.h,v 1.2 2002/02/24 08:20:22 knu Exp $ */
+/* $Id$ */
 
 #ifndef MD5_INCLUDED
 #  define MD5_INCLUDED
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index 52f5de540f..2acca16a46 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -1,5 +1,5 @@
 /* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id: md5init.c,v 1.5 2002/09/26 16:27:23 knu Exp $ */
+/* $Id$ */
 
 #include "digest.h"
 #if defined(HAVE_OPENSSL_MD5_H)
diff --git a/ext/digest/md5/md5ossl.c b/ext/digest/md5/md5ossl.c
index 4af7d19ba5..d930c7ab51 100644
--- a/ext/digest/md5/md5ossl.c
+++ b/ext/digest/md5/md5ossl.c
@@ -1,4 +1,4 @@
-/* $Id: md5ossl.c,v 1.2 2003/01/06 11:47:53 knu Exp $ */
+/* $Id$ */
 
 #include "md5ossl.h"
 #include <sys/types.h>
diff --git a/ext/digest/md5/md5ossl.h b/ext/digest/md5/md5ossl.h
index 401ef3418d..dda7c743ed 100644
--- a/ext/digest/md5/md5ossl.h
+++ b/ext/digest/md5/md5ossl.h
@@ -1,9 +1,8 @@
-/* $Id: md5ossl.h,v 1.1.2.1 2005/08/30 10:43:34 gotoyuzo Exp $ */
+/* $Id$ */
 
 #ifndef MD5OSSL_H_INCLUDED
 #define MD5OSSL_H_INCLUDED
 
-#include <stddef.h>
 #include <openssl/md5.h>
 
 void MD5_End(MD5_CTX *pctx, unsigned char *hexdigest);
diff --git a/ext/digest/rmd160/MANIFEST b/ext/digest/rmd160/MANIFEST
new file mode 100644
index 0000000000..4579def9fe
--- /dev/null
+++ b/ext/digest/rmd160/MANIFEST
@@ -0,0 +1,8 @@
+extconf.rb
+rmd160.c
+rmd160.h
+rmd160hl.c
+rmd160init.c
+rmd160ossl.c
+rmd160ossl.h
+depend
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
index 232a3a5e06..3f6a88e756 100644
--- a/ext/digest/rmd160/extconf.rb
+++ b/ext/digest/rmd160/extconf.rb
@@ -1,10 +1,9 @@
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
-# $Id: extconf.rb,v 1.4.2.2 2006/05/25 23:44:05 nobu Exp $
+# $Id$
 
 require "mkmf"
 
-$defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [ "rmd160init.#{$OBJEXT}" ]
 
@@ -13,6 +12,7 @@ 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
diff --git a/ext/digest/rmd160/rmd160.c b/ext/digest/rmd160/rmd160.c
index 9562a6fe67..2de3c99b29 100644
--- a/ext/digest/rmd160/rmd160.c
+++ b/ext/digest/rmd160/rmd160.c
@@ -1,6 +1,6 @@
 /*	$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: rmd160.c,v 1.1 2001/07/13 20:06:14 knu Exp $	*/
+/*	$Id$	*/
 
 /********************************************************************\
  *
diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h
index 7df190413e..24f9a025f0 100644
--- a/ext/digest/rmd160/rmd160.h
+++ b/ext/digest/rmd160/rmd160.h
@@ -1,6 +1,6 @@
 /*	$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: rmd160.h,v 1.2 2002/02/24 08:20:22 knu Exp $	*/
+/*	$Id$	*/
 
 /********************************************************************\
  *
diff --git a/ext/digest/rmd160/rmd160hl.c b/ext/digest/rmd160/rmd160hl.c
index 14299d7c7a..4c5e0217d9 100644
--- a/ext/digest/rmd160/rmd160hl.c
+++ b/ext/digest/rmd160/rmd160hl.c
@@ -1,6 +1,6 @@
 /*	$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,v 1.1 2001/07/13 20:06:14 knu Exp $	*/
+/*	$Id$	*/
 
 /* rmd160hl.c
  * ----------------------------------------------------------------------------
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index 3aa7847019..b16cdbbed8 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -1,5 +1,5 @@
 /* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
-/* $Id: rmd160init.c,v 1.3 2002/09/26 17:26:46 knu Exp $ */
+/* $Id$ */
 
 #include "digest.h"
 #if defined(HAVE_OPENSSL_RIPEMD_H)
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
index 1a8436dfb8..be66d81ff9 100644
--- a/ext/digest/rmd160/rmd160ossl.c
+++ b/ext/digest/rmd160/rmd160ossl.c
@@ -1,7 +1,7 @@
-/* $Id: rmd160ossl.c,v 1.1.2.1 2006/08/07 09:01:27 matz Exp $ */
+/* $Id$ */
 
-#include "defs.h"
 #include "rmd160ossl.h"
+#include "defs.h"
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/ext/digest/rmd160/rmd160ossl.h b/ext/digest/rmd160/rmd160ossl.h
index 30840ca598..824a1bf32f 100644
--- a/ext/digest/rmd160/rmd160ossl.h
+++ b/ext/digest/rmd160/rmd160ossl.h
@@ -1,9 +1,8 @@
-/* $Id: rmd160ossl.h,v 1.1.2.1 2005/08/30 10:43:35 gotoyuzo Exp $ */
+/* $Id$ */
 
 #ifndef RMD160OSSL_H_INCLUDED
 #define RMD160OSSL_H_INCLUDED
 
-#include <stddef.h>
 #include <openssl/ripemd.h>
 
 #define RMD160_CTX	RIPEMD160_CTX
diff --git a/ext/digest/sha1/MANIFEST b/ext/digest/sha1/MANIFEST
new file mode 100644
index 0000000000..7109ab90b6
--- /dev/null
+++ b/ext/digest/sha1/MANIFEST
@@ -0,0 +1,8 @@
+extconf.rb
+sha1.c
+sha1.h
+sha1hl.c
+sha1init.c
+sha1ossl.c
+sha1ossl.h
+depend
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index 861c5563f9..d5b7e06d9c 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -1,10 +1,9 @@
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
-# $Id: extconf.rb,v 1.5.2.1 2006/05/25 23:44:05 nobu Exp $
+# $Id$
 
 require "mkmf"
 
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [ "sha1init.#{$OBJEXT}" ]
 
@@ -13,6 +12,7 @@ dir_config("openssl")
 if !with_config("bundled-sha1") &&
     have_library("crypto") && have_header("openssl/sha.h")
   $objs << "sha1ossl.#{$OBJEXT}"
+  $libs << " -lcrypto"
 else
   $objs << "sha1.#{$OBJEXT}" << "sha1hl.#{$OBJEXT}"
 end
diff --git a/ext/digest/sha1/sha1.c b/ext/digest/sha1/sha1.c
index ba926e1fad..1012ef8751 100644
--- a/ext/digest/sha1/sha1.c
+++ b/ext/digest/sha1/sha1.c
@@ -1,7 +1,7 @@
 /*	$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: sha1.c,v 1.1 2001/07/13 20:06:14 knu Exp $	*/
+/*	$Id$	*/
 
 /*
  * SHA-1 in C
diff --git a/ext/digest/sha1/sha1.h b/ext/digest/sha1/sha1.h
index 5a1143ea0d..2303cecc2b 100644
--- a/ext/digest/sha1/sha1.h
+++ b/ext/digest/sha1/sha1.h
@@ -1,6 +1,6 @@
 /*	$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: sha1.h,v 1.2 2002/02/24 08:20:22 knu Exp $	*/
+/*	$Id$	*/
 
 /*
  * SHA-1 in C
diff --git a/ext/digest/sha1/sha1hl.c b/ext/digest/sha1/sha1hl.c
index 47b802085d..d1a236b22c 100644
--- a/ext/digest/sha1/sha1hl.c
+++ b/ext/digest/sha1/sha1hl.c
@@ -1,6 +1,6 @@
 /*	$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,v 1.1 2001/07/13 20:06:14 knu Exp $	*/
+/*	$Id$	*/
 
 /* sha1hl.c
  * ----------------------------------------------------------------------------
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index 829a363921..426afb7cd0 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -1,5 +1,5 @@
 /* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id: sha1init.c,v 1.3 2002/09/26 17:44:33 knu Exp $ */
+/* $Id$ */
 
 #include "digest.h"
 #if defined(HAVE_OPENSSL_SHA_H)
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
index 72c6eb4092..b125128f82 100644
--- a/ext/digest/sha1/sha1ossl.c
+++ b/ext/digest/sha1/sha1ossl.c
@@ -1,7 +1,7 @@
-/* $Id: sha1ossl.c,v 1.1.2.1 2006/08/07 09:01:27 matz Exp $ */
+/* $Id$ */
 
-#include "defs.h"
 #include "sha1ossl.h"
+#include "defs.h"
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/ext/digest/sha1/sha1ossl.h b/ext/digest/sha1/sha1ossl.h
index 24b84b4274..e8d7e74baf 100644
--- a/ext/digest/sha1/sha1ossl.h
+++ b/ext/digest/sha1/sha1ossl.h
@@ -1,9 +1,8 @@
-/* $Id: sha1ossl.h,v 1.1.2.1 2005/08/30 10:43:36 gotoyuzo Exp $ */
+/* $Id$ */
 
 #ifndef SHA1OSSL_H_INCLUDED
 #define SHA1OSSL_H_INCLUDED
 
-#include <stddef.h>
 #include <openssl/sha.h>
 
 #define SHA1_CTX	SHA_CTX
diff --git a/ext/digest/sha2/MANIFEST b/ext/digest/sha2/MANIFEST
new file mode 100644
index 0000000000..f117b94771
--- /dev/null
+++ b/ext/digest/sha2/MANIFEST
@@ -0,0 +1,6 @@
+extconf.rb
+sha2.c
+sha2.h
+sha2hl.c
+sha2init.c
+depend
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index 5d078f4bd6..c982aa64de 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -1,10 +1,9 @@
 # $RoughId: extconf.rb,v 1.4 2001/08/14 19:54:51 knu Exp $
-# $Id: extconf.rb,v 1.7.2.2 2006/05/25 23:44:06 nobu Exp $
+# $Id$
 
 require "mkmf"
 
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [
   "sha2.#{$OBJEXT}",
@@ -18,6 +17,12 @@ have_header("inttypes.h")
 
 have_header("unistd.h")
 
-if have_type("uint64_t", "defs.h", $defs.join(' '))
+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
index 22e7d59cd3..a3c3258082 100644
--- a/ext/digest/sha2/sha2.c
+++ b/ext/digest/sha2/sha2.c
@@ -34,12 +34,12 @@
  */
 
 /* $RoughId: sha2.c,v 1.3 2002/02/26 22:03:36 knu Exp $ */
-/* $Id: sha2.c,v 1.4.2.1 2005/12/24 09:58:56 matz Exp $ */
+/* $Id$ */
 
-#include "sha2.h"
 #include <stdio.h>
 #include <string.h>	/* memcpy()/memset() or bcopy()/bzero() */
 #include <assert.h>	/* assert() */
+#include "sha2.h"
 
 /*
  * ASSERT NOTE:
@@ -67,7 +67,7 @@ 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) || defined(__IBMC__)
+#if defined(__GNUC__)
 #define ULL(number)	number##ULL
 #else
 #define ULL(number)	(uint64_t)(number)
diff --git a/ext/digest/sha2/sha2.h b/ext/digest/sha2/sha2.h
index 7ccf012b77..4689ad93ce 100644
--- a/ext/digest/sha2/sha2.h
+++ b/ext/digest/sha2/sha2.h
@@ -34,7 +34,7 @@
  */
 
 /* $RoughId: sha2.h,v 1.3 2002/02/24 08:14:32 knu Exp $ */
-/* $Id: sha2.h,v 1.2 2002/02/24 08:20:22 knu Exp $ */
+/* $Id$ */
 
 #ifndef __SHA2_H__
 #define __SHA2_H__
diff --git a/ext/digest/sha2/sha2hl.c b/ext/digest/sha2/sha2hl.c
index 8f09bd6e5a..03fde538c3 100644
--- a/ext/digest/sha2/sha2hl.c
+++ b/ext/digest/sha2/sha2hl.c
@@ -1,6 +1,6 @@
 /* $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,v 1.1 2001/07/13 20:06:14 knu Exp $ */
+/* $Id$ */
 
 /*
  * sha2hl.c
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
index 9c0f9854fb..4b14031811 100644
--- a/ext/digest/sha2/sha2init.c
+++ b/ext/digest/sha2/sha2init.c
@@ -1,5 +1,5 @@
 /* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
-/* $Id: sha2init.c,v 1.2 2002/02/17 12:43:44 nobu Exp $ */
+/* $Id$ */
 
 #include "digest.h"
 #include "sha2.h"
diff --git a/ext/digest/test.rb b/ext/digest/test.rb
new file mode 100644
index 0000000000..51865aa961
--- /dev/null
+++ b/ext/digest/test.rb
@@ -0,0 +1,91 @@
+#!/usr/bin/env ruby
+#
+# $RoughId: test.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
+# $Id$
+
+require 'test/unit'
+
+require 'digest/md5'
+require 'digest/rmd160'
+require 'digest/sha1'
+require 'digest/sha2'
+include Digest
+
+class TestDigest < Test::Unit::TestCase
+  ALGOS = [
+    MD5,
+    SHA1,
+    SHA256,
+    SHA384,
+    SHA512,
+    RMD160
+  ]
+
+  DATA = {
+    "abc" => {
+      MD5 => "900150983cd24fb0d6963f7d28e17f72",
+      SHA1 => "a9993e364706816aba3e25717850c26c9cd0d89d",
+      SHA256 => "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
+      SHA384 => "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7",
+      SHA512 => "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
+      RMD160 => "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc"
+    },
+
+    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" => {
+      MD5 => "8215ef0796a20bcaaae116d3876c664a",
+      SHA1 => "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
+      SHA256 => "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
+      SHA384 => "3391fdddfc8dc7393707a65b1b4709397cf8b1d162af05abfe8f450de5f36bc6b0455a8520bc4e6f5fe95b1fe3c8452b",
+      SHA512 => "204a8fc6dda82f0a0ced7beb8e08a41657c16ef468b228a8279be331a703c33596fd15c13b1b07f9aa1d3bea57789ca031ad85c7a71dd70354ec631238ca3445",
+      RMD160 => "12a053384a9c0c88e405a06c27dcf49ada62eb2b"
+    }
+  }
+
+  def test_s_hexdigest
+    ALGOS.each do |algo|
+      DATA.each do |str, table|
+	assert_equal(table[algo], algo.hexdigest(str))
+      end
+    end
+  end
+
+  def test_s_digest
+    ALGOS.each do |algo|
+      DATA.each do |str, table|
+	assert_equal([table[algo]].pack("H*"), algo.digest(str))
+      end
+    end
+  end
+
+  def test_update
+    # This test is also for digest() and hexdigest()
+
+    str = "ABC"
+
+    ALGOS.each do |algo|
+      md = algo.new
+      md.update str
+      assert_equal(algo.hexdigest(str), md.hexdigest)
+      assert_equal(algo.digest(str), md.digest)
+    end
+  end
+
+  def test_eq
+    # This test is also for clone()
+
+    ALGOS.each do |algo|
+      md1 = algo.new("ABC")
+
+      assert_equal(md1, md1.clone)
+
+      md2 = algo.new
+      md2 << "A"
+
+      assert(md1 != md2)
+
+      md2 << "BC"
+
+      assert_equal(md1, md2)
+    end
+  end
+end
diff --git a/ext/digest/test.sh b/ext/digest/test.sh
index 2ae2688e4d..6fb07d2177 100644
--- a/ext/digest/test.sh
+++ b/ext/digest/test.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $RoughId: test.sh,v 1.5 2001/07/13 15:38:27 knu Exp $
-# $Id: test.sh,v 1.2 2002/09/26 17:55:16 knu Exp $
+# $Id$
 
 RUBY=${RUBY:=ruby}
 MAKE=${MAKE:=make}
diff --git a/ext/dl/MANIFEST b/ext/dl/MANIFEST
new file mode 100644
index 0000000000..261b4ad914
--- /dev/null
+++ b/ext/dl/MANIFEST
@@ -0,0 +1,32 @@
+.cvsignore
+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
index fba3df7a3d..3d62fe3421 100644
--- a/ext/dl/depend
+++ b/ext/dl/depend
@@ -1,3 +1,6 @@
+CLEANFILES = test/test.o
+DISTCLEANFILES = call.func callback.func cbtable.func dlconfig.rb dlconfig.h \
+                 test/libtest.so test/*~ *~ mkmf.log
 LDSHARED_TEST = $(LDSHARED) $(LDFLAGS) test/test.o -o test/libtest.so $(LOCAL_LIBS)
 
 libtest.so: test/libtest.so
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
index 71c353bda3..0d806a7de7 100644
--- a/ext/dl/dl.c
+++ b/ext/dl/dl.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dl.c,v 1.20.2.5 2005/12/16 13:32:06 ttate Exp $
+ * $Id$
  */
 
 #include <ruby.h>
@@ -24,8 +24,8 @@ rb_dl_scan_callback_args(long stack[], const char *proto,
   VALUE val;
 
   sp = stack;
-  for (i=1; proto[i]; i++) {
-    switch (proto[i]) {
+  for( i=1; proto[i]; i++ ){
+    switch( proto[i] ){
     case 'C':
       {
 	char v;
@@ -147,7 +147,7 @@ dlstrdup(const char *str)
 {
   char *newstr;
 
-  newstr = (char*)dlmalloc(strlen(str)+1);
+  newstr = (char*)dlmalloc(strlen(str));
   strcpy(newstr,str);
 
   return newstr;
@@ -162,11 +162,11 @@ dlsizeof(const char *cstr)
 
   len  = strlen(cstr);
   size = 0;
-  for (i=0; i<len; i++) {
+  for( i=0; i<len; i++ ){
     n = 1;
-    if (isdigit(cstr[i+1])) {
+    if( isdigit(cstr[i+1]) ){
       dlen = 1;
-      while (isdigit(cstr[i+dlen])) { dlen ++; };
+      while( isdigit(cstr[i+dlen]) ){ dlen ++; };
       dlen --;
       d = ALLOCA_N(char, dlen + 1);
       strncpy(d, cstr + i + 1, dlen);
@@ -177,7 +177,7 @@ dlsizeof(const char *cstr)
       dlen = 0;
     }
 
-    switch (cstr[i]) {
+    switch( cstr[i] ){
     case 'I':
       DLALIGN(0,size,INT_ALIGN);
     case 'i':
@@ -234,9 +234,9 @@ c_farray(VALUE v, long *size)
   len = RARRAY(v)->len;
   *size = sizeof(float) * len;
   ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
+  for( i=0; i < len; i++ ){
     e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
+    switch( TYPE(e) ){
     case T_FLOAT:
       ary[i] = (float)(RFLOAT(e)->value);
       break;
@@ -262,9 +262,9 @@ c_darray(VALUE v, long *size)
   len = RARRAY(v)->len;
   *size = sizeof(double) * len;
   ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
+  for( i=0; i < len; i++ ){
     e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
+    switch( TYPE(e) ){
     case T_FLOAT:
       ary[i] = (double)(RFLOAT(e)->value);
       break;
@@ -290,9 +290,9 @@ c_larray(VALUE v, long *size)
   len = RARRAY(v)->len;
   *size = sizeof(long) * len;
   ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
+  for( i=0; i < len; i++ ){
     e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
+    switch( TYPE(e) ){
     case T_FIXNUM:
     case T_BIGNUM:
       ary[i] = (long)(NUM2INT(e));
@@ -319,9 +319,9 @@ c_iarray(VALUE v, long *size)
   len = RARRAY(v)->len;
   *size = sizeof(int) * len;
   ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
+  for( i=0; i < len; i++ ){
     e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
+    switch( TYPE(e) ){
     case T_FIXNUM:
     case T_BIGNUM:
       ary[i] = (int)(NUM2INT(e));
@@ -348,9 +348,9 @@ c_harray(VALUE v, long *size)
   len = RARRAY(v)->len;
   *size = sizeof(short) * len;
   ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
+  for( i=0; i < len; i++ ){
     e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
+    switch( TYPE(e) ){
     case T_FIXNUM:
     case T_BIGNUM:
       ary[i] = (short)(NUM2INT(e));
@@ -377,9 +377,9 @@ c_carray(VALUE v, long *size)
   len = RARRAY(v)->len;
   *size = sizeof(char) * len;
   ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
+  for( i=0; i < len; i++ ){
     e = rb_ary_entry(v, i);
-    switch (TYPE(e)) {
+    switch( TYPE(e) ){
     case T_FIXNUM:
     case T_BIGNUM:
       ary[i] = (char)(NUM2INT(e));
@@ -401,23 +401,15 @@ c_parray(VALUE v, long *size)
 {
   int i, len;
   void **ary;
-  VALUE e, tmp;
+  VALUE e;
 
   len = RARRAY(v)->len;
   *size = sizeof(void*) * len;
   ary = dlmalloc(*size);
-  for (i=0; i < len; i++) {
+  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 */
+    switch( TYPE(e) ){
     case T_STRING:
-      rb_check_safe_str(e);
       {
 	char *str, *src;
 	src = RSTRING(e)->ptr;
@@ -429,23 +421,18 @@ c_parray(VALUE v, long *size)
       ary[i] = NULL;
       break;
     case T_DATA:
-      if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
+      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{
-        e = rb_funcall(e, rb_intern("to_ptr"), 0);
-        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);
-	}
+	rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
       }
       break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
     }
   }
 
@@ -458,26 +445,24 @@ rb_ary2cary(char t, VALUE v, long *size)
   int len;
   VALUE val0;
 
-  val0 = rb_check_array_type(v);
-  if(NIL_P(val0)) {
+  if( TYPE(v) != T_ARRAY ){
     rb_raise(rb_eDLTypeError, "an array is expected.");
   }
-  v = val0;
 
   len = RARRAY(v)->len;
-  if (len == 0) {
+  if( len == 0 ){
     return NULL;
   }
 
-  if (!size) {
+  if( !size ){
     size = ALLOCA_N(long,1);
   }
 
   val0 = rb_ary_entry(v,0);
-  switch (TYPE(val0)) {
+  switch( TYPE(val0) ){
   case T_FIXNUM:
   case T_BIGNUM:
-    switch (t) {
+    switch( t ){
     case 'C': case 'c':
       return (void*)c_carray(v,size);
     case 'H': case 'h':
@@ -492,7 +477,7 @@ rb_ary2cary(char t, VALUE v, long *size)
   case T_STRING:
     return (void*)c_parray(v,size);
   case T_FLOAT:
-    switch (t) {
+    switch( t ){
     case 'F': case 'f':
       return (void*)c_farray(v,size);
     case 'D': case 'd': case 0:
@@ -500,15 +485,9 @@ rb_ary2cary(char t, VALUE v, long *size)
     }
     rb_raise(rb_eDLTypeError, "type mismatch");
   case T_DATA:
-    if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
+    if( rb_obj_is_kind_of(val0, rb_cDLPtrData) ){
       return (void*)c_parray(v,size);
     }
-    else{
-      val0 = rb_funcall(val0, rb_intern("to_ptr"), 0);
-      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);
@@ -537,7 +516,7 @@ rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
   VALUE t;
   long size;
 
-  switch (rb_scan_args(argc, argv, "01", &t)) {
+  switch( rb_scan_args(argc, argv, "01", &t) ){
   case 1:
     ptr = rb_ary2cary(StringValuePtr(t)[0], self, &size);
     break;
@@ -557,27 +536,25 @@ rb_io_to_ptr(VALUE self)
   GetOpenFile(self, fptr);
   fp = fptr->f;
 
-  return fp ? rb_dlptr_new(fp, 0, 0) : Qnil;
+  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);
+  str = rb_String(str);
   return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree);
 }
 
@@ -594,12 +571,11 @@ rb_dl_callback(int argc, VALUE argv[], VALUE self)
   int rettype, entry, i;
   char fname[127];
 
-  rb_secure(4);
   proc = Qnil;
-  switch (rb_scan_args(argc, argv, "11", &type, &proc)) {
+  switch( rb_scan_args(argc, argv, "11", &type, &proc) ){
   case 1:
-    if (rb_block_given_p()) {
-      proc = rb_block_proc();
+    if( rb_block_given_p() ){
+      proc = rb_f_lambda();
     }
     else{
       proc = Qnil;
@@ -608,8 +584,8 @@ rb_dl_callback(int argc, VALUE argv[], VALUE self)
     break;
   }
 
-  StringValue(type);
-  switch (RSTRING(type)->ptr[0]) {
+  Check_Type(type, T_STRING);
+  switch( RSTRING(type)->ptr[0] ){
   case '0':
     rettype = 0x00;
     break;
@@ -639,13 +615,13 @@ rb_dl_callback(int argc, VALUE argv[], VALUE self)
   }
 
   entry = -1;
-  for (i=0; i < MAX_CALLBACK; i++) {
-    if (rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(rettype), INT2NUM(i))) == Qnil) {
+  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) {
+  if( entry < 0 ){
     rb_raise(rb_eDLError, "too many callbacks are defined.");
   }
 
@@ -660,14 +636,12 @@ rb_dl_callback(int argc, VALUE argv[], VALUE self)
 static VALUE
 rb_dl_remove_callback(VALUE mod, VALUE sym)
 {
-  freefunc_t f;
+  freefunc_t f = rb_dlsym2csym(sym);
   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) {
+  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;
       }
diff --git a/ext/dl/dl.h b/ext/dl/dl.h
index 9e4e01eea5..c390e18bbb 100644
--- a/ext/dl/dl.h
+++ b/ext/dl/dl.h
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: dl.h,v 1.9 2003/12/01 23:02:44 ttate Exp $
+ * $Id$
  */
 
 #ifndef RUBY_DL_H
@@ -170,7 +170,6 @@
 # endif
 #elif defined(USE_DLSTACK)
 # define DLSTACK
-# define DLSTACK_GUARD
 # define DLSTACK_METHOD "dl"
 # define DLSTACK_PROTO long,long,long,long,long,\
                        long,long,long,long,long,\
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
index beb15ab04c..dd9c3844e4 100644
--- a/ext/dl/extconf.rb
+++ b/ext/dl/extconf.rb
@@ -26,8 +26,12 @@ if (Config::CONFIG['CC'] =~ /gcc/)  # from Win32API
   $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
 end
 
-$with_dlstack ||= true
-$with_asm = ! $with_dlstack
+if (Config::CONFIG['CC'] =~ /gcc/) && (Config::CONFIG['arch'] =~ /i.86/)
+  $with_asm = true
+else
+  $with_asm = false
+end
+$with_dlstack = ! $with_asm
 
 $with_type_int = try_cpp(<<EOF)
 #include "config.h"
@@ -127,13 +131,6 @@ if( $with_type_voidp )
   $dlconfig_h << "#define WITH_TYPE_VOIDP\n"
 end
 
-if( have_header("windows.h") )
-  have_library("kernel32")
-  have_func("GetLastError", "windows.h")
-  dlc_define("HAVE_WINDOWS_H")
-  have_windows_h = true
-end
-
 if( have_header("dlfcn.h") )
   dlc_define("HAVE_DLFCN_H")
   have_library("dl")
@@ -143,7 +140,8 @@ if( have_header("dlfcn.h") )
   if( have_func("dlerror") )
     dlc_define("HAVE_DLERROR")
   end
-elsif ( have_windows_h )
+elsif( have_header("windows.h") )
+  dlc_define("HAVE_WINDOWS_H")
   have_func("LoadLibrary")
   have_func("FreeLibrary")
   have_func("GetProcAddress")
@@ -183,9 +181,6 @@ $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
diff --git a/ext/dl/h2rb b/ext/dl/h2rb
index d5ebd6ee2c..00fbd60c82 100644
--- a/ext/dl/h2rb
+++ b/ext/dl/h2rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
-# $Id: h2rb,v 1.1 2002/04/02 10:56:13 ttate Exp $
+# $Id$
 
 require 'mkmf'
 require 'ftools'
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index 1e8c17e501..23ad5ef066 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: handle.c,v 1.11.2.1 2005/02/28 02:45:17 matz Exp $
+ * $Id$
  */
 
 #include <ruby.h>
@@ -10,7 +10,7 @@ VALUE rb_cDLHandle;
 void
 dlhandle_free(struct dl_handle *dlhandle)
 {
-  if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
+  if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
     dlclose(dlhandle->ptr);
   }
 }
@@ -50,13 +50,13 @@ rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
   int   cflag;
   const char *err;
 
-  switch (rb_scan_args(argc, argv, "11", &lib, &flag)) {
+  switch( rb_scan_args(argc, argv, "11", &lib, &flag) ){
   case 1:
-    clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
+    clib = StringValuePtr(lib);
     cflag = RTLD_LAZY | RTLD_GLOBAL;
     break;
   case 2:
-    clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
+    clib = StringValuePtr(lib);
     cflag = NUM2INT(flag);
     break;
   default:
@@ -65,24 +65,24 @@ rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
 
   ptr = dlopen(clib, cflag);
 #if defined(HAVE_DLERROR)
-  if (!ptr && (err = dlerror())) {
+  if( !ptr && (err = dlerror()) ){
     rb_raise(rb_eRuntimeError, err);
   }
 #else
-  if (!ptr) {
+  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) {
+  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()) {
+  if( rb_block_given_p() ){
     rb_ensure(rb_yield, self, rb_dlhandle_close, self);
   }
 
@@ -138,16 +138,14 @@ rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
   const char *name, *stype;
   const char *err;
 
-  rb_secure(2);
-  if (rb_scan_args(argc, argv, "11", &sym, &type) == 2) {
-    SafeStringValue(type);
+  if( rb_scan_args(argc, argv, "11", &sym, &type) == 2 ){
     stype = StringValuePtr(type);
   }
   else{
     stype = NULL;
   }
 
-  if (sym == Qnil) {
+  if( sym == Qnil ){
 #if defined(RTLD_NEXT)
     name = RTLD_NEXT;
 #else
@@ -155,21 +153,21 @@ rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
 #endif
   }
   else{
-    SafeStringValue(sym);
     name = StringValuePtr(sym);
   }
 
+
   Data_Get_Struct(self, struct dl_handle, dlhandle);
-  if (!dlhandle->open) {
-    rb_raise(rb_eRuntimeError, "closed handle");
+  if( ! dlhandle->open ){
+    rb_raise(rb_eRuntimeError, "Closed handle.");
   }
   handle = dlhandle->ptr;
 
   func = dlsym(handle, name);
 #if defined(HAVE_DLERROR)
-  if (!func && (err = dlerror()))
+  if( !func && (err = dlerror()) )
 #else
-  if (!func)
+  if( !func )
 #endif
   {
 #if defined(__CYGWIN__) || defined(WIN32) || defined(__MINGW32__)
@@ -182,16 +180,16 @@ rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
       func = dlsym(handle, name_a);
       dlfree(name_a);
 #if defined(HAVE_DLERROR)
-      if (!func && (err = dlerror()))
+      if( !func && (err = dlerror()) )
 #else
-      if (!func)
+      if( !func )
 #endif
       {
-	rb_raise(rb_eRuntimeError, "unknown symbol \"%sA\"", name);
+	rb_raise(rb_eRuntimeError, "Unknown symbol \"%sA\".", name);
       }
     }
 #else
-    rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", name);
+    rb_raise(rb_eRuntimeError, "Unknown symbol \"%s\".", name);
 #endif
   }
   val = rb_dlsym_new(func, name, stype);
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
index 63c9b2c050..b71cae30ab 100644
--- a/ext/dl/lib/dl/import.rb
+++ b/ext/dl/lib/dl/import.rb
@@ -9,11 +9,15 @@ module DL
 
     module Internal
       def init_types()
-	@types ||= ::DL::Types.new
+	if( !@types )
+	  @types = ::DL::Types.new
+	end
       end
 
       def init_sym()
-	@SYM ||= {}
+	if( !@SYM )
+	  @SYM = {}
+	end
       end
 
       def [](name)
@@ -38,10 +42,10 @@ module DL
 	case proto
 	when /^([\d\w\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
 	  ret = $1
-	  args = $2.strip()
+	  args = $2
 	  ret = ret.split(/\s+/)
 	  args = args.split(/\s*,\s*/)
-	  func = ret.pop()
+	  func = ret.pop
 	  if( func =~ /^\*/ )
 	    func.gsub!(/^\*+/,"")
 	    ret.push("*")
@@ -70,26 +74,23 @@ module DL
 	init_types()
 	init_sym()
 
-	rty,renc,rdec = @types.encode_return_type(ret)
-        if( !rty )
-          raise(TypeError, "unsupported type: #{ret}")
-        end
-	ty,enc,dec = encode_argument_types(args)
+	rty,renc,rdec = @types.encode_type(ret)
+	ty,enc,dec = encode_types(args)
 	symty = rty + ty
 
 	module_eval("module_function :#{func}")
-	sym = module_eval([
+	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 && rs)",
+	  "  rs = dec.call(rs) if dec",
 	  "  @retval = r",
 	  "  @args   = rs",
 	  "  @retval",
 	  "}",
-	].join("\n"))
+	].join("\n")
 
 	@SYM[func] = [sym,rdec,enc,dec]
 
@@ -99,10 +100,9 @@ module DL
       # example:
       #  typealias("uint", "unsigned int")
       #
-      def typealias(alias_type, ty1, enc1=nil, dec1=nil, ty2=nil, enc2=nil, dec2=nil)
+      def typealias(*args)
 	init_types()
-	@types.typealias(alias_type, ty1, enc1, dec1,
-                                     ty2||ty1, enc2, dec2)
+	@types.typealias(*args)
       end
 
       # example:
@@ -135,11 +135,8 @@ module DL
 	init_types()
 	init_sym()
 
-	rty,_,rdec = @types.encode_return_type(rettype)
-        if( !rty )
-          raise(TypeError, "unsupported type: #{rettype}")
-        end
-	ty,enc,dec = encode_argument_types(argtypes)
+	rty,_,rdec = @types.encode_type(rettype)
+	ty,enc,dec = encode_types(argtypes)
 	symty = rty + ty
 
 	sym = symbol(name, symty)
@@ -185,16 +182,13 @@ module DL
 	return @retval
       end
 
-      def encode_argument_types(tys)
+      def encode_types(tys)
 	init_types()
 	encty = []
 	enc = nil
 	dec = nil
 	tys.each_with_index{|ty,idx|
-	  ty,c1,c2 = @types.encode_argument_type(ty)
-          if( !ty )
-            raise(TypeError, "unsupported type: #{ty}")
-          end
+	  ty,c1,c2,_,_ = @types.encode_type(ty)
 	  encty.push(ty)
 	  if( enc )
 	    if( c1 )
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
index 33f303fe22..2c52d5040d 100644
--- a/ext/dl/lib/dl/struct.rb
+++ b/ext/dl/lib/dl/struct.rb
@@ -33,7 +33,7 @@ module DL
 	      "def #{name}",
 	      "  v = @ptr[\"#{name}\"]",
 	      "  if( @len[\"#{name}\"] )",
-	      "    v = v.collect{|x| @dec[\"#{name}\"] ? @dec[\"#{name}\"].call(x) : x }",
+	      "    v = v.collect{|x| @dec[\"#{name}\"].call(x) if @dec[\"#{name}\"] }",
               "  else",
 	      "    v = @dec[\"#{name}\"].call(v) if @dec[\"#{name}\"]",
 	      "  end",
@@ -41,7 +41,7 @@ module DL
 	      "end",
 	      "def #{name}=(v)",
 	      "  if( @len[\"#{name}\"] )",
-	      "    v = v.collect{|x| @enc[\"#{name}\"] ? @enc[\"#{name}\"].call(x) : x }",
+	      "    v = v.collect{|x| @enc[\"#{name}\"].call(x) if @enc[\"#{name}\"] }",
 	      "  else",
 	      "    v = @enc[\"#{name}\"].call(v) if @enc[\"#{name}\"]",
               "  end",
@@ -128,10 +128,7 @@ module DL
 	  else
 	    raise(RuntimeError, "invalid element: #{elem}")
 	  end
-	  ty,enc,dec = @types.encode_struct_type(ty)
-          if( !ty )
-            raise(TypeError, "unsupported type: #{ty}")
-          end
+	  ty,_,_,enc,dec = @types.encode_type(ty)
 	  return [name,ty,num,enc,dec]
 	end
       end  # class Struct
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
index 1144917dae..e4d79ecf03 100644
--- a/ext/dl/lib/dl/types.rb
+++ b/ext/dl/lib/dl/types.rb
@@ -6,240 +6,172 @@ module DL
   class Types
     TYPES = [
       # FORMAT:
-      # ["alias name",
-      #  "type name", encoding_method, decoding_method,   for function prototypes
-      #  "type name", encoding_method, decoding_method]   for structures (not implemented)
+      # ["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,
-                 "unsigned long", nil, nil],
-      ["PDWORD", "unsigned long *", nil, nil,
-                 "unsigned long *", nil, nil],
-      ["WORD",   "unsigned short", nil, nil,
-                 "unsigned short", nil, nil],
-      ["PWORD",  "unsigned int *", nil, nil,
-                 "unsigned int *", nil, nil],
-      ["BYTE",   "unsigned char",   nil, nil,
-                 "unsigned char", nil, nil],
-      ["PBYTE",  "unsigned char *", nil, nil,
-                 "unsigned char *", nil, nil],
-      ["BOOL",   "ibool", nil, nil,
-                 "ibool", nil, nil],
-      ["ATOM",   "int", nil, nil,
-                 "int", nil, nil],
-      ["BYTE",   "unsigned char", nil, nil,
-                 "unsigned char", nil, nil],
-      ["PBYTE",  "unsigned char *", nil, nil,
-                 "unsigned char *", nil, nil],
-      ["UINT",   "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["ULONG",  "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["UCHAR",  "unsigned char", nil, nil,
-                 "unsigned char", nil, nil],
-      ["HANDLE", "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["PHANDLE","void*", nil, nil,
-                 "void*", nil, nil],
-      ["PVOID",  "void*", nil, nil,
-                 "void*", nil, nil],
-      ["LPCSTR", "char*", nil, nil,
-                 "char*", nil, nil],
-      ["HDC",    "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["HWND",   "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
+      ["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,
-                 "unsigned int", nil, nil],
-      ["u_int",  "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["ulong",  "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["u_long", "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
+      ["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",
+      ["ibool",   "I",
 	proc{|v| v ? 1 : 0},
 	proc{|v| (v != 0) ? true : false},
-        "I",
 	proc{|v| v ? 1 : 0 },
 	proc{|v| (v != 0) ? true : false} ],
-      ["cbool",
-        "C",
+      ["cbool",   "C",
 	proc{|v| v ? 1 : 0},
 	proc{|v| (v != 0) ? true : false},
-        "C",
 	proc{|v,len| v ? 1 : 0},
 	proc{|v,len| (v != 0) ? true : false}],
-      ["lbool",
-        "L",
+      ["lbool",   "L",
 	proc{|v| v ? 1 : 0},
 	proc{|v| (v != 0) ? true : false},
-        "L",
 	proc{|v,len| v ? 1 : 0},
 	proc{|v,len| (v != 0) ? true : false}],
-      ["unsigned char",
-        "C",
+      ["unsigned char", "I",
 	proc{|v| [v].pack("C").unpack("c")[0]},
 	proc{|v| [v].pack("c").unpack("C")[0]},
-        "C",
 	proc{|v| [v].pack("C").unpack("c")[0]},
 	proc{|v| [v].pack("c").unpack("C")[0]}],
-      ["unsigned short",
-        "H",
+      ["unsigned short", "H",
 	proc{|v| [v].pack("S").unpack("s")[0]},
 	proc{|v| [v].pack("s").unpack("S")[0]},
-        "H",
 	proc{|v| [v].pack("S").unpack("s")[0]},
 	proc{|v| [v].pack("s").unpack("S")[0]}],
-      ["unsigned int",
-        "I",
+      ["unsigned int", "I",
 	proc{|v| [v].pack("I").unpack("i")[0]},
 	proc{|v| [v].pack("i").unpack("I")[0]},
-        "I",
 	proc{|v| [v].pack("I").unpack("i")[0]},
 	proc{|v| [v].pack("i").unpack("I")[0]}],
-      ["unsigned long",
-        "L",
+      ["unsigned long", "L",
 	proc{|v| [v].pack("L").unpack("l")[0]},
 	proc{|v| [v].pack("l").unpack("L")[0]},
-        "L",
 	proc{|v| [v].pack("L").unpack("l")[0]},
 	proc{|v| [v].pack("l").unpack("L")[0]}],
-      ["unsigned char ref",
-        "c",
+      ["unsigned char ref", "i",
 	proc{|v| [v].pack("C").unpack("c")[0]},
 	proc{|v| [v].pack("c").unpack("C")[0]},
-	nil, nil, nil],
-      ["unsigned int ref",
-        "i",
+	nil, nil],
+      ["unsigned int ref", "i",
 	proc{|v| [v].pack("I").unpack("i")[0]},
 	proc{|v| [v].pack("i").unpack("I")[0]},
-	nil, nil, nil],
-      ["unsigned long ref",
-        "l",
+	nil, nil],
+      ["unsigned long ref", "l",
 	proc{|v| [v].pack("L").unpack("l")[0]},
 	proc{|v| [v].pack("l").unpack("L")[0]},
-	nil, nil, nil],
-      ["char ref",  "c", nil, nil,
-                    nil, nil, nil],
-      ["short ref", "h", nil, nil,
-                    nil, nil, nil],
-      ["int ref",   "i", nil, nil,
-                    nil, nil, nil],
-      ["long ref",  "l", nil, nil,
-                    nil, nil, nil],
-      ["float ref", "f", nil, nil,
-                    nil, nil, nil],
-      ["double ref","d", nil, nil,
-                    nil, nil, nil],
-      ["char",   "C", nil, nil,
-                 "C", nil, nil],
-      ["short",  "H", nil, nil,
-                 "H", nil, nil],
-      ["int",    "I", nil, nil,
-                 "I", nil, nil],
-      ["long",   "L", nil, nil,
-                 "L", nil, nil],
-      ["float",  "F", nil, nil,
-                 "F", nil, nil],
-      ["double", "D", nil, nil,
-                 "D", nil, nil],
-      [/^char\s*\*$/,"s",nil, nil,
-                     "S",nil, nil],
-      [/^const char\s*\*$/,"S",nil, nil,
-                           "S",nil, nil],
-      [/^.+\*$/,   "P", nil, nil,
-                   "P", nil, nil],
-      [/^.+\[\]$/, "a", nil, nil,
-                   "a", nil, nil],
-      ["void",   "0", nil, nil,
-                 nil, nil, nil],
+	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, ty3=nil, senc=nil, sdec=nil)
-      @TYDEFS.unshift([ty1, ty2, enc, dec, ty3, senc, sdec])
+    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_argument_type(alias_type)
-      proc_encode = nil
-      proc_decode = nil
-      @TYDEFS.each{|aty,ty,enc,dec,_,_,_|
-	if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
-	  alias_type = alias_type.gsub(aty,ty) if ty
-          alias_type.strip! if alias_type
-	  if( proc_encode )
-	    if( enc )
-	      conv1 = proc_encode
-	      proc_encode = proc{|v| enc.call(conv1.call(v))}
+    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( enc )
-	      proc_encode = enc
+	    if( c1 )
+	      enc = c1
 	    end
 	  end
-	  if( proc_decode )
-	    if( dec )
-	      conv2 = proc_decode
-	      proc_decode = proc{|v| dec.call(conv2.call(v))}
+	  if( dec )
+	    if( c2 )
+	      conv2 = dec
+	      dec = proc{|v| c2.call(conv2.call(v))}
 	    end
 	  else
-	    if( dec )
-	      proc_decode = dec
+	    if( c2 )
+	      dec = c2
 	    end
 	  end
-	end
-      }
-      return [alias_type, proc_encode, proc_decode]
-    end
-
-    def encode_return_type(ty)
-      ty, enc, dec = encode_argument_type(ty)
-      return [ty, enc, dec]
-    end
-
-    def encode_struct_type(alias_type)
-      proc_encode = nil
-      proc_decode = nil
-      @TYDEFS.each{|aty,_,_,_,ty,enc,dec|
-	if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
-	  alias_type = alias_type.gsub(aty,ty) if ty
-          alias_type.strip! if alias_type
-	  if( proc_encode )
-	    if( enc )
-	      conv1 = proc_encode
-	      proc_encode = proc{|v| enc.call(conv1.call(v))}
+	  if( senc )
+	    if( c3 )
+	      conv3 = senc
+	      senc = proc{|v| c3.call(conv3.call(v))}
 	    end
 	  else
-	    if( enc )
-	      proc_encode = enc
+	    if( c3 )
+	      senc = c3
 	    end
 	  end
-	  if( proc_decode )
-	    if( dec )
-	      conv2 = proc_decode
-	      proc_decode = proc{|v| dec.call(conv2.call(v))}
+	  if( sdec )
+	    if( c4 )
+	      conv4 = sdec
+	      sdec = proc{|v| c4.call(conv4.call(v))}
 	    end
 	  else
-	    if( dec )
-	      proc_decode = dec
+	    if( c4 )
+	      sdec = c4
 	    end
 	  end
 	end
       }
-      return [alias_type, proc_encode, proc_decode]
+      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
index 0fed47c324..92f473d392 100644
--- a/ext/dl/lib/dl/win32.rb
+++ b/ext/dl/lib/dl/win32.rb
@@ -6,7 +6,7 @@ class Win32API
   DLL = {}
 
   def initialize(dllname, func, import, export = "0")
-    prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
+    prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI")
     handle = DLL[dllname] ||= DL::Handle.new(dllname)
     @sym = handle.sym(func, prototype)
   end
diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb
index c9f92e4a0d..b7ea1718d0 100644
--- a/ext/dl/mkcallback.rb
+++ b/ext/dl/mkcallback.rb
@@ -31,9 +31,6 @@ def mkfunc(rettype, fnum, argc)
     subst_code,
     "",
     "  obj = rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(#{rettype.to_s}),INT2NUM(#{fnum.to_s})));",
-    "  if(NIL_P(obj))",
-    "    rb_raise(rb_eDLError, \"callback function does not exist in DL::FuncTable\");",
-    "  Check_Type(obj, T_ARRAY);",
     "  proto = rb_ary_entry(obj, 0);",
     "  proc  = rb_ary_entry(obj, 1);",
     "  Check_Type(proto, T_STRING);",
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c
index 574d4241bf..60f4ad00ed 100644
--- a/ext/dl/ptr.c
+++ b/ext/dl/ptr.c
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: ptr.c,v 1.19.2.1 2006/05/25 16:37:57 ttate Exp $
+ * $Id$
  */
 
 #include <ruby.h>
@@ -26,14 +26,13 @@ rb_hash_delete(VALUE hash, VALUE key)
 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) {
+  if( obj == Qnil ){
     rb_dlmem_delete(ptr);
   }
   else{
@@ -53,22 +52,22 @@ rb_dlmem_aref(void *ptr)
 void
 dlptr_free(struct ptr_data *data)
 {
-  if (data->ptr) {
+  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) {
+    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);
+  if( data->stype ) dlfree(data->stype);
+  if( data->ssize ) dlfree(data->ssize);
+  if( data->ids  ) dlfree(data->ids);
 }
 
 void
@@ -82,7 +81,6 @@ dlptr_init(VALUE val)
 	   data->ptr);
   });
   rb_dlmem_aset(data->ptr, val);
-  OBJ_TAINT(val);
 }
 
 VALUE
@@ -91,10 +89,9 @@ rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
   struct ptr_data *data;
   VALUE val;
 
-  rb_secure(4);
-  if (ptr) {
+  if( ptr ){
     val = rb_dlmem_aref(ptr);
-    if (val == Qnil) {
+    if( val == Qnil ){
       val = Data_Make_Struct(klass, struct ptr_data,
 			     0, dlptr_free, data);
       data->ptr = ptr;
@@ -109,7 +106,7 @@ rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
       dlptr_init(val);
     }
     else{
-      if (func) {
+      if( func ){
 	Data_Get_Struct(val, struct ptr_data, data);
 	data->free = func;
       }
@@ -133,7 +130,6 @@ 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);
@@ -145,11 +141,11 @@ rb_dlptr2cptr(VALUE val)
   struct ptr_data *data;
   void *ptr;
 
-  if (rb_obj_is_kind_of(val, rb_cDLPtrData)) {
+  if( rb_obj_is_kind_of(val, rb_cDLPtrData) ){
     Data_Get_Struct(val, struct ptr_data, data);
     ptr = data->ptr;
   }
-  else if (val == Qnil) {
+  else if( val == Qnil ){
     ptr = NULL;
   }
   else{
@@ -165,7 +161,6 @@ 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;
@@ -189,7 +184,7 @@ rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
   freefunc_t f = NULL;
   long s = 0;
 
-  switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
+  switch( rb_scan_args(argc, argv, "12", &ptr, &size, &sym) ){
   case 1:
     p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
     break;
@@ -206,9 +201,9 @@ rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
     rb_bug("rb_dlptr_initialize");
   }
 
-  if (p) {
+  if( p ){
     Data_Get_Struct(self, struct ptr_data, data);
-    if (data->ptr && data->free) {
+    if( data->ptr && data->free ){
       /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
       (*(data->free))(data->ptr);
     }
@@ -227,7 +222,7 @@ rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
   int   s;
   freefunc_t f = NULL;
 
-  switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
+  switch( rb_scan_args(argc, argv, "11", &size, &sym) ){
   case 1:
     s = NUM2INT(size);
     break;
@@ -314,14 +309,14 @@ rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
 
   Data_Get_Struct(self, struct ptr_data, data);
 
-  switch (rb_scan_args(argc, argv, "11", &type, &size)) {
+  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) {
+    switch( t ){
     case 'C':
       n = data->size;
       break;
@@ -340,14 +335,18 @@ rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
     case 'D':
       n = data->size / sizeof(double);
       break;
-    case  'P': case 'p':
+    case  'S': case 'P':
       n = data->size / sizeof(void*);
       break;
-    case 'S': case 's':
-      for (n=0; ((void**)(data->ptr))[n]; n++) {};
-      break;
     default:
+      if( t == 'p' || t == 's' ){
+	int i;
+	for( i=0; ((void**)(data->ptr))[i]; i++ ){};
+	n = i;
+      }
+      else{
 	n = 0;
+      }
     }
     break;
   default:
@@ -356,8 +355,8 @@ rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
 
   ary = rb_ary_new();
 
-  for (i=0; i < n; i++) {
-    switch (t) {
+  for( i=0; i < n; i++ ){
+    switch( t ){
     case 'C':
       rb_ary_push(ary, INT2NUM(((char*)(data->ptr))[i]));
       break;
@@ -372,14 +371,13 @@ rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
       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) {
+	if( str ){
 	  rb_ary_push(ary, rb_tainted_str_new2(str));
 	}
 	else{
@@ -390,7 +388,7 @@ rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
     case 's':
       {
 	char *str = ((char**)(data->ptr))[i];
-	if (str) {
+	if( str ){
 	  rb_ary_push(ary, rb_tainted_str_new2(str));
 	  xfree(str);
 	}
@@ -421,7 +419,7 @@ rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
   int len;
 
   Data_Get_Struct(self, struct ptr_data, data);
-  switch (rb_scan_args(argc, argv, "01", &arg1)) {
+  switch( rb_scan_args(argc, argv, "01", &arg1) ){
   case 0:
     val = rb_tainted_str_new2((char*)(data->ptr));
     break;
@@ -444,7 +442,7 @@ rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
   int len;
 
   Data_Get_Struct(self, struct ptr_data, data);
-  switch (rb_scan_args(argc, argv, "01", &arg1)) {
+  switch( rb_scan_args(argc, argv, "01", &arg1) ){
   case 0:
     val = rb_tainted_str_new((char*)(data->ptr),data->size);
     break;
@@ -466,9 +464,8 @@ rb_dlptr_inspect(VALUE self)
   char str[1024];
 
   Data_Get_Struct(self, struct ptr_data, data);
-  snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>",
-	   rb_class2name(CLASS_OF(self)), data, data->ptr, data->size,
-	   (long)data->free);
+  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);
 }
 
@@ -526,16 +523,16 @@ rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self)
   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) {
+  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) {
+      if( data->stype ){
 	dlfree(data->stype);
 	data->stype = NULL;
       }
-      if (data->ids) {
+      if( data->ids ){
 	dlfree(data->ids);
 	data->ids = NULL;
       }
@@ -550,29 +547,32 @@ rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self)
   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));
+  for( i=0; i<num; i++ ){
+    vid = rb_ary_entry(rest,i);
+    if( !(TYPE(vid)==T_STRING || TYPE(vid)==T_SYMBOL) ){
+      rb_raise(rb_eTypeError, "#%d must be a string or symbol", i + 2);
+    }
   }
 
   data->ctype = t;
   data->slen = num;
   data->ids_num  = num;
-  if (data->stype) dlfree(data->stype);
+  if( data->stype ) dlfree(data->stype);
   data->stype = (char*)dlmalloc(sizeof(char) * num);
-  if (data->ssize) dlfree(data->ssize);
+  if( data->ssize ) dlfree(data->ssize);
   data->ssize = (int*)dlmalloc(sizeof(int) * num);
-  if (data->ids) dlfree(data->ids);
+  if( data->ids ) dlfree(data->ids);
   data->ids  = (ID*)dlmalloc(sizeof(ID) * data->ids_num);
 
   ctype = StringValuePtr(type);
-  for (i=0; i<num; i++) {
+  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)) {
+    if( isdigit(*ctype) ){
       char *p, *d;
-      for (p=ctype; isdigit(*p); p++) ;
+      for( p=ctype; isdigit(*p); p++ ) ;
       d = ALLOCA_N(char, p - ctype + 1);
       strncpy(d, ctype, p - ctype);
       d[p - ctype] = '\0';
@@ -584,11 +584,11 @@ rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self)
     }
   }
 
-  if (*ctype) {
+  if( *ctype ){
     rb_raise(rb_eArgError, "too few/many arguments");
   }
 
-  if (!data->size)
+  if( !data->size )
     data->size = dlsizeof(RSTRING(type)->ptr);
 
   return Qnil;
@@ -603,7 +603,7 @@ rb_dlptr_define_struct(int argc, VALUE argv[], VALUE self)
   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++) {
+  for( i=1; i<pass_argc; i++ ){
     pass_argv[i] = argv[i-1];
   }
   return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
@@ -618,7 +618,7 @@ rb_dlptr_define_union(int argc, VALUE argv[], VALUE self)
   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++) {
+  for( i=1; i<pass_argc; i++ ){
     pass_argv[i] = argv[i-1];
   }
   return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
@@ -630,7 +630,7 @@ rb_dlptr_get_data_type(VALUE self)
   struct ptr_data *data;
 
   Data_Get_Struct(self, struct ptr_data, data);
-  if (data->stype)
+  if( data->stype )
     return rb_assoc_new(INT2FIX(data->ctype),
 			rb_tainted_str_new(data->stype, data->slen));
   else
@@ -644,11 +644,11 @@ cary2ary(void *ptr, char t, int len)
   VALUE elem;
   int i;
 
-  if (len < 1)
+  if( len < 1 )
     return Qnil;
 
-  if (len == 1) {
-    switch (t) {
+  if( len == 1 ){
+    switch( t ){
     case 'I':
       elem = INT2NUM(*((int*)ptr));
       ptr = (char *)ptr + sizeof(int);
@@ -685,8 +685,8 @@ cary2ary(void *ptr, char t, int len)
   }
 
   ary = rb_ary_new();
-  for (i=0; i < len; i++) {
-    switch (t) {
+  for( i=0; i < len; i++ ){
+    switch( t ){
     case 'I':
       elem = INT2NUM(*((int*)ptr));
       ptr = (char *)ptr + sizeof(int);
@@ -734,55 +734,55 @@ rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
   int i;
   int offset;
 
-  if (rb_scan_args(argc, argv, "11", &key, &num) == 1) {
+  if( rb_scan_args(argc, argv, "11", &key, &num) == 1 ){
     num = INT2NUM(0);
   }
 
-  if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
+  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)) {
+
+  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) {
+  switch( data->ctype ){
   case DLPTR_CTYPE_STRUCT:
-    for (i=0; i < data->ids_num; i++) {
-      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]);
-      }
-      if (data->ids[i] == id) {
+    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]) {
+      switch( data->stype[i] ){
       case 'I':
 	offset += sizeof(int) * data->ssize[i];
 	break;
@@ -811,8 +811,8 @@ rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
     }
     break;
   case DLPTR_CTYPE_UNION:
-    for (i=0; i < data->ids_num; i++) {
-      if (data->ids[i] == id) {
+    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]);
       }
     }
@@ -830,7 +830,7 @@ ary2cary(char t, VALUE val, long *size)
 {
   void *ptr;
 
-  if (TYPE(val) == T_ARRAY) {
+  if( TYPE(val) == T_ARRAY ){
     ptr = rb_ary2cary(t, val, size);
   }
   else{
@@ -850,15 +850,14 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
   long memsize;
   void *memimg;
 
-  rb_secure(4);
-  switch (rb_scan_args(argc, argv, "21", &key, &num, &val)) {
+  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) {
+  if( TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM ){
     void *dst, *src;
     long len;
 
@@ -867,55 +866,58 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
     dst = (void*)((long)(data->ptr) + DLNUM2LONG(key));
     src = RSTRING(val)->ptr;
     len = RSTRING(val)->len;
-    if (num == Qnil) {
+    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);
+      if( n > len ) MEMZERO((char*)dst + len, char, n - len);
     }
     return val;
   }
 
+  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);
-  switch (data->ctype) {
+  switch( data->ctype ){
   case DLPTR_CTYPE_STRUCT:
     offset = 0;
-    for (i=0; i < data->ids_num; i++) {
-      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]);
-      }
-      if (data->ids[i] == id) {
+    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);
-        dlfree(memimg);
 	return val;
       }
-      switch (data->stype[i]) {
+      switch( data->stype[i] ){
       case 'I':
       case 'i':
 	offset += sizeof(int) * data->ssize[i];
@@ -953,9 +955,9 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
     return val;
     /* break; */
   case DLPTR_CTYPE_UNION:
-    for (i=0; i < data->ids_num; i++) {
-      if (data->ids[i] == id) {
-	switch (data->stype[i]) {
+    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;
@@ -983,7 +985,6 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
 	}
 	memimg = ary2cary(data->stype[i], val, NULL);
 	memcpy(data->ptr, memimg, memsize);
-        dlfree(memimg);
       }
     }
     return val;
@@ -1001,7 +1002,7 @@ rb_dlptr_size(int argc, VALUE argv[], VALUE self)
 {
   VALUE size;
 
-  if (rb_scan_args(argc, argv, "01", &size) == 0){
+  if( rb_scan_args(argc, argv, "01", &size) == 0){
     return DLLONG2NUM(RDLPTR(self)->size);
   }
   else{
diff --git a/ext/dl/sample/libc.rb b/ext/dl/sample/libc.rb
index a1f6fbe543..32816fd331 100644
--- a/ext/dl/sample/libc.rb
+++ b/ext/dl/sample/libc.rb
@@ -39,7 +39,7 @@ module LIBC
   def my_compare(ptr1, ptr2)
     ptr1.ptr.to_s <=> ptr2.ptr.to_s
   end
-  COMPARE = callback("int my_compare(char**, char**)")
+  COMPARE = callback "int my_compare(char**, char**)"
 end
 
 
diff --git a/ext/dl/sym.c b/ext/dl/sym.c
index 2ca16a8698..95a813cc1f 100644
--- a/ext/dl/sym.c
+++ b/ext/dl/sym.c
@@ -1,9 +1,8 @@
 /* -*- C -*-
- * $Id: sym.c,v 1.24.2.3 2005/06/15 23:39:27 ocean Exp $
+ * $Id$
  */
 
 #include <ruby.h>
-#include <errno.h>
 #include "dl.h"
 
 VALUE rb_cDLSymbol;
@@ -78,7 +77,6 @@ rb_dlsym_new(void (*func)(), const char *name, const char *type)
   struct sym_data *data;
   const char *ptype;
 
-  rb_secure(4);
   if( !type || !type[0] ){
     return rb_dlptr_new((void*)func, 0, 0);
   }
@@ -154,9 +152,8 @@ rb_dlsym_initialize(int argc, VALUE argv[], VALUE self)
   rb_scan_args(argc, argv, "12", &addr, &name, &type);
 
   saddr = (void*)(DLNUM2LONG(rb_Integer(addr)));
-  if (!NIL_P(name)) StringValue(name);
+  sname = NIL_P(name) ? NULL : StringValuePtr(name);
   stype = NIL_P(type) ? NULL : StringValuePtr(type);
-  sname = NIL_P(name) ? NULL : RSTRING(name)->ptr;
 
   if( saddr ){
     Data_Get_Struct(self, struct sym_data, data);
@@ -268,7 +265,7 @@ rb_dlsym_inspect(VALUE self)
   str_size = RSTRING(proto)->len + 100;
   str = dlmalloc(str_size);
   snprintf(str, str_size - 1,
-          "#<DL::Symbol:0x%lx func=0x%lx '%s'>",
+	   "#<DL::Symbol:0x%p func=0x%p '%s'>",
 	   sym, sym->func, RSTRING(proto)->ptr);
   val = rb_tainted_str_new2(str);
   dlfree(str);
@@ -318,125 +315,6 @@ stack_size(struct sym_data *sym)
   return size;
 }
 
-static ID rb_dl_id_DLErrno;
-
-static VALUE
-rb_dl_get_last_error(VALUE self)
-{
-  return rb_thread_local_aref(rb_thread_current(), rb_dl_id_DLErrno);
-}
-
-static VALUE
-rb_dl_set_last_error(VALUE self, VALUE val)
-{
-  errno = NUM2INT(val);
-  rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLErrno, val);
-  return Qnil;
-}
-
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-static ID rb_dl_id_DLW32Error;
-
-static VALUE
-rb_dl_win32_get_last_error(VALUE self)
-{
-  return rb_thread_local_aref(rb_thread_current(), rb_dl_id_DLW32Error);
-}
-
-static VALUE
-rb_dl_win32_set_last_error(VALUE self, VALUE val)
-{
-    SetLastError(NUM2INT(val));
-    rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLW32Error, val);
-    return Qnil;
-}
-#endif
-
-#ifdef DLSTACK_GUARD
-# ifdef __MSVC_RUNTIME_CHECKS
-#  pragma runtime_checks("s", off)
-# endif
-# if _MSC_VER >= 1300
-__declspec(noinline)
-# endif
-static int
-rb_dlsym_guardcall(char type, ANY_TYPE *ret, long *stack, void *func)
-{
-  char *volatile guard = ALLOCA_N(char, 1); /* guard stack pointer */
-  switch(type){
-  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:
-    return 0;
-  }
-  return 1;
-}
-# ifdef __MSVC_RUNTIME_CHECKS
-#  pragma runtime_checks("s", restore)
-# endif
-#endif /* defined(DLSTACK_GUARD) */
-
 VALUE
 rb_dlsym_call(int argc, VALUE argv[], VALUE self)
 {
@@ -451,7 +329,6 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
   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);
@@ -520,11 +397,11 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
       PUSH_P(ftype);
       break;
     case 'H':
-      ANY2H(args[i]) = DLSHORT(NUM2INT(argv[i]));
+      ANY2H(args[i]) = DLSHORT(NUM2CHR(argv[i]));
       PUSH_C(ftype);
       break;
     case 'h':
-      ANY2H(dargs[i]) = DLSHORT(NUM2INT(argv[i]));
+      ANY2H(dargs[i]) = DLSHORT(NUM2CHR(argv[i]));
       ANY2P(args[i]) = DLVOIDP(&(ANY2H(dargs[i])));
       dtypes[i] = 'h';
       PUSH_P(ftype);
@@ -578,20 +455,20 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
 	ANY2S(args[i]) = DLSTR(0);
       }
       else{
-	VALUE str = argv[i];
-	SafeStringValue(str);
-	ANY2S(args[i]) = DLSTR(RSTRING(str)->ptr);
+	if( TYPE(argv[i]) != T_STRING ){
+	  rb_raise(rb_eDLError, "#%d must be a string",i);
+	}
+	ANY2S(args[i]) = DLSTR(RSTRING(argv[i])->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';
+      if( TYPE(argv[i]) != T_STRING ){
+	rb_raise(rb_eDLError, "#%d must be a string",i);
       }
+      ANY2S(args[i]) = DLSTR(dlmalloc(RSTRING(argv[i])->len + 1));
+      memcpy((char*)(ANY2S(args[i])), RSTRING(argv[i])->ptr, RSTRING(argv[i])->len + 1);
+      dtypes[i] = 's';
       PUSH_P(ftype);
       break;
     default:
@@ -727,12 +604,6 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
   }
   DLSTACK_END(sym->type);
 
-#ifdef DLSTACK_GUARD
-  if(!rb_dlsym_guardcall(sym->type[0], &ret, stack, func)) {
-    FREE_ARGS;
-    rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
-  }
-#else /* defined(DLSTACK_GUARD) */
   {
     switch( sym->type[0] ){
     case '0':
@@ -802,23 +673,6 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
       rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
     }
   }
-#endif /* defubed(DLSTACK_GUARD) */
-
-  {
-    /*
-     * We should get the value of errno/GetLastError() before calling another functions.
-     */
-    int last_errno = errno;
-#ifdef _WIN32
-    DWORD win32_last_err = GetLastError();
-#endif
-
-    rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLErrno, INT2NUM(last_errno));
-#ifdef _WIN32
-    rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLW32Error, INT2NUM(win32_last_err));
-#endif
-  }
-
   }
 #else /* defined(DLSTACK) */
   switch(ftype){
@@ -941,7 +795,6 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
     }
   }
 
-  FREE_ARGS;
 #undef FREE_ARGS
   return rb_assoc_new(val,dvals);
 }
@@ -980,13 +833,4 @@ Init_dlsym()
   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);
-
-  rb_dl_id_DLErrno = rb_intern("DLErrno");
-  rb_define_singleton_method(rb_mDL, "last_error", rb_dl_get_last_error, 0);  
-  rb_define_singleton_method(rb_mDL, "last_error=", rb_dl_set_last_error, 1);
-#ifdef _WIN32
-  rb_dl_id_DLW32Error = rb_intern("DLW32Error");
-  rb_define_singleton_method(rb_mDL, "win32_last_error", rb_dl_win32_get_last_error, 0);
-  rb_define_singleton_method(rb_mDL, "win32_last_error=", rb_dl_win32_set_last_error, 1);
-#endif
 }
diff --git a/ext/dl/test/test.rb b/ext/dl/test/test.rb
index bf8dfc18e3..52be04699f 100644
--- a/ext/dl/test/test.rb
+++ b/ext/dl/test/test.rb
@@ -273,7 +273,7 @@ assert("data_aref", :must,
 
 GC.start
 
-ptr = DL::malloc(32)
+ptr = DL::malloc(1024)
 ptr.struct!("CHIL", "c", "h", "i", "l")
 ptr["c"] = 1
 ptr["h"] = 2
@@ -291,16 +291,5 @@ ptr["n"] = 10
 ptr["ptr"] = nil
 assert("struct!", :must, ptr["n"] == 10 && ptr["ptr"] == nil)
 
-ptr = DL::malloc(16)
-ptr.struct!("CICI", "c1", "i1", "c2", "i2")
-ptr["c1"] = 0xf1
-ptr["c2"] = 0xf2
-c1 = [ptr["c1"]].pack("c").unpack("C")[0]
-c2 = [ptr["c2"]].pack("c").unpack("C")[0]
-assert("struct!", :must,
-  c1 == 0xf1 &&
-  c2 == 0xf2)
-
-
 GC.start
 printf("fail/total = #{$FAIL}/#{$TOTAL}\n")
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/enumerator.c b/ext/enumerator/enumerator.c
deleted file mode 100644
index 7b8f109e38..0000000000
--- a/ext/enumerator/enumerator.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/************************************************
-
-  enumerator.c - provides Enumerator class
-
-  $Author: matz $
-
-  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: enumerator.c,v 1.3.2.3 2005/10/24 00:07:00 matz Exp $
-
-************************************************/
-
-#include "ruby.h"
-#include "node.h"
-
-/*
- * Document-class: Enumerable::Enumerator
- *
- * A class which provides a method `each' to be used as an Enumerable
- * object.
- */
-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;
-
-/*
- *  call-seq:
- *    obj.to_enum(method = :each, *args)
- *    obj.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)
- *
- */
-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);
-}
-
-/*
- *  call-seq:
- *    enum_with_index
- *
- *  Returns Enumerable::Enumerator.new(self, :each_with_index).
- *
- */
-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;
-}
-
-/*
- *  call-seq:
- *    e.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]
- *
- */
-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);
-
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *    e.enum_slice(n)
- *
- *  Returns Enumerable::Enumerator.new(self, :each_slice, n).
- *
- */
-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;
-
-    if (RARRAY(ary)->len == size) {
-	rb_ary_shift(ary);
-    }
-    rb_ary_push(ary, val);
-    if (RARRAY(ary)->len == size) {
-	rb_yield(rb_ary_dup(ary));
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *    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]
- *
- */
-static VALUE
-enum_each_cons(obj, n)
-    VALUE obj, n;
-{
-    long size = NUM2LONG(n);
-    NODE *memo;
-
-    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);
-
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *    e.enum_cons(n)
- *
- *  Returns Enumerable::Enumerator.new(self, :each_cons, n).
- *
- */
-static VALUE
-enumerator_enum_cons(obj, n)
-    VALUE obj, n;
-{
-    return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_cons, n);
-}
-
-/*
- *  call-seq:
- *    Enumerable::Enumerator.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"]
- *
- */
-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);
-}
-
-/*
- *  call-seq:
- *    enum.each {...}
- *
- *  Iterates the given block using the object and the method specified
- *  in the first place.
- *
- */
-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);
-    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 1b84c0c088..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: enumerator.txt,v 1.2 2003/10/17 14:09:43 knu Exp $
-
-** 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/enumerator/extconf.rb b/ext/enumerator/extconf.rb
deleted file mode 100644
index 94e2ee38b2..0000000000
--- a/ext/enumerator/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('enumerator')
diff --git a/ext/etc/MANIFEST b/ext/etc/MANIFEST
new file mode 100644
index 0000000000..62cf5be233
--- /dev/null
+++ b/ext/etc/MANIFEST
@@ -0,0 +1,6 @@
+MANIFEST
+etc.c
+etc.txt
+etc.txt.ja
+depend
+extconf.rb
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 084405408f..ea8cb61802 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -2,8 +2,8 @@
 
   etc.c -
 
-  $Author: shyouhei $
-  $Date: 2007/01/09 12:24:20 $
+  $Author$
+  $Date$
   created at: Tue Mar 22 18:39:19 JST 1994
 
 ************************************************/
@@ -23,22 +23,11 @@
 #include <grp.h>
 #endif
 
-#ifndef HAVE_TYPE_UID_T
-#define uid_t int
-#endif
-
 static VALUE sPasswd, sGroup;
 
-#ifndef _WIN32
 char *getenv();
-#endif
 char *getlogin();
 
-/* Returns the short user name of the currently logged in user.
- *
- * e.g.
- *   Etc.getlogin -> 'guest'
- */
 static VALUE
 etc_getlogin(obj)
     VALUE obj;
@@ -58,16 +47,6 @@ etc_getlogin(obj)
     return Qnil;
 }
 
-#if defined(HAVE_GETPWENT) || defined(HAVE_GETGRENT)
-static VALUE
-safe_setup_str(str)
-    const char *str;
-{
-    if (str == 0) str = "";
-    return rb_tainted_str_new2(str);
-}
-#endif
-
 #ifdef HAVE_GETPWENT
 static VALUE
 setup_passwd(pwd)
@@ -75,49 +54,38 @@ setup_passwd(pwd)
 {
     if (pwd == 0) rb_sys_fail("/etc/passwd");
     return rb_struct_new(sPasswd,
-			 safe_setup_str(pwd->pw_name),
-#ifdef HAVE_ST_PW_PASSWD
-			 safe_setup_str(pwd->pw_passwd),
-#endif
-			 PW_UID2VAL(pwd->pw_uid),
-			 PW_GID2VAL(pwd->pw_gid),
+			 rb_tainted_str_new2(pwd->pw_name),
+			 rb_tainted_str_new2(pwd->pw_passwd),
+			 INT2FIX(pwd->pw_uid),
+			 INT2FIX(pwd->pw_gid),
 #ifdef HAVE_ST_PW_GECOS
-			 safe_setup_str(pwd->pw_gecos),
+			 rb_tainted_str_new2(pwd->pw_gecos),
 #endif
-			 safe_setup_str(pwd->pw_dir),
-			 safe_setup_str(pwd->pw_shell),
+			 rb_tainted_str_new2(pwd->pw_dir),
+			 rb_tainted_str_new2(pwd->pw_shell),
 #ifdef HAVE_ST_PW_CHANGE
-			 INT2NUM(pwd->pw_change),
+			 INT2FIX(pwd->pw_change),
 #endif
 #ifdef HAVE_ST_PW_QUOTA
-			 INT2NUM(pwd->pw_quota),
+			 INT2FIX(pwd->pw_quota),
 #endif
 #ifdef HAVE_ST_PW_AGE
-			 PW_AGE2VAL(pwd->pw_age),
+			 INT2FIX(pwd->pw_age),
 #endif
 #ifdef HAVE_ST_PW_CLASS
-			 safe_setup_str(pwd->pw_class),
+			 rb_tainted_str_new2(pwd->pw_class),
 #endif
 #ifdef HAVE_ST_PW_COMMENT
-			 safe_setup_str(pwd->pw_comment),
+			 rb_tainted_str_new2(pwd->pw_comment),
 #endif
 #ifdef HAVE_ST_PW_EXPIRE
-			 INT2NUM(pwd->pw_expire),
+			 INT2FIX(pwd->pw_expire),
 #endif
 			 0		/*dummy*/
 	);
 }
 #endif
 
-/* Returns the /etc/passwd information for the user with specified integer
- * user id (uid).
- *
- * The information is returned as a Struct::Passwd; see getpwent above for
- * details.
- *
- * e.g.  * Etc.getpwuid(0) -> #<struct Struct::Passwd name="root",
- * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
- */
 static VALUE
 etc_getpwuid(argc, argv, obj)
     int argc;
@@ -126,12 +94,12 @@ etc_getpwuid(argc, argv, obj)
 {
 #if defined(HAVE_GETPWENT)
     VALUE id;
-    uid_t uid;
+    int uid;
     struct passwd *pwd;
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &id) == 1) {
-	uid = PW_VAL2UID(id);
+	uid = NUM2INT(id);
     }
     else {
 	uid = getuid();
@@ -144,14 +112,6 @@ etc_getpwuid(argc, argv, obj)
 #endif
 }
 
-/* Returns the /etc/passwd information for the user with specified login name.
- *
- * The information is returned as a Struct::Passwd; see getpwent above for
- * details.
- *
- * e.g.  * Etc.getpwnam('root') -> #<struct Struct::Passwd name="root",
- * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
- */
 static VALUE
 etc_getpwnam(obj, nam)
     VALUE obj, nam;
@@ -191,21 +151,6 @@ passwd_iterate()
 }
 #endif
 
-/* Provides a convenient Ruby iterator which executes a block for each entry 
- * in the /etc/passwd file.
- *
- * The code block is passed an Etc::Passwd struct; see getpwent above for 
- * details.
- *
- * Example:
- *
- *     require 'etc'
- *
- *     Etc.passwd {|u|
- *       puts u.name + " = " + u.gecos
- *     }
- *
- */
 static VALUE
 etc_passwd(obj)
     VALUE obj;
@@ -228,72 +173,6 @@ etc_passwd(obj)
     return Qnil;
 }
 
-/* Resets the process of reading the /etc/passwd file, so that the next call
- * to getpwent will return the first entry again.
- */
-static VALUE
-etc_setpwent(obj)
-    VALUE obj;
-{
-#ifdef HAVE_GETPWENT
-    setpwent();
-#endif
-    return Qnil;
-}
-
-/* Ends the process of scanning through the /etc/passwd file begun with
- * getpwent, and closes the file.
- */
-static VALUE
-etc_endpwent(obj)
-    VALUE obj;
-{
-#ifdef HAVE_GETPWENT
-    endpwent();
-#endif
-    return Qnil;
-}
-
-/* Returns an entry from the /etc/passwd file. The first time it is called it
- * opens the file and returns the first entry; each successive call returns 
- * the next entry, or nil if the end of the file has been reached.
- *
- * To close the file when processing is complete, call endpwent.
- *
- * Each entry is returned as a Struct::Passwd:
- *
- * - Passwd#name contains the short login name of the user as a String.
- *
- * - Passwd#passwd contains the encrypted password of the user as a String.
- *   an 'x' is returned if shadow passwords are in use. An '*' is returned
- *   if the user cannot log in using a password.
- *
- * - Passwd#uid contains the integer user ID (uid) of the user.
- *
- * - Passwd#gid contains the integer group ID (gid) of the user's primary group.
- *
- * - Passwd#gecos contains a longer String description of the user, such as 
- *   a full name. Some Unix systems provide structured information in the 
- *   gecos field, but this is system-dependent.
- *
- * - Passwd#dir contains the path to the home directory of the user as a String.
- *
- * - Passwd#shell contains the path to the login shell of the user as a String.
- */
-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)
@@ -305,39 +184,27 @@ setup_group(grp)
     mem = rb_ary_new();
     tbl = grp->gr_mem;
     while (*tbl) {
-	rb_ary_push(mem, safe_setup_str(*tbl));
+	rb_ary_push(mem, rb_tainted_str_new2(*tbl));
 	tbl++;
     }
     return rb_struct_new(sGroup,
-			 safe_setup_str(grp->gr_name),
-#ifdef HAVE_ST_GR_PASSWD
-			 safe_setup_str(grp->gr_passwd),
-#endif
-			 PW_GID2VAL(grp->gr_gid),
+			 rb_tainted_str_new2(grp->gr_name),
+			 rb_tainted_str_new2(grp->gr_passwd),
+			 INT2FIX(grp->gr_gid),
 			 mem);
 }
 #endif
 
-/* Returns information about the group with specified integer group id (gid), 
- * as found in /etc/group.
- *
- * The information is returned as a Struct::Group; see getgrent above for
- * details.
- *
- * e.g.  Etc.getgrgid(100) -> #<struct Struct::Group name="users", passwd="x",
- * gid=100, mem=["meta", "root"]>
- *
- */
 static VALUE
 etc_getgrgid(obj, id)
     VALUE obj, id;
 {
 #ifdef HAVE_GETGRENT
-    gid_t gid;
+    int gid;
     struct group *grp;
 
     rb_secure(4);
-    gid = PW_VAL2GID(id);
+    gid = NUM2INT(id);
     grp = getgrgid(gid);
     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
     return setup_group(grp);
@@ -346,16 +213,6 @@ etc_getgrgid(obj, id)
 #endif
 }
 
-/* Returns information about the group with specified String name, as found 
- * in /etc/group.
- *
- * The information is returned as a Struct::Group; see getgrent above for
- * details.
- *
- * e.g.  Etc.getgrnam('users') -> #<struct Struct::Group name="users",
- * passwd="x", gid=100, mem=["meta", "root"]>
- *
- */
 static VALUE
 etc_getgrnam(obj, nam)
     VALUE obj, nam;
@@ -387,30 +244,15 @@ group_iterate()
 {
     struct group *pw;
 
-    setgrent();
+    setpwent();
     while (pw = getgrent()) {
 	rb_yield(setup_group(pw));
     }
-    endgrent();
+    endpwent();
     return Qnil;
 }
 #endif
 
-/* Provides a convenient Ruby iterator which executes a block for each entry 
- * in the /etc/group file.
- *
- * The code block is passed an Etc::Group struct; see getgrent above for 
- * details.
- *
- * Example:
- *
- *     require 'etc'
- *
- *     Etc.group {|g|
- *       puts g.name + ": " + g.mem.join(', ')
- *     }
- *
- */
 static VALUE
 etc_group(obj)
     VALUE obj;
@@ -433,73 +275,8 @@ etc_group(obj)
     return Qnil;
 }
 
-/* Resets the process of reading the /etc/group file, so that the next call
- * to getgrent will return the first entry again.
- */
-static VALUE
-etc_setgrent(obj)
-    VALUE obj;
-{
-#ifdef HAVE_GETGRENT
-    setgrent();
-#endif
-    return Qnil;
-}
-
-/* Ends the process of scanning through the /etc/group file begun by 
- * getgrent, and closes the file.
- */
-static VALUE
-etc_endgrent(obj)
-    VALUE obj;
-{
-#ifdef HAVE_GETGRENT
-    endgrent();
-#endif
-    return Qnil;
-}
-
-/* Returns an entry from the /etc/group file. The first time it is called it
- * opens the file and returns the first entry; each successive call returns 
- * the next entry, or nil if the end of the file has been reached.
- *
- * To close the file when processing is complete, call endgrent.
- *
- * Each entry is returned as a Struct::Group:
- *
- * - Group#name contains the name of the group as a String.
- *
- * - Group#passwd contains the encrypted password as a String. An 'x' is
- *   returned if password access to the group is not available; an empty 
- *   string is returned if no password is needed to obtain membership of 
- *   the group.
- *
- * - Group#gid contains the group's numeric ID as an integer.
- *
- * - Group#mem is an Array of Strings containing the short login names of the 
- *   members of the group.
- */
-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;
 
-/* The etc module provides access to information from the /etc/passwd and
- * /etc/group files on Linux and Unix systems.
- *
- * Documented by mathew <meta@pobox.com>.
- */
 void
 Init_etc()
 {
@@ -509,19 +286,12 @@ 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);
 
-    rb_global_variable(&sPasswd);
     sPasswd =  rb_struct_define("Passwd",
 				"name", "passwd", "uid", "gid",
 #ifdef HAVE_ST_PW_GECOS
@@ -546,14 +316,11 @@ Init_etc()
 #ifdef HAVE_ST_PW_EXPIRE
 				"expire",
 #endif
-				NULL);
+				0);
+    rb_global_variable(&sPasswd);
 
 #ifdef HAVE_GETGRENT
+    sGroup = rb_struct_define("Group", "name", "passwd", "gid", "mem", 0);
     rb_global_variable(&sGroup);
-    sGroup = rb_struct_define("Group", "name",
-#ifdef HAVE_ST_GR_PASSWD
-			      "passwd",
-#endif
-			      "gid", "mem", NULL);
 #endif
 }
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index dbd0672545..bf6890ca9d 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -8,36 +8,9 @@ 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')
-  if have_struct_member('struct passwd', 'pw_age', 'pwd.h')
-    case what_type?('struct passwd', 'pw_age', 'pwd.h')
-    when "string"
-      f = "safe_setup_str"
-    when "long long"
-      f = "LL2NUM"
-    else
-      f = "INT2NUM"
-    end
-    $defs.push("-DPW_AGE2VAL="+f)
-  end
+  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')
-  have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
-  have_struct_member('struct group', 'gr_passwd', 'grp.h')
-  [%w"uid_t pwd.h", %w"gid_t grp.h"].each do |t, *h|
-    h.unshift("sys/types.h")
-    f = "INT2NUM"
-    if have_type(t, h)
-      if try_static_assert("sizeof(#{t}) > sizeof(long)", h)
-	f = "LL2NUM"
-      end
-      if try_static_assert("(#{t})-1 > 0", h)
-	f = "U#{f}"
-      end
-    end
-    t = t.chomp('_t').upcase
-    $defs.push("-DPW_#{t}2VAL=#{f}")
-    $defs.push("-DPW_VAL2#{t}=#{f.sub(/([A-Z]+)2(NUM)/, '\22\1')}")
-  end
   create_makefile("etc")
 end
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 86d59b0946..06a9fd50fc 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -16,74 +16,28 @@ alias $PROGRAM_NAME $0
 alias $0 $progname
 
 $extlist = []
-$compiled = {}
 
-$:.replace([Dir.pwd])
+$:.replace ["."]
 require 'rbconfig'
 
-srcdir = File.dirname(File.dirname(__FILE__))
+srcdir = Config::CONFIG["srcdir"]
 
-$:.unshift(srcdir, File.expand_path("lib", srcdir))
-
-$topdir = "."
-$top_srcdir = srcdir
+$:.replace [srcdir, srcdir+"/lib", "."]
 
 require 'mkmf'
-require 'optparse/shellwords'
+require 'ftools'
+require 'shellwords'
+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 relative_from(path, base)
-  dir = File.join(path, "")
-  if File.expand_path(dir) == File.expand_path(dir, base)
-    path
-  else
-    File.join(base, path)
-  end
-end
-
-def extract_makefile(makefile, keep = true)
-  m = File.read(makefile)
-  if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
-    return keep
-  end
-  installrb = {}
-  m.scan(/^install-rb-default:[ \t]*(\S+)\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
-  oldrb = installrb.keys.sort
-  newrb = install_rb(nil, "").collect {|d, *f| f}.flatten.sort
-  if target_prefix = m[/^target_prefix[ \t]*=[ \t]*\/(.*)/, 1]
-    target = "#{target_prefix}/#{target}"
-  end
-  unless oldrb == newrb
-    if $extout
-      newrb.each {|f| installrb.delete(f)}
-      unless installrb.empty?
-        config = CONFIG.dup
-        install_dirs(target_prefix).each {|var, val| config[var] = val}
-        FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, :verbose => true)
-      end
-    end
-    return false
-  end
-  $target = target
-  $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1]
-  $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false
-  /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil
-  $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "")
-  $DLDFLAGS += " " + (m[/^DLDFLAGS[ \t]*=[ \t]*(.*)/, 1] || "")
-  if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1]
-    s.sub!(/^#{Regexp.quote($LIBRUBYARG)} */, "")
-    s.sub!(/ *#{Regexp.quote($LIBS)}$/, "")
-    $libs = s
-  end
-  $LOCAL_LIBS = m[/^LOCAL_LIBS[ \t]*=[ \t]*(.*)/, 1] || ""
-  $LIBPATH = Shellwords.shellwords(m[/^libpath[ \t]*=[ \t]*(.*)/, 1] || "") - %w[$(libdir) $(topdir)]
-  true
-end
-
 def extmake(target)
   print "#{$message} #{target}\n"
   $stdout.flush
@@ -97,62 +51,27 @@ def extmake(target)
     return true if $nodynamic and not $static
   end
 
-  FileUtils.mkpath target unless File.directory?(target)
+  init_mkmf
+
+  if /linux/ =~ RUBY_PLATFORM and $configure_args['--enable-shared'] and CONFIG["GNU_LD"] == "yes"
+    $DLDFLAGS << " -Wl,--no-undefined"
+  end
+
   begin
     dir = Dir.pwd
-    FileUtils.mkpath target unless File.directory?(target)
+    File.mkpath target unless File.directory?(target)
     Dir.chdir target
-    top_srcdir = $top_srcdir
-    topdir = $topdir
-    hdrdir = $hdrdir
-    prefix = "../" * (target.count("/")+1)
-    $top_srcdir = relative_from(top_srcdir, prefix)
-    $hdrdir = relative_from(hdrdir, prefix)
-    $topdir = prefix + $topdir
     $target = target
     $mdir = target
     $srcdir = File.join($top_srcdir, "ext", $mdir)
-    $preload = nil
-    $compiled[target] = false
-    makefile = "./Makefile"
-    ok = File.exist?(makefile)
     unless $ignore
-      rbconfig0 = Config::CONFIG
-      mkconfig0 = CONFIG
-      rbconfig = {
-	"hdrdir" => $hdrdir,
-	"srcdir" => $srcdir,
-	"topdir" => $topdir,
-      }
-      mkconfig = {
-	"top_srcdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1],
-	"hdrdir" => "$(top_srcdir)",
-	"srcdir" => "$(top_srcdir)/ext/#{$mdir}",
-	"topdir" => $topdir,
-      }
-      rbconfig0.each_pair {|key, val| rbconfig[key] ||= val.dup}
-      mkconfig0.each_pair {|key, val| mkconfig[key] ||= val.dup}
-      Config.module_eval {
-	remove_const(:CONFIG)
-	const_set(:CONFIG, rbconfig)
-	remove_const(:MAKEFILE_CONFIG)
-	const_set(:MAKEFILE_CONFIG, mkconfig)
-      }
-      Object.class_eval {
-	remove_const(:CONFIG)
-	const_set(:CONFIG, mkconfig)
-      }
-      begin
-	$extconf_h = nil
-	ok &&= extract_makefile(makefile)
-	if (($extconf_h && !File.exist?($extconf_h)) ||
-	    !(t = modified?(makefile, MTIMES)) ||
-            %W"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb #{$srcdir}/depend".any? {|f| modified?(f, [t])})
-        then
-	  ok = false
-          init_mkmf
-	  Logging::logfile 'mkmf.log'
-	  rm_f makefile
+      if $static ||
+	older("./Makefile", *MTIMES + %W"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb")
+      then
+	$defs = []
+	Logging::logfile 'mkmf.log'
+	Config::CONFIG["srcdir"] = $srcdir
+	begin
 	  if File.exist?($0 = "#{$srcdir}/makefile.rb")
 	    load $0
 	  elsif File.exist?($0 = "#{$srcdir}/extconf.rb")
@@ -160,130 +79,56 @@ def extmake(target)
 	  else
 	    create_makefile(target)
 	  end
-	  $defs << "-DRUBY_EXPORT" if $static
-	  ok = File.exist?(makefile)
+	rescue SystemExit
+	  # ignore
+	ensure
+	  rm_f "conftest*"
+	  $0 = $PROGRAM_NAME
+	  Config::CONFIG["srcdir"] = $top_srcdir
 	end
-      rescue SystemExit
-	# ignore
-      ensure
-	rm_f "conftest*"
-	config = $0
-	$0 = $PROGRAM_NAME
       end
     end
-    ok = yield(ok) if block_given?
-    unless ok
-      open(makefile, "w") do |f|
-	f.print dummy_makefile(CONFIG["srcdir"])
+    if File.exist?("./Makefile")
+      if $static
+	$extlist.push [$static, $target, File.basename($target)]
       end
-      return true
-    end
-    args = sysquote($mflags)
-    unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
-      args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
-    end
-    if $static
-      args += ["static"] unless $clean
-      $extlist.push [$static, $target, File.basename($target), $preload]
-    end
-    unless system($make, *args)
-      $ignore or $continue or return false
-    end
-    $compiled[target] = true
-    if $clean
-      FileUtils.rm_f("mkmf.log")
-      if $clean != true
-	FileUtils.rm_f([makefile, $extconf_h || "extconf.h"])
+      unless system($make, *sysquote($mflags))
+	$ignore or $continue or return false
       end
-      File.unlink(makefile) rescue nil
+    else
+      open("./Makefile", "w") {|f|
+        f.print dummy_makefile($srcdir)
+      }
     end
     if $static
       $extflags ||= ""
-      $extlibs ||= []
-      $extpath ||= []
-      unless $mswin
-        $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ")
-      end
-      $extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split)
-      $extpath |= $LIBPATH
+      $extlibs ||= ""
+      $extflags += " " + $DLDFLAGS if $DLDFLAGS
+      $extflags += " " + $LDFLAGS unless $LDFLAGS == ""
+      $extlibs += " " + $libs unless $libs == ""
+      $extlibs += " " + $LOCAL_LIBS unless $LOCAL_LIBS == ""
     end
   ensure
-    unless $ignore
-      Config.module_eval {
-	remove_const(:CONFIG)
-	const_set(:CONFIG, rbconfig0)
-	remove_const(:MAKEFILE_CONFIG)
-	const_set(:MAKEFILE_CONFIG, mkconfig0)
-      }
-      Object.class_eval {
-	remove_const(:CONFIG)
-	const_set(:CONFIG, mkconfig0)
-      }
-    end
-    $top_srcdir = top_srcdir
-    $topdir = topdir
-    $hdrdir = hdrdir
     Dir.chdir dir
   end
-  begin
-    Dir.rmdir target
-    target = File.dirname(target)
-  rescue SystemCallError
-    break
-  end while true
   true
 end
 
-def compiled?(target)
-  $compiled[target]
-end
-
 def parse_args()
-  $mflags = []
-
-  opts = nil
-  $optparser ||= OptionParser.new do |opts|
-    opts.on('-n') {$dryrun = true}
-    opts.on('--[no-]extension [EXTS]', Array) do |v|
-      $extension = (v == false ? [] : v)
-    end
-    opts.on('--[no-]extstatic [STATIC]', Array) do |v|
-      if ($extstatic = v) == false
-        $extstatic = []
-      elsif v
-        $force_static = true if $extstatic.delete("static")
-        $extstatic = nil if $extstatic.empty?
-      end
-    end
-    opts.on('--dest-dir=DIR') do |v|
-      $destdir = v
-    end
-    opts.on('--extout=DIR') do |v|
-      $extout = (v unless v.empty?)
-    end
-    opts.on('--make=MAKE') do |v|
-      $make = v || 'make'
-    end
-    opts.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v|
-      v.grep(/\A([-\w]+)=(.*)/) {$configure_args["--#{$1}"] = $2}
-      if arg = v.first
-        arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
-      end
-      $mflags.concat(v)
-    end
-    opts.on('--message [MESSAGE]', String) do |v|
-      $message = v
-    end
+  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
-  begin
-    $optparser.parse!(ARGV)
-  rescue OptionParser::InvalidOption => e
-    retry if /^--/ =~ e.args[0]
-    $optparser.warn(e)
-    abort opts.to_s
-  end
-
-  $destdir ||= ''
 
   $make, *rest = Shellwords.shellwords($make)
   $mflags.unshift(*rest) unless rest.empty?
@@ -292,10 +137,6 @@ def parse_args()
     grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
     false
   end
-  def $mflags.defined?(var)
-    grep(/\A#{var}=(.*)/) {return $1}
-    false
-  end
 
   if $mflags.set?(?n)
     $dryrun = true
@@ -304,34 +145,25 @@ def parse_args()
   end
 
   $continue = $mflags.set?(?k)
-  if $extout
-    $extout = '$(topdir)/'+$extout
-    Config::CONFIG["extout"] = CONFIG["extout"] = $extout
-    $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
-    $mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
-  end
+  $mflags |= ["DESTDIR=#{$destdir}"]
 end
 
 parse_args()
 
-if target = ARGV.shift and /^[a-z-]+$/ =~ target
-  $mflags.push(target)
-  target = target.sub(/^(dist|real)(?=(?:clean)?$)/, '')
-  case target
-  when /clean/
-    $ignore ||= true
-    $clean = $1 ? $1[0] : true
-  when /^install\b/
-    $install = true
-    $ignore ||= true
-    $mflags.unshift("INSTALL_PROG=install -c -p -m 0755",
-                    "INSTALL_DATA=install -c -p -m 0644",
-                    "MAKEDIRS=mkdir -p") if $dryrun
-  end
-end
 unless $message
-  if target
-    $message = target.sub(/^(\w+)e?\b/, '\1ing').tr('-', ' ')
+  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 -m 0755",
+		      "INSTALL_DATA=install -c -m 0644",
+		      "MAKEDIRS=mkdir -p") if $dryrun
+    end
+    $message.sub!(/e?$/, "ing")
   else
     $message = "compiling"
   end
@@ -340,28 +172,22 @@ end
 EXEEXT = CONFIG['EXEEXT']
 if CROSS_COMPILING
   $ruby = CONFIG['MINIRUBY']
-elsif sep = config_string('BUILD_FILE_SEPARATOR')
-  $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
+elsif $nmake
+  $ruby = '$(topdir:/=\\)\\miniruby' + EXEEXT
 else
   $ruby = '$(topdir)/miniruby' + EXEEXT
 end
-$ruby << " -I'$(topdir)' -I'$(top_srcdir)/lib'"
+$ruby << " -I$(topdir) -I$(hdrdir)/lib"
 $config_h = '$(topdir)/config.h'
 
-MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
+MTIMES = [File.mtime(__FILE__)]
 
 # get static-link modules
 $static_ext = {}
-if $extstatic
-  $extstatic.each do |target|
-    target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
-    $static_ext[target] = $static_ext.size
-  end
-end
 for dir in ["ext", File::join($top_srcdir, "ext")]
   setup = File::join(dir, CONFIG['setup'])
   if File.file? setup
-    f = open(setup)
+    f = open(setup) 
     while line = f.gets()
       line.chomp!
       line.sub!(/#.*$/, '')
@@ -375,158 +201,70 @@ for dir in ["ext", File::join($top_srcdir, "ext")]
 	next
       end
       target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
-      $static_ext[target] = $static_ext.size
+      $static_ext[target] = true
     end
     MTIMES << f.mtime
     $setup = setup
     f.close
     break
   end
-end unless $extstatic
-
-ext_prefix = "#{$top_srcdir}/ext"
-exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
-if $extension
-  exts |= $extension.select {|d| File.directory?("#{ext_prefix}/#{d}")}
-else
-  withes, withouts = %w[--with --without].collect {|w|
-    if not (w = %w[-extensions -ext].collect {|opt|arg_config(w+opt)}).any?
-      proc {false}
-    elsif (w = w.grep(String)).empty?
-      proc {true}
-    else
-      w.collect {|opt| opt.split(/,/)}.flatten.method(:any?)
-    end
-  }
-  cond = proc {|ext|
-    cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)}
-    withes.call(&cond1) or !withouts.call(&cond1)
-  }
-  exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
-    d = File.dirname(d)
-    d.slice!(0, ext_prefix.length + 1)
-    d
-  }.find_all {|ext|
-    with_config(ext, &cond)
-  }.sort
-end
-
-if $extout
-  Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir))
-  if $install
-    dest = Config.expand($rubylibdir.dup)
-    unless $destdir.empty?
-      dest.sub!($dest_prefix_pattern, Config.expand($destdir.dup))
-    end
-    FileUtils.cp_r(extout+"/.", dest, :verbose => true, :noop => $dryrun)
-    exit
-  end
-  unless $ignore
-    FileUtils.mkpath(extout)
-  end
 end
 
-dir = Dir.pwd
-FileUtils::makedirs('ext')
+File::makedirs('ext')
 Dir::chdir('ext')
 
-hdrdir = $hdrdir
-$hdrdir = $top_srcdir = relative_from(srcdir, $topdir = "..")
-exts.each do |d|
-  extmake(d) or abort
+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
-$top_srcdir = srcdir
-$topdir = "."
-$hdrdir = hdrdir
 
-extinit = Struct.new(:c, :o) {
-  def initialize(src)
-    super("#{src}.c", "#{src}.#{$OBJEXT}")
-  end
-}.new("extinit")
 if $ignore
-  FileUtils.rm_f(extinit.to_a) if $clean
   Dir.chdir ".."
-  if $clean
-    Dir.rmdir('ext') rescue nil
-    FileUtils.rm_rf(extout) if $extout
-  end
   exit
 end
 
 if $extlist.size > 0
   $extinit ||= ""
   $extobjs ||= ""
-  list = $extlist.dup
-  built = []
-  while e = list.shift
-    s,t,i,r = e
-    if r and !(r -= built).empty?
-      l = list.size
-      if (while l > 0; break true if r.include?(list[l-=1][1]) end)
-        list.insert(l + 1, e)
-      end
-      next
-    end
+  for s,t,i in $extlist
     f = format("%s/%s.%s", s, i, $LIBEXT)
     if File.exist?(f)
-      $extinit += "\tinit(Init_#{i}, \"#{t}.so\");\n"
+      $extinit += "\tInit_#{i}();\n\trb_provide(\"#{t}.so\");\n"
       $extobjs += "ext/#{f} "
-      built << t
     end
   end
 
-  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}
-}
-  if !modified?(extinit.c, MTIMES) || IO.read(extinit.c) != src
-    open(extinit.c, "w") {|f| f.print src}
+  src = "void Init_ext() {\n#$extinit}\n"
+  if older("extinit.c", *MTIMES) || IO.read("extinit.c") != src
+    open("extinit.c", "w") {|f| f.print src}
   end
 
-  $extobjs = "ext/#{extinit.o} " + $extobjs
+  $extobjs = "ext/extinit.#{$OBJEXT} " + $extobjs
   if RUBY_PLATFORM =~ /m68k-human|beos/
-    $extflags.delete("-L/usr/local/lib")
+    $extlibs.gsub!("-L/usr/local/lib", "") if $extlibs
   end
-  $extpath.delete("$(topdir)")
-  $extflags = libpathflag($extpath) << " " << $extflags.strip
   conf = [
-    ['SETUP', $setup],
-    [enable_config("shared", $enable_shared) ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
-    ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
+    ['SETUP', $setup], ['EXTOBJS', $extobjs],
+    ['EXTLIBS', $extlibs], ['EXTLDFLAGS', $extflags]
   ].map {|n, v|
     "#{n}=#{v}" if v and !(v = v.strip).empty?
   }.compact
   puts conf
   $stdout.flush
   $mflags.concat(conf)
-else
-  FileUtils.rm_f(extinit.to_a)
 end
 rubies = []
-%w[RUBY RUBYW STATIC_RUBY].each {|r|
-  n = r
-  if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
-    rubies << r+EXEEXT
-    $mflags << "#{n}=#{r}"
-  end
+%w[RUBY RUBYW].each {|r|
+  r = CONFIG[r+"_INSTALL_NAME"] and !r.empty? and rubies << r+EXEEXT
 }
 
 Dir.chdir ".."
-unless $destdir.to_s.empty?
-  $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
-end
-unless $extlist.empty?
-  rm_f(Config::CONFIG["LIBRUBY_SO"])
-end
 puts "making #{rubies.join(', ')}"
 $stdout.flush
 $mflags.concat(rubies)
 
-if $nmake == ?b
-  $mflags.collect {|flag| flag.sub!(/\A(?=\w+=)/, "-D")}
-end
 system($make, *sysquote($mflags)) or exit($?.exitstatus)
 
 #Local variables:
diff --git a/ext/fcntl/MANIFEST b/ext/fcntl/MANIFEST
new file mode 100644
index 0000000000..aef7ad4ca0
--- /dev/null
+++ b/ext/fcntl/MANIFEST
@@ -0,0 +1,3 @@
+MANIFEST
+depend
+fcntl.c
diff --git a/ext/fcntl/extconf.rb b/ext/fcntl/extconf.rb
deleted file mode 100644
index 8b717d4a5b..0000000000
--- a/ext/fcntl/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('fcntl')
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index 8f9cb43d0c..de0b284b36 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -2,7 +2,7 @@
 
   fcntl.c -
 
-  $Author: matz $
+  $Author$
   created at: Mon Apr  7 18:53:05 JST 1997
 
   Copyright (C) 1997-2001 Yukihiro Matsumoto
@@ -34,81 +34,6 @@ pack up your own arguments to pass as args for locking functions, etc.
 #include "ruby.h"
 #include <fcntl.h>
 
-/* Fcntl loads the constants defined in the system's <fcntl.h> C header
- * file, and used with both the fcntl(2) and open(2) POSIX system calls.
- *
- * Copyright (C) 1997-2001 Yukihiro Matsumoto
- *
- * Documented by mathew <meta@pobox.com>
- *
- * = Usage
- * 
- * To perform a fcntl(2) operation, use IO::fcntl in the core classes.
- *
- * To perform an open(2) operation, use IO::sysopen.
- *
- * The set of operations and constants available depends upon specific OS
- * platform. Some values listed below may not be supported on your system.
- *
- * The constants supported by Ruby for use with IO::fcntl are:
- *
- * - F_DUPFD - duplicate a close-on-exec file handle to a non-close-on-exec
- *   file handle.
- *
- * - F_GETFD - read the close-on-exec flag of a file handle.
- *
- * - F_SETFD - set the close-on-exec flag of a file handle.
- *
- * - FD_CLOEXEC - the value of the close-on-exec flag.
- *
- * - F_GETFL - get file descriptor flags.
- *
- * - F_SETFL - set file descriptor flags.
- *
- * - O_APPEND, O_NONBLOCK, etc (see below) - file descriptor flag
- *   values for the above.
- *
- * - F_GETLK - determine whether a given region of a file is locked.
- *
- * - F_SETLK - acquire a lock on a region of a file.
- *
- * - F_SETLKW - acquire a lock on a region of a file, waiting if necessary.
- *
- * - F_RDLCK, F_WRLCK, F_UNLCK - types of lock for the above.
- *
- * The constants supported by Ruby for use with IO::sysopen are:
- *
- * - O_APPEND - open file in append mode.
- *
- * - O_NOCTTY - open tty without it becoming controlling tty.
- *
- * - O_CREAT - create file if it doesn't exist.
- *
- * - O_EXCL - used with O_CREAT, fail if file exists.
- *
- * - O_TRUNC - truncate file on open.
- *
- * - O_NONBLOCK / O_NDELAY - open in non-blocking mode.
- *
- * - O_RDONLY - open read-only.
- *
- * - O_WRONLY - open write-only.
- *
- * - O_RDWR - open read-write.
- *
- * - O_ACCMODE - mask to extract read/write flags.
- *
- * Example:
- * 
- *   require 'fcntl'
- *
- *   fd = IO::sysopen('/tmp/tempfile', 
- *        Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT)
- *   f = IO.open(fd)
- *   f.syswrite("TEMP DATA")
- *   f.close
- *
- */
 void
 Init_fcntl()
 {
@@ -179,9 +104,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/MANIFEST b/ext/gdbm/MANIFEST
new file mode 100644
index 0000000000..1359b4fdaf
--- /dev/null
+++ b/ext/gdbm/MANIFEST
@@ -0,0 +1,6 @@
+MANIFEST
+README
+depend
+extconf.rb
+gdbm.c
+testgdbm.rb
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 691d512460..edbd976231 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -2,8 +2,8 @@
 
   gdbm.c -
 
-  $Author: usa $
-  $Date: 2005/06/20 07:53:20 $
+  $Author$
+  $Date$
   modified at: Mon Jan 24 15:59:52 JST 1994
 
 ************************************************/
@@ -16,8 +16,6 @@
 
 static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError;
 
-#define RUBY_GDBM_RW_BIT 0x20000000
-
 #define MY_BLOCK_SIZE (2048)
 #define MY_FATAL_FUNC rb_gdbm_fatal
 static void
@@ -44,11 +42,6 @@ closed_dbm()
     if (dbmp->di_dbm == 0) closed_dbm();\
 } while (0)
 
-#define GetDBM2(obj, data, dbm) {\
-    GetDBM(obj, data);\
-    (dbm) = dbmp->di_dbm;\
-}
-
 static void
 free_dbm(dbmp)
     struct dbmdata *dbmp;
@@ -72,21 +65,6 @@ fgdbm_close(obj)
     return Qnil;
 }
 
-static VALUE
-fgdbm_closed(obj)
-    VALUE obj;
-{
-    struct dbmdata *dbmp;
-
-    Data_Get_Struct(obj, struct dbmdata, dbmp);
-    if (dbmp == 0)
-	return Qtrue;
-    if (dbmp->di_dbm == 0)
-	return Qtrue;
-
-    return Qfalse;
-}
-
 static VALUE fgdbm_s_alloc _((VALUE));
 
 static VALUE
@@ -122,23 +100,16 @@ fgdbm_initialize(argc, argv, obj)
 
     SafeStringValue(file);
 
-    if (flags & RUBY_GDBM_RW_BIT) {
-        flags &= ~RUBY_GDBM_RW_BIT;
+    dbm = 0;
+    if (mode >= 0)
 	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
-			flags, mode, MY_FATAL_FUNC);
-    }
-    else {
-        dbm = 0;
-        if (mode >= 0)
-            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
-                            GDBM_WRCREAT|flags, mode, MY_FATAL_FUNC);
-        if (!dbm)
-            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
-                            GDBM_WRITER|flags, 0, MY_FATAL_FUNC);
-        if (!dbm)
-            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
-                            GDBM_READER|flags, 0, MY_FATAL_FUNC);
-    }
+			GDBM_WRCREAT|flags, mode, MY_FATAL_FUNC);
+    if (!dbm)
+	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
+			GDBM_WRITER|flags, 0, MY_FATAL_FUNC);
+    if (!dbm)
+	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
+			GDBM_READER|flags, 0, MY_FATAL_FUNC);
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
@@ -222,7 +193,8 @@ rb_gdbm_fetch3(obj, keystr)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     return rb_gdbm_fetch2(dbm, keystr);
 }
 
@@ -318,7 +290,8 @@ fgdbm_index(obj, valstr)
     VALUE keystr, valstr2;
 
     StringValue(valstr);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
@@ -367,21 +340,18 @@ fgdbm_select(argc, argv, obj)
 	if (argc > 0) {
 	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
 	}
-        GetDBM2(obj, dbmp, dbm);
+        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));
-	    VALUE v = rb_yield(assoc);
 
-	    if (RTEST(v)) {
-		rb_ary_push(new, assoc);
-	    }
-	    GetDBM2(obj, dbmp, dbm);
+            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]));
         }
@@ -391,30 +361,6 @@ fgdbm_select(argc, argv, obj)
 }
 
 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 void
-rb_gdbm_modify(obj)
-    VALUE obj;
-{
-    rb_secure(4);
-    if (OBJ_FROZEN(obj)) rb_error_frozen("GDBM");
-}
-
-static VALUE
 rb_gdbm_delete(obj, keystr)
     VALUE obj, keystr;
 {
@@ -422,12 +368,14 @@ rb_gdbm_delete(obj, keystr)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    rb_gdbm_modify(obj);
+    rb_secure(4);
     StringValue(keystr);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     if (!gdbm_exists(dbm, key)) {
 	return Qnil;
     }
@@ -461,8 +409,10 @@ fgdbm_shift(obj)
     GDBM_FILE dbm;
     VALUE keystr, valstr;
 
-    rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     keystr = rb_gdbm_firstkey(dbm);
     if (NIL_P(keystr)) return Qnil;
     valstr = rb_gdbm_fetch2(dbm, keystr);
@@ -481,8 +431,9 @@ fgdbm_delete_if(obj)
     VALUE ret, ary = rb_ary_new();
     int i, status = 0, n;
 
-    rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     n = dbmp->di_size;
     dbmp->di_size = -1;
 
@@ -493,7 +444,6 @@ fgdbm_delete_if(obj)
         ret = rb_protect(rb_yield, rb_assoc_new(keystr, valstr), &status);
         if (status != 0) break;
 	if (RTEST(ret)) rb_ary_push(ary, keystr);
-	GetDBM2(obj, dbmp, dbm);
     }
 
     for (i = 0; i < RARRAY(ary)->len; i++)
@@ -512,8 +462,9 @@ fgdbm_clear(obj)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
 
 #if 0
@@ -551,7 +502,8 @@ fgdbm_invert(obj)
     VALUE keystr, valstr;
     VALUE hash = rb_hash_new();
 
-    GetDBM2(obj, dbmp, dbm);
+    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);
@@ -609,18 +561,18 @@ fgdbm_store(obj, keystr, valstr)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    rb_gdbm_modify(obj);
+    rb_secure(4);
     StringValue(keystr);
-    StringValue(valstr);
-
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
+    StringValue(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     dbmp->di_size = -1;
+    dbm = dbmp->di_dbm;
     if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
 	if (errno == EPERM) rb_sys_fail(0);
 	rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
@@ -638,8 +590,9 @@ fgdbm_length(obj)
     GDBM_FILE dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, 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);
@@ -683,12 +636,13 @@ fgdbm_each_value(obj)
     GDBM_FILE dbm;
     VALUE keystr;
 
-    GetDBM2(obj, dbmp, dbm);
+    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));
-	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -701,12 +655,13 @@ fgdbm_each_key(obj)
     GDBM_FILE dbm;
     VALUE keystr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
         rb_yield(keystr);
-	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -719,12 +674,13 @@ fgdbm_each_pair(obj)
     struct dbmdata *dbmp;
     VALUE keystr;
 
-    GetDBM2(obj, dbmp, dbm);
+    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)));
-	GetDBM2(obj, dbmp, dbm);
     }
 
     return obj;
@@ -738,7 +694,9 @@ fgdbm_keys(obj)
     GDBM_FILE dbm;
     VALUE keystr, ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    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)) {
@@ -758,7 +716,9 @@ fgdbm_values(obj)
     GDBM_FILE dbm;
     VALUE valstr, ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    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);
@@ -782,7 +742,8 @@ fgdbm_has_key(obj, keystr)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     if (gdbm_exists(dbm, key))
         return Qtrue;
     return Qfalse;
@@ -797,7 +758,8 @@ fgdbm_has_value(obj, valstr)
     VALUE keystr, valstr2;
 
     StringValue(valstr);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
@@ -821,7 +783,9 @@ fgdbm_to_a(obj)
     GDBM_FILE dbm;
     VALUE keystr, ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    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)) {
@@ -839,8 +803,9 @@ fgdbm_reorganize(obj)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     gdbm_reorganize(dbm);
     return obj;
 }
@@ -852,8 +817,9 @@ fgdbm_sync(obj)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     gdbm_sync(dbm);
     return obj;
 }
@@ -866,7 +832,9 @@ fgdbm_set_cachesize(obj, val)
     GDBM_FILE dbm;
     int optval;
 
-    GetDBM2(obj, dbmp, dbm);
+    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));
@@ -882,7 +850,9 @@ fgdbm_set_fastmode(obj, val)
     GDBM_FILE dbm;
     int optval;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     optval = 0;
     if (RTEST(val))
         optval = 1;
@@ -905,7 +875,9 @@ fgdbm_set_syncmode(obj, val)
     GDBM_FILE dbm;
     int optval;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     optval = 0;
     if (RTEST(val))
         optval = 1;
@@ -925,7 +897,9 @@ fgdbm_to_hash(obj)
     GDBM_FILE dbm;
     VALUE keystr, hash;
 
-    GetDBM2(obj, dbmp, dbm);
+    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)) {
@@ -956,7 +930,6 @@ Init_gdbm()
 
     rb_define_method(rb_cGDBM, "initialize", fgdbm_initialize, -1);
     rb_define_method(rb_cGDBM, "close", fgdbm_close, 0);
-    rb_define_method(rb_cGDBM, "closed?", fgdbm_closed, 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);
@@ -965,7 +938,6 @@ Init_gdbm()
     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);
@@ -1001,12 +973,13 @@ Init_gdbm()
     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_open() */
-    rb_define_const(rb_cGDBM, "READER",  INT2FIX(GDBM_READER|RUBY_GDBM_RW_BIT));
-    rb_define_const(rb_cGDBM, "WRITER",  INT2FIX(GDBM_WRITER|RUBY_GDBM_RW_BIT));
-    rb_define_const(rb_cGDBM, "WRCREAT", INT2FIX(GDBM_WRCREAT|RUBY_GDBM_RW_BIT));
-    rb_define_const(rb_cGDBM, "NEWDB",   INT2FIX(GDBM_NEWDB|RUBY_GDBM_RW_BIT));
-
+    /* 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. */
diff --git a/ext/gdbm/testgdbm.rb b/ext/gdbm/testgdbm.rb
new file mode 100644
index 0000000000..524d3f8ca3
--- /dev/null
+++ b/ext/gdbm/testgdbm.rb
@@ -0,0 +1,663 @@
+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_select
+    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.select(*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
index 394787fced..4088712231 100644
--- a/ext/iconv/.cvsignore
+++ b/ext/iconv/.cvsignore
@@ -1,5 +1,3 @@
 Makefile
 mkmf.log
 *.def
-iconv.rb
-config.charset
diff --git a/ext/iconv/MANIFEST b/ext/iconv/MANIFEST
new file mode 100644
index 0000000000..643f3b7f4d
--- /dev/null
+++ b/ext/iconv/MANIFEST
@@ -0,0 +1,4 @@
+MANIFEST
+extconf.rb
+iconv.c
+depend
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
deleted file mode 100644
index aed4644290..0000000000
--- a/ext/iconv/charset_alias.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /usr/bin/ruby
-# :stopdoc:
-require 'rbconfig'
-require 'optparse'
-
-# http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
-# Fri, 30 May 2003 00:09:00 GMT'
-
-OS = Config::CONFIG["target_os"]
-SHELL = Config::CONFIG['SHELL']
-
-class Hash::Ordered < Hash
-  def [](key)
-    val = super and val.last
-  end
-  def []=(key, val)
-    ary = fetch(key) {return super(key, [self.size, key, val])} and
-      ary << val
-  end
-  def sort
-    values.sort.collect {|i, *rest| rest}
-  end
-  def each(&block)
-    sort.each(&block)
-  end
-end
-
-def charset_alias(config_charset, mapfile, target = OS)
-  map = Hash::Ordered.new
-  comments = []
-  open(config_charset) do |input|
-    input.find {|line| /^case "\$os" in/ =~ line} or break
-    input.find {|line|
-      /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/ =~ line and
-      $&.split('|').any? {|pattern| File.fnmatch?(pattern.strip, target)}
-    } or break
-    input.find do |line|
-      case line
-      when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/
-        sys, can = $1, $2
-        can.downcase!
-        map[can] = sys
-        false
-      when /^\s*;;/
-        true
-      else
-        false
-      end
-    end
-  end
-  case target
-  when /linux|-gnu/
-    # map.delete('ascii')
-  when /cygwin|os2-emx/
-    # get rid of tilde/yen problem.
-    map['shift_jis'] = 'cp932'
-  end
-  st = Hash.new(0)
-  map = map.sort.collect do |can, *sys|
-    if sys.grep(/^en_us(?=.|$)/i) {break true} == true
-      noen = %r"^(?!en_us)\w+_\w+#{Regexp.new($')}$"i #"
-      sys.reject! {|s| noen =~ s}
-    end
-    sys = sys.first
-    st[sys] += 1
-    [can, sys]
-  end
-  st.delete_if {|sys, i| i == 1}.empty?
-  st.keys.each {|sys| st[sys] = nil}
-  st.default = nil
-  writer = proc do |f|
-    f.puts("require 'iconv.so'")
-    f.puts
-    f.puts(comments)
-    f.puts("class Iconv")
-    i = 0
-    map.each do |can, sys|
-      if s = st[sys]
-        sys = s
-      elsif st.key?(sys)
-        sys = (st[sys] = "sys#{i+=1}") + " = '#{sys}'.freeze"
-      else
-        sys = "'#{sys}'.freeze"
-      end
-      f.puts("  charset_map['#{can}'] = #{sys}")
-    end
-    f.puts("end")
-  end
-  if mapfile
-    open(mapfile, "w", &writer)
-  else
-    writer[STDOUT]
-  end
-end
-
-target = OS
-opt = nil
-ARGV.options do |opt|
-  opt.banner << " config.status map.rb"
-  opt.on("--target OS") {|t| target = t}
-  opt.parse! and (1..2) === ARGV.size
-end or abort opt.to_s
-charset_alias(ARGV[0], ARGV[1], target)
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
index a9d0cfb5e6..55d9c5da5f 100644
--- a/ext/iconv/extconf.rb
+++ b/ext/iconv/extconf.rb
@@ -2,50 +2,7 @@ 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_func("iconv", "iconv.h") or
-    have_library("iconv", "iconv", "iconv.h")
-  if checking_for("const of iconv() 2nd argument") do
-      create_tmpsrc(cpp_include("iconv.h") + "---> iconv(cd,0,0,0,0) <---")
-      src = xpopen(cpp_command("")) {|f|f.read}
-      if !(func = src[/^--->\s*(\w+).*\s*<---/, 1])
-        Logging::message "iconv function name not found"
-        false
-      elsif !(second = src[%r"\b#{func}\s*\(.*?,(.*?),.*?\)\s*;"m, 1])
-        Logging::message "prototype for #{func}() not found"
-        false
-      else
-        Logging::message $&+"\n"
-        /\bconst\b/ =~ second
-      end
-    end
-    $defs.push('-DICONV_INPTR_CONST')
-  end
-  if conf
-    prefix = '$(srcdir)'
-    prefix =  $nmake ? "{#{prefix}}" : "#{prefix}/"
-    if $extout
-      wrapper = "$(RUBYARCHDIR)/iconv.rb"
-    else
-      wrapper = "./iconv.rb"
-      $INSTALLFILES = [[wrapper, "$(RUBYARCHDIR)"]]
-    end
-    if String === conf
-      require 'uri'
-      scheme = URI.parse(conf).scheme
-    else
-      conf = "$(srcdir)/config.charset"
-    end
-    $cleanfiles << wrapper
-  end
+if have_header("iconv.h")
+  have_library("iconv")
   create_makefile("iconv")
-  if conf
-    open("Makefile", "a") do |mf|
-      mf.print("\nall: #{wrapper}\n\n#{wrapper}: #{prefix}charset_alias.rb")
-      mf.print(" ", conf) unless scheme
-      mf.print("\n\t$(RUBY) $(srcdir)/charset_alias.rb #{conf} $@\n")
-    end
-  end
 end
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 918dd51630..098ffb0cfc 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -3,72 +3,41 @@
 
   iconv.c -
 
-  $Author: matz $
-  $Date: 2005/12/12 00:36:51 $
+  $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).
 
-  Documentation by Yukihiro Matsumoto and Gavin Sinclair.
-
 **********************************************************************/
 
-#include "ruby.h"
+/*
+=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 <errno.h>
 #include <iconv.h>
 #include <assert.h>
-#include "st.h"
+#include "ruby.h"
 #include "intern.h"
 
-/*
- * Document-class: Iconv
- *
- * == Summary
- *
- * Ruby extension for charset conversion.
- * 
- * == Abstract
- *
- * Iconv is a wrapper class for the UNIX 95 <tt>iconv()</tt> function family,
- * which translates string between various encoding systems.
- * 
- * See Open Group's on-line documents for more details.
- * * <tt>iconv.h</tt>:       http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.h.html
- * * <tt>iconv_open()</tt>:  http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_open.html
- * * <tt>iconv()</tt>:       http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html
- * * <tt>iconv_close()</tt>: http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_close.html
- * 
- * Which coding systems are available is platform-dependent.
- * 
- * == Examples
- *
- * 1. Instantiate a new Iconv and 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)
- *
- * 4. Simple conversion between two charsets.
- *
- *      converted_text = Iconv.new('iso-8859-15', 'utf-8').iconv(text)
- */
-
 /* 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))
@@ -80,24 +49,20 @@ struct iconv_env_t
     int argc;
     VALUE *argv;
     VALUE ret;
-    VALUE (*append)_((VALUE, VALUE));
 };
 
-static VALUE rb_eIconvInvalidEncoding;
 static VALUE rb_eIconvFailure;
 static VALUE rb_eIconvIllegalSeq;
 static VALUE rb_eIconvInvalidChar;
 static VALUE rb_eIconvOutOfRange;
-static VALUE rb_eIconvBrokenLibrary;
+static ID rb_inserter;
 
-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 ID rb_success, rb_failed, rb_mesg;
+static VALUE iconv_failure_initialize _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env));
 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));
@@ -111,52 +76,30 @@ static VALUE iconv_init_state _((VALUE cd));
 static VALUE iconv_finish _((VALUE self));
 static VALUE iconv_iconv _((int argc, VALUE *argv, VALUE self));
 
-static VALUE charset_map;
-
+
 /*
- * Document-method: charset_map
- * call-seq: Iconv.charset_map
- *
- * Returns the map from canonical name to system dependent name.
- */
-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) {
-	VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0);
-	StringValuePtr(key);
-	if (st_lookup(RHASH(charset_map)->tbl, key, &val)) {
-	    *code = val;
-	}
-    }
-    return StringValuePtr(*code);
-}
+=begin
+= Classes & Modules
+=end
+*/
 
+/*
+=begin
+== Iconv
+=end
+*/
 static iconv_t
 iconv_create
 #ifdef HAVE_PROTOTYPES
-    (VALUE to, VALUE from)
+(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);
+    const char* tocode = StringValuePtr(to);
+    const char* fromcode = StringValuePtr(from);
 
     iconv_t cd = iconv_open(tocode, fromcode);
 
@@ -169,42 +112,20 @@ iconv_create
 	    cd = iconv_open(tocode, fromcode);
 	}
 	if (cd == (iconv_t)-1) {
-	    int inval = errno == EINVAL;
-	    char *s = inval ? "invalid encoding " : "iconv";
-	    volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING(to)->len +
-					    RSTRING(from)->len + 8);
-
-	    sprintf(RSTRING(msg)->ptr, "%s(\"%s\", \"%s\")",
-		    s, RSTRING(to)->ptr, RSTRING(from)->ptr);
-	    s = RSTRING(msg)->ptr;
-	    RSTRING(msg)->len = strlen(s);
-	    if (!inval) rb_sys_fail(s);
-	    iconv_fail(rb_eIconvInvalidEncoding,
-		       Qnil, rb_ary_new3(2, to, from), NULL, s);
+	    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)
+(VALUE cd)
 #else /* HAVE_PROTOTYPES */
     (cd)
     VALUE cd;
@@ -215,26 +136,12 @@ iconv_free
     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);
-}
+#define ICONV_FREE (RUBY_DATA_FUNC)iconv_free
 
 static VALUE
 iconv_try
 #ifdef HAVE_PROTOTYPES
-    (iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
+(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;
@@ -244,16 +151,7 @@ iconv_try
     size_t *outlen;
 #endif /* HAVE_PROTOTYPES */
 {
-#ifdef ICONV_INPTR_CONST
-#define ICONV_INPTR_CAST
-#else
-#define ICONV_INPTR_CAST (char **)
-#endif
-    size_t ret;
-
-    errno = 0;
-    ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen);
-    if (ret == (size_t)-1) {
+    if (iconv(cd, (char **)inptr, inlen, outptr, outlen) == (size_t)-1) {
 	if (!*inlen)
 	    return Qfalse;
 	switch (errno) {
@@ -261,83 +159,53 @@ iconv_try
 	    /* try the left in next loop */
 	    break;
 	  case EILSEQ:
-	    return rb_eIconvIllegalSeq;
+	    return rb_class_new_instance(0, 0, rb_eIconvIllegalSeq);
 	  case EINVAL:
-	    return rb_eIconvInvalidChar;
-	  case 0:
-	    return rb_eIconvBrokenLibrary;
+	    return rb_class_new_instance(0, 0, rb_eIconvInvalidChar);
 	  default:
 	    rb_sys_fail("iconv");
 	}
     }
     else if (*inlen > 0) {
 	/* something goes wrong */
-	return rb_eIconvIllegalSeq;
-    }
-    else if (ret) {
-	return Qnil;		/* conversion */
+	return rb_class_new_instance(0, 0, rb_eIconvIllegalSeq);
     }
     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;
-}
+#define iconv_fail(error, success, failed, env) \
+	rb_exc_raise(iconv_failure_initialize(error, success, failed, env))
 
 static VALUE
-iconv_fail
+iconv_failure_initialize
 #ifdef HAVE_PROTOTYPES
-    (VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
+(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env)
 #else /* HAVE_PROTOTYPES */
-    (error, success, failed, env, mesg)
-    VALUE error, success, failed;
+    (error, success, failed, env)
+    VALUE error;
+    VALUE success;
+    VALUE 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 (!rb_ivar_defined(error, rb_mesg) || NIL_P(rb_ivar_get(error, rb_mesg)))
+	rb_ivar_set(error, rb_mesg, rb_inspect(failed));
     if (env) {
-	args[1] = env->append(rb_obj_dup(env->ret), success);
+	success = rb_funcall3(env->ret, rb_inserter, 1, &success);
 	if (env->argc > 0) {
 	    *(env->argv) = failed;
-	    args[2] = rb_ary_new4(env->argc, env->argv);
+	    failed = 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);
+    rb_ivar_set(error, rb_success, success);
+    rb_ivar_set(error, rb_failed, failed);
+    return error;
 }
 
 static VALUE
 rb_str_derive
 #ifdef HAVE_PROTOTYPES
-    (VALUE str, const char* ptr, int len)
+(VALUE str, const char* ptr, int len)
 #else /* HAVE_PROTOTYPES */
     (str, ptr, len)
     VALUE str;
@@ -351,10 +219,7 @@ rb_str_derive
 	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);
+    ret = rb_str_new(ptr, len);
     OBJ_INFECT(ret, str);
     return ret;
 }
@@ -362,7 +227,7 @@ rb_str_derive
 static VALUE
 iconv_convert
 #ifdef HAVE_PROTOTYPES
-    (iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env)
+(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;
@@ -374,7 +239,6 @@ iconv_convert
 {
     VALUE ret = Qfalse;
     VALUE error = Qfalse;
-    VALUE rescue;
     const char *inptr, *instart;
     size_t inlen;
     /* I believe ONE CHARACTER never exceed this. */
@@ -392,20 +256,8 @@ iconv_convert
 	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);
-	    }
-	}
+	if (error)
+	    iconv_fail(error, Qnil, Qnil, env);
 
 	inptr = NULL;
 	length = 0;
@@ -413,7 +265,7 @@ iconv_convert
     else {
 	int slen;
 
-	StringValue(str);
+	Check_Type(str, T_STRING);
 	slen = RSTRING(str)->len;
 	inptr = RSTRING(str)->ptr;
 
@@ -430,18 +282,15 @@ iconv_convert
     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 */
+	    if (outlen > inptr - tmpstart || /* input can't contain output */
 		(outlen < inptr - tmpstart && inlen > 0) || /* something skipped */
 		memcmp(buffer, tmpstart, outlen)) /* something differs */
 	    {
@@ -466,47 +315,58 @@ iconv_convert
 	}
 	else {
 	    /* Some iconv() have a bug, return *outlen out of range */
-	    sprintf(errmsg, "bug?(output length = %ld)", (long)(sizeof(buffer) - outlen));
-	    error = rb_eIconvOutOfRange;
+	    char errmsg[50];
+	    sprintf(errmsg, "bug?(output length = %d)", sizeof(buffer) - outlen);
+	    error = rb_exc_new2(rb_eIconvOutOfRange, errmsg);
 	}
 
-	if (RTEST(error)) {
-	    long len = 0;
-
+	if (error) {
 	    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;
+	    iconv_fail(error, ret, str, env);
 	}
     } 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)
+(VALUE klass)
 #else /* HAVE_PROTOTYPES */
     (klass)
     VALUE klass;
@@ -515,28 +375,10 @@ iconv_s_allocate
     return Data_Wrap_Struct(klass, 0, ICONV_FREE, 0);
 }
 
-/*
- * Document-method: new
- * call-seq: Iconv.new(to, from)
- *
- * Creates new code converter from a coding-system designated with +from+
- * to another one designated with +to+.
- * 
- * === Parameters
- *
- * +to+::   encoding name for destination
- * +from+:: encoding name for source
- *
- * === Exceptions
- *
- * TypeError::       if +to+ or +from+ aren't String
- * InvalidEncoding:: if designated converter couldn't find out
- * SystemCallError:: if <tt>iconv_open(3)</tt> fails
- */
 static VALUE
 iconv_initialize
 #ifdef HAVE_PROTOTYPES
-    (VALUE self, VALUE to, VALUE from)
+(VALUE self, VALUE to, VALUE from)
 #else /* HAVE_PROTOTYPES */
     (self, to, from)
     VALUE self;
@@ -544,24 +386,16 @@ iconv_initialize
     VALUE from;
 #endif /* HAVE_PROTOTYPES */
 {
-    iconv_free(check_iconv(self));
+    iconv_free((VALUE)(DATA_PTR(self)));
     DATA_PTR(self) = NULL;
     DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from));
     return self;
 }
 
-/*
- * Document-method: open
- * call-seq: Iconv.open(to, from) { |iconv| ... }
- *
- * Equivalent to Iconv.new except that when it is called with a block, it
- * yields with the new instance and closes it, and returns the result which
- * returned from the block.
- */
 static VALUE
 iconv_s_open
 #ifdef HAVE_PROTOTYPES
-    (VALUE self, VALUE to, VALUE from)
+(VALUE self, VALUE to, VALUE from)
 #else /* HAVE_PROTOTYPES */
     (self, to, from)
     VALUE self;
@@ -571,19 +405,35 @@ iconv_s_open
 {
     VALUE cd = ICONV2VALUE(iconv_create(to, from));
 
-    self = Data_Wrap_Struct(self, NULL, ICONV_FREE, (void *)cd);
     if (rb_block_given_p()) {
+	self = Data_Wrap_Struct(self, NULL, NULL, (void *)cd);
 	return rb_ensure(rb_yield, self, (VALUE(*)())iconv_finish, self);
     }
     else {
-	return self;
+	return Data_Wrap_Struct(self, NULL, ICONV_FREE, (void *)cd);
     }
 }
 
+/*
+=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)
+(struct iconv_env_t* env)
 #else /* HAVE_PROTOTYPES */
     (env)
     struct iconv_env_t *env;
@@ -593,40 +443,22 @@ iconv_s_convert
 
     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);
+	rb_funcall3(env->ret, rb_inserter, 1, &s);
     }
 
     if (!NIL_P(last)) {
 	VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env);
 	if (RSTRING(s)->len)
-	    env->append(env->ret, s);
+	    rb_funcall3(env->ret, rb_inserter, 1, &s);
     }
 
     return env->ret;
 }
 
-/*
- * Document-method: iconv
- * call-seq: Iconv.iconv(to, from, *strs)
- *
- * Shorthand for
- *   Iconv.open(to, from) { |cd|
- *     (strs + [nil]).collect { |s| cd.iconv(s) }
- *   }
- *
- * === Parameters
- *
- * <tt>to, from</tt>:: see Iconv.new
- * <tt>strs</tt>:: strings to be converted
- *
- * === Exceptions
- *
- * Exceptions thrown by Iconv.new, Iconv.open and Iconv#iconv.
- */
 static VALUE
 iconv_s_iconv
 #ifdef HAVE_PROTOTYPES
-    (int argc, VALUE *argv, VALUE self)
+(int argc, VALUE *argv, VALUE self)
 #else /* HAVE_PROTOTYPES */
     (argc, argv, self)
     int argc;
@@ -637,58 +469,36 @@ iconv_s_iconv
     struct iconv_env_t arg;
 
     if (argc < 2)		/* needs `to' and `from' arguments at least */
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, 2);
+	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));
 }
 
+
 /*
- * Document-method: Iconv::conv
- * call-seq: Iconv.iconv(to, from, *strs)
- *
- * Shorthand for
- *   Iconv.iconv(to, from, str).join
- * See Iconv.iconv.
- */
-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
+*/
 /*
- * Document-method: close
- *
- * Finishes conversion.
- *
- * After calling this, calling Iconv#iconv will cause an exception, but
- * multiple calls of #close are guaranteed to end successfully.
- *
- * Returns a string containing the byte sequence to change the output buffer to
- * its initial shift state.
- */
+=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)
+(VALUE cd)
 #else /* HAVE_PROTOTYPES */
     (cd)
     VALUE cd;
@@ -700,14 +510,17 @@ iconv_init_state
 static VALUE
 iconv_finish
 #ifdef HAVE_PROTOTYPES
-    (VALUE self)
+(VALUE self)
 #else /* HAVE_PROTOTYPES */
     (self)
     VALUE self;
 #endif /* HAVE_PROTOTYPES */
 {
-    VALUE cd = check_iconv(self);
+    VALUE cd;
 
+    Check_Type(self, T_DATA);
+
+    cd = (VALUE)DATA_PTR(self);
     if (!cd) return Qnil;
     DATA_PTR(self) = NULL;
 
@@ -715,36 +528,34 @@ iconv_finish
 }
 
 /*
- * Document-method: iconv
- * call-seq: iconv(str, start=0, length=-1)
- *
- * Converts string and returns the result.
- * * If +str+ is a String, converts <tt>str[start, length]</tt> and returns the converted string.
- * * If +str+ is +nil+, places converter itself into initial shift state and
- *   just returns a string containing the byte sequence to change the output
- *   buffer to its initial shift state.
- * * Otherwise, raises an exception.
- *
- * === Parameters
- *
- * str::    string to be converted, or nil
- * start::  starting offset
- * length:: conversion length; nil or -1 means whole the string from start
- *
- * === Exceptions
- *
- * * IconvIllegalSequence
- * * IconvInvalidCharacter
- * * IconvOutOfRange
- *
- * === Examples
- *
- * See the Iconv documentation.
- */
+=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)
+(int argc, VALUE *argv, VALUE self)
 #else /* HAVE_PROTOTYPES */
     (argc, argv, self)
     int argc;
@@ -753,32 +564,41 @@ iconv_iconv
 #endif /* HAVE_PROTOTYPES */
 {
     VALUE str, n1, n2;
-    VALUE cd = check_iconv(self);
+
+    Check_Type(self, T_DATA);
 
     n1 = n2 = Qnil;
     rb_scan_args(argc, argv, "12", &str, &n1, &n2);
 
-    return iconv_convert(VALUE2ICONV(cd), str,
+    return iconv_convert(VALUE2ICONV(DATA_PTR(self)), str,
 			 NIL_P(n1) ? 0 : NUM2INT(n1),
-			 NIL_P(n2) ? -1 : NUM2INT(n2),
+			 NIL_P(n2) ? -1 : NUM2INT(n1),
 			 NULL);
 }
 
+
+/*
+=begin
+= Exceptions
+=end
+*/
 /*
- * Document-class: Iconv::Failure
- *
- * Base attributes for Iconv exceptions.
- */
+=begin
+== Iconv::Failure
+Base exceptional attributes from ((<Iconv>)).
 
+=== Instance methods
+=end
+*/
 /*
- * Document-method: success
- * call-seq: 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.
- */
+=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
@@ -788,16 +608,16 @@ iconv_failure_success
     VALUE self;
 #endif /* HAVE_PROTOTYPES */
 {
-    return rb_attr_get(self, rb_success);
+    return rb_ivar_get(self, rb_success);
 }
 
 /*
- * Document-method: failed
- * call-seq: failed
- *
- * Returns substring of the original string passed to Iconv that starts at the
- * character caused the exception. 
- */
+=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
@@ -807,27 +627,27 @@ iconv_failure_failed
     VALUE self;
 #endif /* HAVE_PROTOTYPES */
 {
-    return rb_attr_get(self, rb_failed);
+    return rb_ivar_get(self, rb_failed);
 }
 
 /*
- * Document-method: inspect
- * call-seq: inspect
- *
- * Returns inspected string like as: #<_class_: _success_, _failed_>
- */
+=begin
+--- Iconv::Failure#inspect
+    Returns inspected string like as: #<(({type})): "(({success}))", "(({failed}))">
+=end
+*/
 static VALUE
 iconv_failure_inspect
 #ifdef HAVE_PROTOTYPES
-    (VALUE self)
+(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 success = iconv_failure_success(self);
+    VALUE failed = iconv_failure_failed(self);
     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));
@@ -837,74 +657,82 @@ iconv_failure_inspect
 }
 
 /*
- * Document-class: Iconv::InvalidEncoding
- * 
- * Requested coding-system is not available on this system.
- */
-
-/*
- * Document-class: 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.
- */
-
-/*
- * Document-class: Iconv::InvalidCharacter
- * 
- * Input conversion stopped due to an incomplete character or shift
- * sequence at the end of the input buffer.
- */
-
-/*
- * Document-class: Iconv::OutOfRange
- * 
- * Iconv library internal error.  Must not occur.
- */
-
-/*
- * Document-class: Iconv::BrokenLibrary
- * 
- * Detected a bug of underlying iconv(3) libray.
- * * returns an error without setting errno properly
- */
+  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);
-
     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_eIconvInvalidEncoding = rb_define_class_under(rb_cIconv, "InvalidEncoding", rb_eArgError);
     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_eIconvBrokenLibrary = rb_define_class_under(rb_cIconv, "BrokenLibrary", rb_eRuntimeError);
-    rb_include_module(rb_eIconvInvalidEncoding, rb_eIconvFailure);
     rb_include_module(rb_eIconvIllegalSeq, rb_eIconvFailure);
     rb_include_module(rb_eIconvInvalidChar, rb_eIconvFailure);
     rb_include_module(rb_eIconvOutOfRange, rb_eIconvFailure);
-    rb_include_module(rb_eIconvBrokenLibrary, rb_eIconvFailure);
 
+    rb_inserter = rb_intern("<<");
     rb_success = rb_intern("success");
     rb_failed = rb_intern("failed");
-
-    rb_gc_register_address(&charset_map);
-    charset_map = rb_hash_new();
-    rb_define_singleton_method(rb_cIconv, "charset_map", charset_map_get, 0);
+    rb_mesg = rb_intern("mesg");
 }
 
+
+/*
+=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/extconf.rb b/ext/io/wait/extconf.rb
deleted file mode 100644
index 1352ef202e..0000000000
--- a/ext/io/wait/extconf.rb
+++ /dev/null
@@ -1,17 +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") {have_macro("FIONREAD", h)}
-  end
-  if fionread
-    $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
-    create_makefile(target)
-  end
-else
-  if have_func("rb_w32_ioctlsocket", "ruby.h")
-    have_func("rb_w32_is_socket", "ruby.h")
-    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 2103fdf25b..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 if defined?(Fcntl::F_GETFL)
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
deleted file mode 100644
index 0e48f705d2..0000000000
--- a/ext/io/wait/wait.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/**********************************************************************
-
-  io/wait.c -
-
-  $Author: nobu $
-  $Date: 2005/07/18 03:24:04 $
-  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>
-#if defined(FIONREAD_HEADER)
-#include FIONREAD_HEADER
-#endif
-
-#ifdef HAVE_RB_W32_IOCTLSOCKET
-#define ioctl ioctlsocket
-#define ioctl_arg u_long
-#define ioctl_arg2num(i) ULONG2NUM(i)
-#else
-#define ioctl_arg int
-#define ioctl_arg2num(i) INT2NUM(i)
-#endif
-
-#ifdef HAVE_RB_W32_IS_SOCKET
-#define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fd)
-#else
-#define FIONREAD_POSSIBLE_P(fd) ((fd),Qtrue)
-#endif
-
-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;
-    ioctl_arg n;
-
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
-    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 ioctl_arg2num(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;
-    ioctl_arg 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 (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
-    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/nkf/MANIFEST b/ext/nkf/MANIFEST
new file mode 100644
index 0000000000..5114a3762a
--- /dev/null
+++ b/ext/nkf/MANIFEST
@@ -0,0 +1,7 @@
+MANIFEST
+depend
+extconf.rb
+lib/kconv.rb
+nkf.c
+nkf1.7/nkf.c
+test.rb
diff --git a/ext/nkf/depend b/ext/nkf/depend
index 0ed8fea8d2..13e32e6074 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)/nkf-utf8/nkf.c $(srcdir)/nkf-utf8/utf8tbl.c $(srcdir)/nkf-utf8/config.h
+nkf.o : nkf.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(srcdir)/nkf1.7/nkf.c
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index 711a3c10a1..af6d82275f 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -1,367 +1,73 @@
-#
-# kconv.rb - Kanji Converter.
-#
-# $Id: kconv.rb,v 1.3.6.6 2006/06/19 14:52:54 naruse Exp $
-#
-# ----
-#
-# kconv.rb implements the Kconv class for Kanji Converter.  Additionally,
-# some methods in String classes are added to allow easy conversion.
-#
-
 require 'nkf'
 
-#
-# Kanji Converter for Ruby.
-#
 module Kconv
-  #
-  # Public Constants
-  #
-  
-  #Constant of Encoding
-  
-  # Auto-Detect
   AUTO = NKF::AUTO
-  # ISO-2022-JP
   JIS = NKF::JIS
-  # EUC-JP
   EUC = NKF::EUC
-  # Shift_JIS
   SJIS = NKF::SJIS
-  # BINARY
   BINARY = NKF::BINARY
-  # NOCONV
   NOCONV = NKF::NOCONV
-  # ASCII
-  ASCII = NKF::ASCII
-  # UTF-8
-  UTF8 = NKF::UTF8
-  # UTF-16
-  UTF16 = NKF::UTF16
-  # UTF-32
-  UTF32 = NKF::UTF32
-  # UNKNOWN
   UNKNOWN = NKF::UNKNOWN
-
-  #
-  # Private Constants
-  #
-  
-  # Revision of kconv.rb
-  REVISION = %q$Revision: 1.3.6.6 $
-  
-  #Regexp of Encoding
-  
-  # Regexp of Shift_JIS string (private constant)
-  RegexpShiftjis = /\A(?:
-		       [\x00-\x7f\xa1-\xdf] |
-		       [\x81-\x9f\xe0-\xfc][\x40-\x7e\x80-\xfc] 
-		      )*\z/nx
-
-  # Regexp of EUC-JP string (private constant)
-  RegexpEucjp = /\A(?:
-		    [\x00-\x7f]                         |
-		    \x8e        [\xa1-\xdf]             |
-		    \x8f        [\xa1-\xdf] [\xa1-\xfe] |
-		    [\xa1-\xdf] [\xa1-\xfe]
-		   )*\z/nx
-
-  # Regexp of UTF-8 string (private constant)
-  RegexpUtf8  = /\A(?:
-		    [\x00-\x7f]                                     |
-		    [\xc2-\xdf] [\x80-\xbf]                         |
-		    \xe0        [\xa0-\xbf] [\x80-\xbf]             |
-		    [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]             |
-		    \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf] |
-		    [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf] |
-		    \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf]
-		   )*\z/nx
-
-  #
-  # Public Methods
-  #
-  
-  # call-seq:
-  #    Kconv.kconv(str, out_code, in_code = Kconv::AUTO)
-  #
-  # Convert <code>str</code> to out_code.
-  # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want to decode them, use NKF.nkf.
   def kconv(str, out_code, in_code = AUTO)
     opt = '-'
     case in_code
-    when ::NKF::JIS
+    when NKF::JIS
       opt << 'J'
-    when ::NKF::EUC
+    when NKF::EUC
       opt << 'E'
-    when ::NKF::SJIS
+    when NKF::SJIS
       opt << 'S'
-    when ::NKF::UTF8
-      opt << 'W'
-    when ::NKF::UTF16
-      opt << 'W16'
     end
 
     case out_code
-    when ::NKF::JIS
+    when NKF::JIS
       opt << 'j'
-    when ::NKF::EUC
+    when NKF::EUC
       opt << 'e'
-    when ::NKF::SJIS
+    when NKF::SJIS
       opt << 's'
-    when ::NKF::UTF8
-      opt << 'w'
-    when ::NKF::UTF16
-      opt << 'w16'
-    when ::NKF::NOCONV
+    when NKF::NOCONV
       return str
     end
 
     opt = '' if opt == '-'
 
-    ::NKF::nkf(opt, str)
+    NKF::nkf(opt, str)
   end
   module_function :kconv
 
-  #
-  # Encode to
-  #
-
-  # call-seq:
-  #    Kconv.tojis(str)   -> string
-  #
-  # Convert <code>str</code> to ISO-2022-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-jxm0', str).
   def tojis(str)
-    ::NKF::nkf('-jm', str)
+    NKF::nkf('-j', str)
   end
   module_function :tojis
 
-  # call-seq:
-  #    Kconv.toeuc(str)   -> string
-  #
-  # Convert <code>str</code> to EUC-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-exm0', str).
   def toeuc(str)
-    ::NKF::nkf('-em0', str)
+    NKF::nkf('-e', str)
   end
   module_function :toeuc
 
-  # call-seq:
-  #    Kconv.tosjis(str)   -> string
-  #
-  # Convert <code>str</code> to Shift_JIS
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-sxm0', str).
   def tosjis(str)
-    ::NKF::nkf('-sm', str)
+    NKF::nkf('-s', str)
   end
   module_function :tosjis
 
-  # call-seq:
-  #    Kconv.toutf8(str)   -> string
-  #
-  # Convert <code>str</code> to UTF-8
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-wxm0', str).
-  def toutf8(str)
-    ::NKF::nkf('-wm', str)
-  end
-  module_function :toutf8
-
-  # call-seq:
-  #    Kconv.toutf16(str)   -> string
-  #
-  # Convert <code>str</code> to UTF-16
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-w16xm0', str).
-  def toutf16(str)
-    ::NKF::nkf('-w16m', str)
-  end
-  module_function :toutf16
-
-  #
-  # guess
-  #
-
-  # call-seq:
-  #    Kconv.guess(str)   -> integer
-  #
-  # Guess input encoding by NKF.guess2
   def guess(str)
-    ::NKF::guess(str)
+    NKF::guess(str)
   end
   module_function :guess
-
-  # call-seq:
-  #    Kconv.guess_old(str)   -> integer
-  #
-  # Guess input encoding by NKF.guess1
-  def guess_old(str)
-    ::NKF::guess1(str)
-  end
-  module_function :guess_old
-
-  #
-  # isEncoding
-  #
-
-  # call-seq:
-  #    Kconv.iseuc(str)   -> obj or nil
-  #
-  # Returns whether input encoding is EUC-JP or not.
-  #
-  # *Note* don't expect this return value is MatchData.
-  def iseuc(str)
-    RegexpEucjp.match( str )
-  end
-  module_function :iseuc
-
-  # call-seq:
-  #    Kconv.issjis(str)   -> obj or nil
-  #
-  # Returns whether input encoding is Shift_JIS or not.
-  #
-  # *Note* don't expect this return value is MatchData.
-  def issjis(str)
-    RegexpShiftjis.match( str )
-  end
-  module_function :issjis
-
-  # call-seq:
-  #    Kconv.isutf8(str)   -> obj or nil
-  #
-  # Returns whether input encoding is UTF-8 or not.
-  #
-  # *Note* don't expect this return value is MatchData.
-  def isutf8(str)
-    RegexpUtf8.match( str )
-  end
-  module_function :isutf8
-
 end
 
 class String
-  # call-seq:
-  #    String#kconv(out_code, in_code = Kconv::AUTO)
-  #
-  # Convert <code>self</code> to out_code.
-  # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want to decode them, use NKF.nkf.
   def kconv(out_code, in_code=Kconv::AUTO)
     Kconv::kconv(self, out_code, in_code)
   end
-  
-  #
-  # to Encoding
-  #
-  
-  # call-seq:
-  #    String#tojis   -> string
-  #
-  # Convert <code>self</code> to ISO-2022-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-jxm0', str).
-  def tojis; Kconv.tojis(self) end
-
-  # call-seq:
-  #    String#toeuc   -> string
-  #
-  # Convert <code>self</code> to EUC-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-exm0', str).
-  def toeuc; Kconv.toeuc(self) end
-
-  # call-seq:
-  #    String#tosjis   -> string
-  #
-  # Convert <code>self</code> to Shift_JIS
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-sxm0', str).
-  def tosjis; Kconv.tosjis(self) end
-
-  # call-seq:
-  #    String#toutf8   -> string
-  #
-  # Convert <code>self</code> to UTF-8
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-wxm0', str).
-  def toutf8; Kconv.toutf8(self) end
-
-  # call-seq:
-  #    String#toutf16   -> string
-  #
-  # Convert <code>self</code> to UTF-16
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-w16xm0', str).
-  def toutf16; Kconv.toutf16(self) end
-
-  #
-  # is Encoding
-  #
-
-  # call-seq:
-  #    String#iseuc   -> obj or nil
-  #
-  # Returns whether <code>self</code>'s encoding is EUC-JP or not.
-  #
-  # *Note* don't expect this return value is MatchData.
-  def iseuc;	Kconv.iseuc(self) end
-
-  # call-seq:
-  #    String#issjis   -> obj or nil
-  #
-  # Returns whether <code>self</code>'s encoding is Shift_JIS or not.
-  #
-  # *Note* don't expect this return value is MatchData.
-  def issjis;	Kconv.issjis(self) end
-
-  # call-seq:
-  #    String#isutf8   -> obj or nil
-  #
-  # Returns whether <code>self</code>'s encoding is UTF-8 or not.
-  #
-  # *Note* don't expect this return value is MatchData.
-  def isutf8;	Kconv.isutf8(self) 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-utf8/config.h b/ext/nkf/nkf-utf8/config.h
deleted file mode 100644
index 9da82c6aee..0000000000
--- a/ext/nkf/nkf-utf8/config.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
-
-/* UTF8 $BF~=PNO(B */
-#define UTF8_INPUT_ENABLE
-#define UTF8_OUTPUT_ENABLE
-
-/* Shift_JIS $BHO0O30$NJ8;z$r!"(BCP932 $B$GF1CM$JJ8;z$KFI$_49$($k(B */
-#define SHIFTJIS_CP932
-
-/* $B%*%W%7%g%s$GF~NO$r;XDj$7$?;~$K!"J8;z%3!<%I$r8GDj$9$k(B */
-#define INPUT_CODE_FIX
-
-/* --overwrite $B%*%W%7%g%s(B */
-/* by Satoru Takabayashi <ccsatoru@vega.aichi-u.ac.jp> */
-#define OVERWRITE
-
-/* --cap-input, --url-input $B%*%W%7%g%s(B */
-#define INPUT_OPTION
-
-/* --numchar-input $B%*%W%7%g%s(B */
-#define NUMCHAR_OPTION
-
-/* --debug, --no-output $B%*%W%7%g%s(B */
-#define CHECK_OPTION
-
-/* JIS X0212 */
-#define X0212_ENABLE
-
-/* --exec-in, --exec-out $B%*%W%7%g%s(B
- * pipe, fork, execvp $B$"$?$j$,L5$$$HF0$-$^$;$s!#(B
- * MS-DOS, MinGW $B$J$I$G$O(B undef $B$K$7$F$/$@$5$$(B
- * child process $B=*N;;~$N=hM}$,$$$$$+$2$s$J$N$G!"(B
- * $B%G%U%)%k%H$GL58z$K$7$F$$$^$9!#(B
- */
-/* #define EXEC_IO */
-
-/* SunOS $B$N(B cc $B$r;H$&$H$-$O(B undef $B$K$7$F$/$@$5$$(B */
-#define ANSI_C_PROTOTYPE
-
-/* int $B$,(B 32bit $BL$K~$N4D6-$G(B NUMCHAR_OPTION $B$r;H$&$K$O!"(B
- * $B%3%a%s%H$r30$7$F$/$@$5$$!#(B
- */
-/* #define INT_IS_SHORT */
-
-
-#if defined(INT_IS_SHORT)
-typedef long nkf_char;
-typedef unsigned char nkf_nfchar;
-#else
-typedef int nkf_char;
-typedef int nkf_nfchar;
-#endif
-
-/* Unicode Normalization */
-#define UNICODE_NORMALIZATION
-
-#ifndef WIN32DLL
-/******************************/
-/* $B%G%U%)%k%H$N=PNO%3!<%IA*Br(B */
-/* Select DEFAULT_CODE */
-#define DEFAULT_CODE_JIS
-/* #define DEFAULT_CODE_SJIS */
-/* #define DEFAULT_CODE_EUC */
-/* #define DEFAULT_CODE_UTF8 */
-/******************************/
-#else
-#define DEFAULT_CODE_SJIS
-#endif
-
-#if defined(NUMCHAR_OPTION) && !defined(UTF8_INPUT_ENABLE)
-#define UTF8_INPUT_ENABLE
-#endif
-
-#ifdef UNICODE_NORMALIZATION
-#ifndef UTF8_INPUT_ENABLE
-#define UTF8_INPUT_ENABLE
-#endif
-#define NORMALIZATION_TABLE_LENGTH 942
-#define NORMALIZATION_TABLE_NFC_LENGTH 3
-#define NORMALIZATION_TABLE_NFD_LENGTH 9
-struct normalization_pair{
-    const nkf_nfchar nfc[NORMALIZATION_TABLE_NFC_LENGTH];
-    const nkf_nfchar nfd[NORMALIZATION_TABLE_NFD_LENGTH];
-};
-#endif
-
-#endif /* _CONFIG_H_ */
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
deleted file mode 100644
index 0d82562326..0000000000
--- a/ext/nkf/nkf-utf8/nkf.c
+++ /dev/null
@@ -1,5633 +0,0 @@
-/** Network Kanji Filter. (PDS Version)
-************************************************************************
-** Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
-** $BO"Mm@h!'(B $B!J3t!KIY;NDL8&5f=j!!%=%U%H#38&!!;T@n!!;j(B 
-** $B!J(BE-Mail Address: ichikawa@flab.fujitsu.co.jp$B!K(B
-** Copyright (C) 1996,1998
-** Copyright (C) 2002
-** $BO"Mm@h!'(B $BN05eBg3X>pJs9)3X2J(B $B2OLn(B $B??<#(B  mime/X0208 support
-** $B!J(BE-Mail Address: kono@ie.u-ryukyu.ac.jp$B!K(B
-** $BO"Mm@h!'(B COW for DOS & Win16 & Win32 & OS/2
-** $B!J(BE-Mail Address: GHG00637@niftyserve.or.p$B!K(B
-**
-**    $B$3$N%=!<%9$N$$$+$J$kJ#<L!$2~JQ!$=$@5$b5vBz$7$^$9!#$?$@$7!"(B
-**    $B$=$N:]$K$O!"C/$,9W8%$7$?$r<($9$3$NItJ,$r;D$9$3$H!#(B
-**    $B:FG[I[$d;(;o$NIUO?$J$I$NLd$$9g$o$;$bI,MW$"$j$^$;$s!#(B
-**    $B1DMxMxMQ$b>e5-$KH?$7$J$$HO0O$G5v2D$7$^$9!#(B
-**    $B%P%$%J%j$NG[I[$N:]$K$O(Bversion message$B$rJ]B8$9$k$3$H$r>r7o$H$7$^$9!#(B
-**    $B$3$N%W%m%0%i%`$K$D$$$F$OFC$K2?$NJ]>Z$b$7$J$$!"0-$7$+$i$:!#(B
-**
-**    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.  
-**    Binary distribution requires original version messages.
-**    You don't have to ask before copying, redistribution or publishing.
-**    THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
-***********************************************************************/
-
-/***********************************************************************
-** UTF-8 $B%5%]!<%H$K$D$$$F(B
-**    $B=>Mh$N(B nkf $B$HF~$l$+$($F$=$N$^$^;H$($k$h$&$K$J$C$F$$$^$9(B
-**    nkf -e $B$J$I$H$7$F5/F0$9$k$H!"<+F0H=JL$G(B UTF-8 $B$HH=Dj$5$l$l$P!"(B
-**    $B$=$N$^$^(B euc-jp $B$KJQ49$5$l$^$9(B
-**
-**    $B$^$@%P%0$,$"$k2DG=@-$,9b$$$G$9!#(B
-**    ($BFC$K<+F0H=JL!"%3!<%I:.:_!"%(%i!<=hM}7O(B)
-**
-**    $B2?$+LdBj$r8+$D$1$?$i!"(B
-**        E-Mail: furukawa@tcp-ip.or.jp
-**    $B$^$G8fO"Mm$r$*4j$$$7$^$9!#(B
-***********************************************************************/
-/* $Id: nkf.c,v 1.2.2.11 2006/06/19 14:52:55 naruse Exp $ */
-#define NKF_VERSION "2.0.7"
-#define NKF_RELEASE_DATE "2006-06-13"
-#include "config.h"
-#include "utf8tbl.h"
-
-#define COPY_RIGHT \
-    "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \
-    "Copyright (C) 2002-2006 Kono, Furukawa, Naruse, mastodon"
-
-
-/*
-**
-**
-**
-** USAGE:       nkf [flags] [file] 
-**
-** Flags:
-** b    Output is buffered             (DEFAULT)
-** u    Output is unbuffered
-**
-** t    no operation
-**
-** j    Outout code is JIS 7 bit        (DEFAULT SELECT) 
-** s    Output code is MS Kanji         (DEFAULT SELECT) 
-** e    Output code is AT&T JIS         (DEFAULT SELECT) 
-** w    Output code is AT&T JIS         (DEFAULT SELECT) 
-** l    Output code is JIS 7bit and ISO8859-1 Latin-1
-**
-** m    MIME conversion for ISO-2022-JP
-** I    Convert non ISO-2022-JP charactor to GETA by Pekoe <pekoe@lair.net>
-** i_ Output sequence to designate JIS-kanji (DEFAULT_J)
-** o_ Output sequence to designate single-byte roman characters (DEFAULT_R)
-** M    MIME output conversion 
-**
-** r  {de/en}crypt ROT13/47
-**
-** v  display Version
-**
-** T  Text mode output        (for MS-DOS)
-**
-** x    Do not convert X0201 kana into X0208
-** Z    Convert X0208 alphabet to ASCII
-**
-** f60  fold option
-**
-** m    MIME decode
-** B    try to fix broken JIS, missing Escape
-** B[1-9]  broken level
-**
-** O   Output to 'nkf.out' file or last file name
-** d   Delete \r in line feed 
-** c   Add \r in line feed 
-** -- other long option
-** -- ignore following option (don't use with -O )
-**
-**/
-
-#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS)
-#define MSDOS
-#if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__)
-#define __WIN32__
-#endif
-#endif
-
-#ifdef PERL_XS
-#undef OVERWRITE
-#endif
-
-#ifndef PERL_XS
-#include <stdio.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(MSDOS) || defined(__OS2__)
-#include <fcntl.h>
-#include <io.h>
-#if defined(_MSC_VER) || defined(__WATCOMC__)
-#define mktemp _mktemp
-#endif
-#endif
-
-#ifdef MSDOS
-#ifdef LSI_C
-#define setbinmode(fp) fsetbin(fp)
-#elif defined(__DJGPP__)
-#include <libc/dosio.h>
-#define setbinmode(fp) djgpp_setbinmode(fp)
-#else /* Microsoft C, Turbo C */
-#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
-#endif
-#else /* UNIX */
-#define setbinmode(fp)
-#endif
-
-#if defined(__DJGPP__)
-void  djgpp_setbinmode(FILE *fp)
-{
-    /* we do not use libc's setmode(), which changes COOKED/RAW mode in device. */
-    int fd, m;
-    fd = fileno(fp);
-    m = (__file_handle_modes[fd] & (~O_TEXT)) | O_BINARY;
-    __file_handle_set(fd, m);
-}
-#endif
-
-#ifdef _IOFBF /* SysV and MSDOS, Windows */
-#define       setvbuffer(fp, buf, size)       setvbuf(fp, buf, _IOFBF, size)
-#else /* BSD */
-#define       setvbuffer(fp, buf, size)       setbuffer(fp, buf, size)
-#endif
-
-/*Borland C++ 4.5 EasyWin*/
-#if defined(__TURBOC__) && defined(_Windows) && !defined(__WIN32__) /*Easy Win */
-#define         EASYWIN
-#ifndef __WIN16__
-#define __WIN16__
-#endif
-#include <windows.h>
-#endif
-
-#ifdef OVERWRITE
-/* added by satoru@isoternet.org */
-#if defined(__EMX__)
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#if !defined(MSDOS) || defined(__DJGPP__) /* UNIX, djgpp */
-#include <unistd.h>
-#if defined(__WATCOMC__)
-#include <sys/utime.h>
-#else
-#include <utime.h>
-#endif
-#else /* defined(MSDOS) */
-#ifdef __WIN32__
-#ifdef __BORLANDC__ /* BCC32 */
-#include <utime.h>
-#else /* !defined(__BORLANDC__) */
-#include <sys/utime.h>
-#endif /* (__BORLANDC__) */
-#else /* !defined(__WIN32__) */
-#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(__OS2__) || defined(__EMX__) || defined(__IBMC__) || defined(__IBMCPP__)  /* VC++, MinGW, Watcom, emx+gcc, IBM VAC++ */
-#include <sys/utime.h>
-#elif defined(__TURBOC__) /* BCC */
-#include <utime.h>
-#elif defined(LSI_C) /* LSI C */
-#endif /* (__WIN32__) */
-#endif
-#endif
-#endif
-
-#define         FALSE   0
-#define         TRUE    1
-
-/* state of output_mode and input_mode  
-
-   c2           0 means ASCII
-                X0201
-                ISO8859_1
-                X0208
-                EOF      all termination
-   c1           32bit data
-
- */
-
-#define         ASCII           0
-#define         X0208           1
-#define         X0201           2
-#define         ISO8859_1       8
-#define         NO_X0201        3
-#define         X0212      0x2844
-#define         X0213_1    0x284F
-#define         X0213_2    0x2850
-
-/* Input Assumption */
-
-#define         JIS_INPUT       4
-#define         SJIS_INPUT      5
-#define         LATIN1_INPUT    6
-#define         FIXED_MIME      7
-#define         STRICT_MIME     8
-
-/* MIME ENCODE */
-
-#define        	ISO2022JP       9
-#define  	JAPANESE_EUC   10
-#define		SHIFT_JIS      11
-
-#define		UTF8           12
-#define		UTF8_INPUT     13
-#define		UTF16BE_INPUT  14
-#define		UTF16LE_INPUT  15
-
-#define         WISH_TRUE      15
-
-/* ASCII CODE */
-
-#define         BS      0x08
-#define         TAB     0x09
-#define         NL      0x0a
-#define         CR      0x0d
-#define         ESC     0x1b
-#define         SPACE   0x20
-#define         AT      0x40
-#define         SSP     0xa0
-#define         DEL     0x7f
-#define         SI      0x0f
-#define         SO      0x0e
-#define         SSO     0x8e
-#define         SS3     0x8f
-
-#define		is_alnum(c)  \
-            (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))
-
-/* I don't trust portablity of toupper */
-#define nkf_toupper(c)  (('a'<=c && c<='z')?(c-('a'-'A')):c)
-#define nkf_isoctal(c)  ('0'<=c && c<='7')
-#define nkf_isdigit(c)  ('0'<=c && c<='9')
-#define nkf_isxdigit(c)  (nkf_isdigit(c) || ('a'<=c && c<='f') || ('A'<=c && c <= 'F'))
-#define nkf_isblank(c) (c == SPACE || c == TAB)
-#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == NL)
-#define nkf_isalpha(c) (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
-#define nkf_isalnum(c) (nkf_isdigit(c) || nkf_isalpha(c))
-#define nkf_isprint(c) (' '<=c && c<='~')
-#define nkf_isgraph(c) ('!'<=c && c<='~')
-#define hex2bin(c) (('0'<=c&&c<='9') ? (c-'0') : \
-                    ('A'<=c&&c<='F') ? (c-'A'+10) : \
-                    ('a'<=c&&c<='f') ? (c-'a'+10) : 0 )
-#define is_eucg3(c2) (((unsigned short)c2 >> 8) == SS3)
-
-#define CP932_TABLE_BEGIN 0xFA
-#define CP932_TABLE_END   0xFC
-#define CP932INV_TABLE_BEGIN 0xED
-#define CP932INV_TABLE_END   0xEE
-#define is_ibmext_in_sjis(c2) (CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END)
-
-#define         HOLD_SIZE       1024
-#if defined(INT_IS_SHORT)
-#define         IOBUF_SIZE      2048
-#else
-#define         IOBUF_SIZE      16384
-#endif
-
-#define         DEFAULT_J       'B'
-#define         DEFAULT_R       'B'
-
-#define         SJ0162  0x00e1          /* 01 - 62 ku offset */
-#define         SJ6394  0x0161          /* 63 - 94 ku offset */
-
-#define         RANGE_NUM_MAX   18
-#define         GETA1   0x22
-#define         GETA2   0x2e
-
-
-#if defined(UTF8_OUTPUT_ENABLE) || defined(UTF8_INPUT_ENABLE)
-#define sizeof_euc_to_utf8_1byte 94
-#define sizeof_euc_to_utf8_2bytes 94
-#define sizeof_utf8_to_euc_C2 64
-#define sizeof_utf8_to_euc_E5B8 64
-#define sizeof_utf8_to_euc_2bytes 112
-#define sizeof_utf8_to_euc_3bytes 16
-#endif
-
-/* MIME preprocessor */
-
-#ifdef EASYWIN /*Easy Win */
-extern POINT _BufferSize;
-#endif
-
-struct input_code{
-    char *name;
-    nkf_char stat;
-    nkf_char score;
-    nkf_char index;
-    nkf_char buf[3];
-    void (*status_func)(struct input_code *, nkf_char);
-    nkf_char (*iconv_func)(nkf_char c2, nkf_char c1, nkf_char c0);
-    int _file_stat;
-};
-
-static char *input_codename = "";
-
-#ifndef PERL_XS
-static const char *CopyRight = COPY_RIGHT;
-#endif
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-static  nkf_char     noconvert(FILE *f);
-#endif
-static  void    module_connection(void);
-static  nkf_char     kanji_convert(FILE *f);
-static  nkf_char     h_conv(FILE *f,nkf_char c2,nkf_char c1);
-static  nkf_char     push_hold_buf(nkf_char c2);
-static  void    set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0));
-static  nkf_char     s_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
-static  nkf_char     s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1);
-static  nkf_char     e_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
-#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
-/* UCS Mapping
- * 0: Shift_JIS, eucJP-ascii
- * 1: eucJP-ms
- * 2: CP932, CP51932
- */
-#define UCS_MAP_ASCII 0
-#define UCS_MAP_MS    1
-#define UCS_MAP_CP932 2
-static int ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-#ifdef UTF8_INPUT_ENABLE
-/* no NEC special, NEC-selected IBM extended and IBM extended characters */
-static  int     no_cp932ext_f = FALSE;
-/* ignore ZERO WIDTH NO-BREAK SPACE */
-static  int     ignore_zwnbsp_f = TRUE;
-static  int     no_best_fit_chars_f = FALSE;
-static  nkf_char     unicode_subchar = '?'; /* the regular substitution character */
-static  void    nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c);
-static  void    encode_fallback_html(nkf_char c);
-static  void    encode_fallback_xml(nkf_char c);
-static  void    encode_fallback_java(nkf_char c);
-static  void    encode_fallback_perl(nkf_char c);
-static  void    encode_fallback_subchar(nkf_char c);
-static  void    (*encode_fallback)(nkf_char c) = NULL;
-static  nkf_char     w2e_conv(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1);
-static  nkf_char     w_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
-static  nkf_char     w_iconv16(nkf_char c2,nkf_char c1,nkf_char c0);
-static  nkf_char	unicode_to_jis_common(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1);
-static  nkf_char	w_iconv_common(nkf_char c1,nkf_char c0,const unsigned short *const *pp,nkf_char psize,nkf_char *p2,nkf_char *p1);
-static  void    w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0);
-static  nkf_char     ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0);
-static  nkf_char     w16e_conv(nkf_char val,nkf_char *p2,nkf_char *p1);
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-static  int     unicode_bom_f= 0;   /* Output Unicode BOM */
-static  int     w_oconv16_LE = 0;   /* utf-16 little endian */
-static  nkf_char     e2w_conv(nkf_char c2,nkf_char c1);
-static  void    w_oconv(nkf_char c2,nkf_char c1);
-static  void    w_oconv16(nkf_char c2,nkf_char c1);
-#endif
-static  void    e_oconv(nkf_char c2,nkf_char c1);
-static  nkf_char     e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1);
-static  void    s_oconv(nkf_char c2,nkf_char c1);
-static  void    j_oconv(nkf_char c2,nkf_char c1);
-static  void    fold_conv(nkf_char c2,nkf_char c1);
-static  void    cr_conv(nkf_char c2,nkf_char c1);
-static  void    z_conv(nkf_char c2,nkf_char c1);
-static  void    rot_conv(nkf_char c2,nkf_char c1);
-static  void    hira_conv(nkf_char c2,nkf_char c1);
-static  void    base64_conv(nkf_char c2,nkf_char c1);
-static  void    iso2022jp_check_conv(nkf_char c2,nkf_char c1);
-static  void    no_connection(nkf_char c2,nkf_char c1);
-static  nkf_char     no_connection2(nkf_char c2,nkf_char c1,nkf_char c0);
-
-static  void    code_score(struct input_code *ptr);
-static  void    code_status(nkf_char c);
-
-static  void    std_putc(nkf_char c);
-static  nkf_char     std_getc(FILE *f);
-static  nkf_char     std_ungetc(nkf_char c,FILE *f);
-
-static  nkf_char     broken_getc(FILE *f);
-static  nkf_char     broken_ungetc(nkf_char c,FILE *f);
-
-static  nkf_char     mime_begin(FILE *f);
-static  nkf_char     mime_getc(FILE *f);
-static  nkf_char     mime_ungetc(nkf_char c,FILE *f);
-
-static  void    switch_mime_getc(void);
-static  void    unswitch_mime_getc(void);
-static  nkf_char     mime_begin_strict(FILE *f);
-static  nkf_char     mime_getc_buf(FILE *f);
-static  nkf_char     mime_ungetc_buf(nkf_char c,FILE *f);
-static  nkf_char     mime_integrity(FILE *f,const unsigned char *p);
-
-static  nkf_char     base64decode(nkf_char c);
-static  void    mime_prechar(nkf_char c2, nkf_char c1);
-static  void    mime_putc(nkf_char c);
-static  void    open_mime(nkf_char c);
-static  void    close_mime(void);
-static  void    eof_mime(void);
-static  void    mimeout_addchar(nkf_char c);
-#ifndef PERL_XS
-static  void    usage(void);
-static  void    version(void);
-#endif
-static  void    options(unsigned char *c);
-#if defined(PERL_XS) || defined(WIN32DLL)
-static  void    reinit(void);
-#endif
-
-/* buffers */
-
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-static unsigned char   stdibuf[IOBUF_SIZE];
-static unsigned char   stdobuf[IOBUF_SIZE];
-#endif
-static unsigned char   hold_buf[HOLD_SIZE*2];
-static int             hold_count;
-
-/* MIME preprocessor fifo */
-
-#define MIME_BUF_SIZE   (1024)    /* 2^n ring buffer */
-#define MIME_BUF_MASK   (MIME_BUF_SIZE-1)   
-#define Fifo(n)         mime_buf[(n)&MIME_BUF_MASK]
-static unsigned char           mime_buf[MIME_BUF_SIZE];
-static unsigned int            mime_top = 0;
-static unsigned int            mime_last = 0;  /* decoded */
-static unsigned int            mime_input = 0; /* undecoded */
-static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL;
-
-/* flags */
-static int             unbuf_f = FALSE;
-static int             estab_f = FALSE;
-static int             nop_f = FALSE;
-static int             binmode_f = TRUE;       /* binary mode */
-static int             rot_f = FALSE;          /* rot14/43 mode */
-static int             hira_f = FALSE;          /* hira/kata henkan */
-static int             input_f = FALSE;        /* non fixed input code  */
-static int             alpha_f = FALSE;        /* convert JIx0208 alphbet to ASCII */
-static int             mime_f = STRICT_MIME;   /* convert MIME B base64 or Q */
-static int             mime_decode_f = FALSE;  /* mime decode is explicitly on */
-static int             mimebuf_f = FALSE;      /* MIME buffered input */
-static int             broken_f = FALSE;       /* convert ESC-less broken JIS */
-static int             iso8859_f = FALSE;      /* ISO8859 through */
-static int             mimeout_f = FALSE;       /* base64 mode */
-#if defined(MSDOS) || defined(__OS2__) 
-static int             x0201_f = TRUE;         /* Assume JISX0201 kana */
-#else
-static int             x0201_f = NO_X0201;     /* Assume NO JISX0201 */
-#endif
-static int             iso2022jp_f = FALSE;    /* convert ISO-2022-JP */
-
-#ifdef UNICODE_NORMALIZATION
-static int nfc_f = FALSE;
-static nkf_char (*i_nfc_getc)(FILE *) = std_getc; /* input of ugetc */
-static nkf_char (*i_nfc_ungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char nfc_getc(FILE *f);
-static nkf_char nfc_ungetc(nkf_char c,FILE *f);
-#endif
-
-#ifdef INPUT_OPTION
-static int cap_f = FALSE;
-static nkf_char (*i_cgetc)(FILE *) = std_getc; /* input of cgetc */
-static nkf_char (*i_cungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char cap_getc(FILE *f);
-static nkf_char cap_ungetc(nkf_char c,FILE *f);
-
-static int url_f = FALSE;
-static nkf_char (*i_ugetc)(FILE *) = std_getc; /* input of ugetc */
-static nkf_char (*i_uungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char url_getc(FILE *f);
-static nkf_char url_ungetc(nkf_char c,FILE *f);
-#endif
-
-#if defined(INT_IS_SHORT)
-#define NKF_INT32_C(n)   (n##L)
-#else
-#define NKF_INT32_C(n)   (n)
-#endif
-#define PREFIX_EUCG3	NKF_INT32_C(0x8F00)
-#define CLASS_MASK	NKF_INT32_C(0xFF000000)
-#define CLASS_UTF16	NKF_INT32_C(0x01000000)
-#define VALUE_MASK	NKF_INT32_C(0x00FFFFFF)
-#define UNICODE_MAX	NKF_INT32_C(0x0010FFFF)
-#define is_unicode_capsule(c) ((c & CLASS_MASK) == CLASS_UTF16)
-#define is_unicode_bmp(c) ((c & VALUE_MASK) <= NKF_INT32_C(0xFFFF))
-
-#ifdef NUMCHAR_OPTION
-static int numchar_f = FALSE;
-static nkf_char (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */
-static nkf_char (*i_nungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char numchar_getc(FILE *f);
-static nkf_char numchar_ungetc(nkf_char c,FILE *f);
-#endif
-
-#ifdef CHECK_OPTION
-static int noout_f = FALSE;
-static void no_putc(nkf_char c);
-static nkf_char debug_f = FALSE;
-static void debug(const char *str);
-static nkf_char (*iconv_for_check)(nkf_char c2,nkf_char c1,nkf_char c0) = 0;
-#endif
-
-static int guess_f = FALSE;
-#if !defined PERL_XS
-static  void    print_guessed_code(char *filename);
-#endif
-static  void    set_input_codename(char *codename);
-static int is_inputcode_mixed = FALSE;
-static int is_inputcode_set   = FALSE;
-
-#ifdef EXEC_IO
-static int exec_f = 0;
-#endif
-
-#ifdef SHIFTJIS_CP932
-/* invert IBM extended characters to others */
-static int cp51932_f = TRUE;
-
-/* invert NEC-selected IBM extended characters to IBM extended characters */
-static int cp932inv_f = TRUE;
-
-/* static nkf_char cp932_conv(nkf_char c2, nkf_char c1); */
-#endif /* SHIFTJIS_CP932 */
-
-#ifdef X0212_ENABLE
-static int x0212_f = FALSE;
-static nkf_char x0212_shift(nkf_char c);
-static nkf_char x0212_unshift(nkf_char c);
-#endif
-static int x0213_f = FALSE;
-
-static unsigned char prefix_table[256];
-
-static void set_code_score(struct input_code *ptr, nkf_char score);
-static void clr_code_score(struct input_code *ptr, nkf_char score);
-static void status_disable(struct input_code *ptr);
-static void status_push_ch(struct input_code *ptr, nkf_char c);
-static void status_clear(struct input_code *ptr);
-static void status_reset(struct input_code *ptr);
-static void status_reinit(struct input_code *ptr);
-static void status_check(struct input_code *ptr, nkf_char c);
-static void e_status(struct input_code *, nkf_char);
-static void s_status(struct input_code *, nkf_char);
-
-#ifdef UTF8_INPUT_ENABLE
-static void w_status(struct input_code *, nkf_char);
-static void w16_status(struct input_code *, nkf_char);
-static int             utf16_mode = UTF16BE_INPUT;
-#endif
-
-struct input_code input_code_list[] = {
-    {"EUC-JP",    0, 0, 0, {0, 0, 0}, e_status, e_iconv, 0},
-    {"Shift_JIS", 0, 0, 0, {0, 0, 0}, s_status, s_iconv, 0},
-#ifdef UTF8_INPUT_ENABLE
-    {"UTF-8",     0, 0, 0, {0, 0, 0}, w_status, w_iconv, 0},
-    {"UTF-16",    0, 0, 0, {0, 0, 0}, w16_status, w_iconv16, 0},
-#endif
-    {0}
-};
-
-static int              mimeout_mode = 0;
-static int              base64_count = 0;
-
-/* X0208 -> ASCII converter */
-
-/* fold parameter */
-static int             f_line = 0;    /* chars in line */
-static int             f_prev = 0;
-static int             fold_preserve_f = FALSE; /* preserve new lines */
-static int             fold_f  = FALSE;
-static int             fold_len  = 0;
-
-/* options */
-static unsigned char   kanji_intro = DEFAULT_J;
-static unsigned char   ascii_intro = DEFAULT_R;
-
-/* Folding */
-
-#define FOLD_MARGIN  10
-#define DEFAULT_FOLD 60
-
-static int             fold_margin  = FOLD_MARGIN;
-
-/* converters */
-
-#ifdef DEFAULT_CODE_JIS
-#   define  DEFAULT_CONV j_oconv
-#endif
-#ifdef DEFAULT_CODE_SJIS
-#   define  DEFAULT_CONV s_oconv
-#endif
-#ifdef DEFAULT_CODE_EUC
-#   define  DEFAULT_CONV e_oconv
-#endif
-#ifdef DEFAULT_CODE_UTF8
-#   define  DEFAULT_CONV w_oconv
-#endif
-
-/* process default */
-static void (*output_conv)(nkf_char c2,nkf_char c1) = DEFAULT_CONV;
-
-static void (*oconv)(nkf_char c2,nkf_char c1) = no_connection;
-/* s_iconv or oconv */
-static nkf_char (*iconv)(nkf_char c2,nkf_char c1,nkf_char c0) = no_connection2;
-
-static void (*o_zconv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_fconv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_crconv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_rot_conv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_hira_conv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_base64conv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_iso2022jp_check_conv)(nkf_char c2,nkf_char c1) = no_connection;
-
-/* static redirections */
-
-static  void   (*o_putc)(nkf_char c) = std_putc;
-
-static  nkf_char    (*i_getc)(FILE *f) = std_getc; /* general input */
-static  nkf_char    (*i_ungetc)(nkf_char c,FILE *f) =std_ungetc;
-
-static  nkf_char    (*i_bgetc)(FILE *) = std_getc; /* input of mgetc */
-static  nkf_char    (*i_bungetc)(nkf_char c ,FILE *f) = std_ungetc;
-
-static  void   (*o_mputc)(nkf_char c) = std_putc ; /* output of mputc */
-
-static  nkf_char    (*i_mgetc)(FILE *) = std_getc; /* input of mgetc */
-static  nkf_char    (*i_mungetc)(nkf_char c ,FILE *f) = std_ungetc;
-
-/* for strict mime */
-static  nkf_char    (*i_mgetc_buf)(FILE *) = std_getc; /* input of mgetc_buf */
-static  nkf_char    (*i_mungetc_buf)(nkf_char c,FILE *f) = std_ungetc;
-
-/* Global states */
-static int output_mode = ASCII,    /* output kanji mode */
-           input_mode =  ASCII,    /* input kanji mode */
-           shift_mode =  FALSE;    /* TRUE shift out, or X0201  */
-static int mime_decode_mode =   FALSE;    /* MIME mode B base64, Q hex */
-
-/* X0201 / X0208 conversion tables */
-
-/* X0201 kana conversion table */
-/* 90-9F A0-DF */
-static const
-unsigned char cv[]= {
-    0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57,
-    0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21,
-    0x25,0x23,0x25,0x25,0x25,0x27,0x25,0x29,
-    0x25,0x63,0x25,0x65,0x25,0x67,0x25,0x43,
-    0x21,0x3c,0x25,0x22,0x25,0x24,0x25,0x26,
-    0x25,0x28,0x25,0x2a,0x25,0x2b,0x25,0x2d,
-    0x25,0x2f,0x25,0x31,0x25,0x33,0x25,0x35,
-    0x25,0x37,0x25,0x39,0x25,0x3b,0x25,0x3d,
-    0x25,0x3f,0x25,0x41,0x25,0x44,0x25,0x46,
-    0x25,0x48,0x25,0x4a,0x25,0x4b,0x25,0x4c,
-    0x25,0x4d,0x25,0x4e,0x25,0x4f,0x25,0x52,
-    0x25,0x55,0x25,0x58,0x25,0x5b,0x25,0x5e,
-    0x25,0x5f,0x25,0x60,0x25,0x61,0x25,0x62,
-    0x25,0x64,0x25,0x66,0x25,0x68,0x25,0x69,
-    0x25,0x6a,0x25,0x6b,0x25,0x6c,0x25,0x6d,
-    0x25,0x6f,0x25,0x73,0x21,0x2b,0x21,0x2c,
-    0x00,0x00};
-
-
-/* X0201 kana conversion table for daguten */
-/* 90-9F A0-DF */
-static const
-unsigned char dv[]= { 
-    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,0x25,0x74,
-    0x00,0x00,0x00,0x00,0x25,0x2c,0x25,0x2e,
-    0x25,0x30,0x25,0x32,0x25,0x34,0x25,0x36,
-    0x25,0x38,0x25,0x3a,0x25,0x3c,0x25,0x3e,
-    0x25,0x40,0x25,0x42,0x25,0x45,0x25,0x47,
-    0x25,0x49,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x25,0x50,0x25,0x53,
-    0x25,0x56,0x25,0x59,0x25,0x5c,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};
-
-/* X0201 kana conversion table for han-daguten */
-/* 90-9F A0-DF */
-static const
-unsigned char ev[]= { 
-    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,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,0x25,0x51,0x25,0x54,
-    0x25,0x57,0x25,0x5a,0x25,0x5d,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};
-
-
-/* X0208 kigou conversion table */
-/* 0x8140 - 0x819e */
-static const
-unsigned char fv[] = {
-
-    0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a,
-    0x3b,0x3f,0x21,0x00,0x00,0x27,0x60,0x00,
-    0x5e,0x00,0x5f,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x2d,0x00,0x2f,
-    0x5c,0x00,0x00,0x7c,0x00,0x00,0x60,0x27,
-    0x22,0x22,0x28,0x29,0x00,0x00,0x5b,0x5d,
-    0x7b,0x7d,0x3c,0x3e,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x2b,0x2d,0x00,0x00,
-    0x00,0x3d,0x00,0x3c,0x3e,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x24,0x00,0x00,0x25,0x23,0x26,0x2a,0x40,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-} ;
-
-
-#define    CRLF      1
-
-static int             file_out_f = FALSE;
-#ifdef OVERWRITE
-static int             overwrite_f = FALSE;
-static int             preserve_time_f = FALSE;
-static int             backup_f = FALSE;
-static char            *backup_suffix = "";
-static char *get_backup_filename(const char *suffix, const char *filename);
-#endif
-
-static int             crmode_f = 0;   /* CR, NL, CRLF */
-#ifdef EASYWIN /*Easy Win */
-static int             end_check;
-#endif /*Easy Win */
-
-#define STD_GC_BUFSIZE (256)
-nkf_char std_gc_buf[STD_GC_BUFSIZE];
-nkf_char std_gc_ndx;
-
-#ifdef WIN32DLL
-#include "nkf32dll.c"
-#elif defined(PERL_XS)
-#else /* WIN32DLL */
-int main(int argc, char **argv)
-{
-    FILE  *fin;
-    unsigned char  *cp;
-
-    char *outfname = NULL;
-    char *origfname;
-
-#ifdef EASYWIN /*Easy Win */
-    _BufferSize.y = 400;/*Set Scroll Buffer Size*/
-#endif
-
-    for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) {
-        cp = (unsigned char *)*argv;
-        options(cp);
-#ifdef EXEC_IO
-        if (exec_f){
-            int fds[2], pid;
-            if (pipe(fds) < 0 || (pid = fork()) < 0){
-                abort();
-            }
-            if (pid == 0){
-                if (exec_f > 0){
-                    close(fds[0]);
-                    dup2(fds[1], 1);
-                }else{
-                    close(fds[1]);
-                    dup2(fds[0], 0);
-                }
-                execvp(argv[1], &argv[1]);
-            }
-            if (exec_f > 0){
-                close(fds[1]);
-                dup2(fds[0], 0);
-            }else{
-                close(fds[0]);
-                dup2(fds[1], 1);
-            }
-            argc = 0;
-            break;
-        }
-#endif
-    }
-    if(x0201_f == WISH_TRUE)
-         x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
-
-    if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-    if (freopen("","wb",stdout) == NULL) 
-        return (-1);
-#else
-    setbinmode(stdout);
-#endif
-
-    if (unbuf_f)
-      setbuf(stdout, (char *) NULL);
-    else
-      setvbuffer(stdout, (char *) stdobuf, IOBUF_SIZE);
-
-    if (argc == 0) {
-      if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-      if (freopen("","rb",stdin) == NULL) return (-1);
-#else
-      setbinmode(stdin);
-#endif
-      setvbuffer(stdin, (char *) stdibuf, IOBUF_SIZE);
-      if (nop_f)
-          noconvert(stdin);
-      else {
-          kanji_convert(stdin);
-          if (guess_f) print_guessed_code(NULL);
-      }
-    } else {
-      int nfiles = argc;
-      while (argc--) {
-	    is_inputcode_mixed = FALSE;
-	    is_inputcode_set   = FALSE;
-	    input_codename = "";
-#ifdef CHECK_OPTION
-	    iconv_for_check = 0;
-#endif
-          if ((fin = fopen((origfname = *argv++), "r")) == NULL) {
-              perror(*--argv);
-              return(-1);
-          } else {
-#ifdef OVERWRITE
-              int fd = 0;
-              int fd_backup = 0;
-#endif
-
-/* reopen file for stdout */
-              if (file_out_f == TRUE) {
-#ifdef OVERWRITE
-                  if (overwrite_f){
-                      outfname = malloc(strlen(origfname)
-                                        + strlen(".nkftmpXXXXXX")
-                                        + 1);
-                      if (!outfname){
-                          perror(origfname);
-                          return -1;
-                      }
-                      strcpy(outfname, origfname);
-#ifdef MSDOS
-                      {
-                          int i;
-                          for (i = strlen(outfname); i; --i){
-                              if (outfname[i - 1] == '/'
-                                  || outfname[i - 1] == '\\'){
-                                  break;
-                              }
-                          }
-                          outfname[i] = '\0';
-                      }
-                      strcat(outfname, "ntXXXXXX");
-                      mktemp(outfname);
-			fd = open(outfname, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
-                                S_IREAD | S_IWRITE);
-#else
-                      strcat(outfname, ".nkftmpXXXXXX");
-                      fd = mkstemp(outfname);
-#endif
-                      if (fd < 0
-                          || (fd_backup = dup(fileno(stdout))) < 0
-                          || dup2(fd, fileno(stdout)) < 0
-                          ){
-                          perror(origfname);
-                          return -1;
-                      }
-                  }else
-#endif
-		  if(argc == 1 ) {
-		      outfname = *argv++;
-		      argc--;
-		  } else {
-		      outfname = "nkf.out";
-		  }
-
-		  if(freopen(outfname, "w", stdout) == NULL) {
-		      perror (outfname);
-		      return (-1);
-		  }
-                  if (binmode_f == TRUE) {
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-                      if (freopen("","wb",stdout) == NULL) 
-                           return (-1);
-#else
-                      setbinmode(stdout);
-#endif
-                  }
-              }
-              if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-                 if (freopen("","rb",fin) == NULL) 
-                    return (-1);
-#else
-                 setbinmode(fin);
-#endif 
-              setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE);
-              if (nop_f)
-                  noconvert(fin);
-              else {
-                  char *filename = NULL;
-                  kanji_convert(fin);
-                  if (nfiles > 1) filename = origfname;
-                  if (guess_f) print_guessed_code(filename);
-              }
-              fclose(fin);
-#ifdef OVERWRITE
-              if (overwrite_f) {
-                  struct stat     sb;
-#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
-                  time_t tb[2];
-#else
-                  struct utimbuf  tb;
-#endif
-
-                  fflush(stdout);
-                  close(fd);
-                  if (dup2(fd_backup, fileno(stdout)) < 0){
-                      perror("dup2");
-                  }
-                  if (stat(origfname, &sb)) {
-                      fprintf(stderr, "Can't stat %s\n", origfname);
-                  }
-                  /* $B%Q!<%_%C%7%g%s$rI|85(B */
-                  if (chmod(outfname, sb.st_mode)) {
-                      fprintf(stderr, "Can't set permission %s\n", outfname);
-                  }
-
-                  /* $B%?%$%`%9%?%s%W$rI|85(B */
-		    if(preserve_time_f){
-#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
-			tb[0] = tb[1] = sb.st_mtime;
-			if (utime(outfname, tb)) {
-			    fprintf(stderr, "Can't set timestamp %s\n", outfname);
-			}
-#else
-			tb.actime  = sb.st_atime;
-			tb.modtime = sb.st_mtime;
-			if (utime(outfname, &tb)) {
-			    fprintf(stderr, "Can't set timestamp %s\n", outfname);
-			}
-#endif
-		    }
-		    if(backup_f){
-			char *backup_filename = get_backup_filename(backup_suffix, origfname);
-#ifdef MSDOS
-			unlink(backup_filename);
-#endif
-			if (rename(origfname, backup_filename)) {
-			    perror(backup_filename);
-			    fprintf(stderr, "Can't rename %s to %s\n",
-				    origfname, backup_filename);
-			}
-		    }else{
-#ifdef MSDOS
-			if (unlink(origfname)){
-			    perror(origfname);
-			}
-#endif
-		    }
-                  if (rename(outfname, origfname)) {
-                      perror(origfname);
-                      fprintf(stderr, "Can't rename %s to %s\n",
-                              outfname, origfname);
-                  }
-                  free(outfname);
-              }
-#endif
-          }
-      }
-    }
-#ifdef EASYWIN /*Easy Win */
-    if (file_out_f == FALSE) 
-        scanf("%d",&end_check);
-    else 
-        fclose(stdout);
-#else /* for Other OS */
-    if (file_out_f == TRUE) 
-        fclose(stdout);
-#endif /*Easy Win */
-    return (0);
-}
-#endif /* WIN32DLL */
-
-#ifdef OVERWRITE
-char *get_backup_filename(const char *suffix, const char *filename)
-{
-    char *backup_filename;
-    int asterisk_count = 0;
-    int i, j;
-    int filename_length = strlen(filename);
-
-    for(i = 0; suffix[i]; i++){
-	if(suffix[i] == '*') asterisk_count++;
-    }
-
-    if(asterisk_count){
-	backup_filename = malloc(strlen(suffix) + (asterisk_count * (filename_length - 1)) + 1);
-	if (!backup_filename){
-	    perror("Can't malloc backup filename.");
-	    return NULL;
-	}
-
-	for(i = 0, j = 0; suffix[i];){
-	    if(suffix[i] == '*'){
-		backup_filename[j] = '\0';
-		strncat(backup_filename, filename, filename_length);
-		i++;
-		j += filename_length;
-	    }else{
-		backup_filename[j++] = suffix[i++];
-	    }
-	}
-	backup_filename[j] = '\0';
-    }else{
-	j = strlen(suffix) + filename_length;
-	backup_filename = malloc( + 1);
-	strcpy(backup_filename, filename);
-	strcat(backup_filename, suffix);
-	backup_filename[j] = '\0';
-    }
-    return backup_filename;
-}
-#endif
-
-static const
-struct {
-    const char *name;
-    const char *alias;
-} long_option[] = {
-    {"ic=", ""},
-    {"oc=", ""},
-    {"base64","jMB"},
-    {"euc","e"},
-    {"euc-input","E"},
-    {"fj","jm"},
-    {"help","v"},
-    {"jis","j"},
-    {"jis-input","J"},
-    {"mac","sLm"},
-    {"mime","jM"},
-    {"mime-input","m"},
-    {"msdos","sLw"},
-    {"sjis","s"},
-    {"sjis-input","S"},
-    {"unix","eLu"},
-    {"version","V"},
-    {"windows","sLw"},
-    {"hiragana","h1"},
-    {"katakana","h2"},
-    {"katakana-hiragana","h3"},
-    {"guess", "g"},
-    {"cp932", ""},
-    {"no-cp932", ""},
-#ifdef X0212_ENABLE
-    {"x0212", ""},
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-    {"utf8", "w"},
-    {"utf16", "w16"},
-    {"ms-ucs-map", ""},
-    {"fb-skip", ""},
-    {"fb-html", ""},
-    {"fb-xml", ""},
-    {"fb-perl", ""},
-    {"fb-java", ""},
-    {"fb-subchar", ""},
-    {"fb-subchar=", ""},
-#endif
-#ifdef UTF8_INPUT_ENABLE
-    {"utf8-input", "W"},
-    {"utf16-input", "W16"},
-    {"no-cp932ext", ""},
-    {"no-best-fit-chars",""},
-#endif
-#ifdef UNICODE_NORMALIZATION
-    {"utf8mac-input", ""},
-#endif
-#ifdef OVERWRITE
-    {"overwrite", ""},
-    {"overwrite=", ""},
-    {"in-place", ""},
-    {"in-place=", ""},
-#endif
-#ifdef INPUT_OPTION
-    {"cap-input", ""},
-    {"url-input", ""},
-#endif
-#ifdef NUMCHAR_OPTION
-    {"numchar-input", ""},
-#endif
-#ifdef CHECK_OPTION
-    {"no-output", ""},
-    {"debug", ""},
-#endif
-#ifdef SHIFTJIS_CP932
-    {"cp932inv", ""},
-#endif
-#ifdef EXEC_IO
-    {"exec-in", ""},
-    {"exec-out", ""},
-#endif
-    {"prefix=", ""},
-};
-
-static int option_mode = 0;
-
-void options(unsigned char *cp)
-{
-    nkf_char i, j;
-    unsigned char *p;
-    unsigned char *cp_back = NULL;
-    char codeset[32];
-
-    if (option_mode==1)
-	return;
-    while(*cp && *cp++!='-');
-    while (*cp || cp_back) {
-	if(!*cp){
-	    cp = cp_back;
-	    cp_back = NULL;
-	    continue;
-	}
-	p = 0;
-        switch (*cp++) {
-        case '-':  /* literal options */
-	    if (!*cp || *cp == SPACE) {        /* ignore the rest of arguments */
-		option_mode = 1;
-		return;
-	    }
-            for (i=0;i<sizeof(long_option)/sizeof(long_option[0]);i++) {
-                p = (unsigned char *)long_option[i].name;
-                for (j=0;*p && *p != '=' && *p == cp[j];p++, j++);
-		if (*p == cp[j] || cp[j] == ' '){
-		    p = &cp[j] + 1;
-		    break;
-		}
-		p = 0;
-            }
-	    if (p == 0) return;
-	    while(*cp && *cp != SPACE && cp++);
-            if (long_option[i].alias[0]){
-		cp_back = cp;
-		cp = (unsigned char *)long_option[i].alias;
-	    }else{
-                if (strcmp(long_option[i].name, "ic=") == 0){
-		    for (i=0; i < 16 && SPACE < p[i] && p[i] < DEL; i++){
-			codeset[i] = nkf_toupper(p[i]);
-		    }
-		    codeset[i] = 0;
-		    if(strcmp(codeset, "ISO-2022-JP") == 0 ||
-		      strcmp(codeset, "X-ISO2022JP-CP932") == 0 ||
-		      strcmp(codeset, "CP50220") == 0 ||
-		      strcmp(codeset, "CP50221") == 0 ||
-		      strcmp(codeset, "CP50222") == 0 ||
-		      strcmp(codeset, "ISO-2022-JP-MS") == 0){
-			input_f = JIS_INPUT;
-		    }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
-			input_f = JIS_INPUT;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
-#endif
-		    }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){
-			input_f = JIS_INPUT;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
-#endif
-			x0213_f = TRUE;
-		    }else if(strcmp(codeset, "SHIFT_JIS") == 0){
-			input_f = SJIS_INPUT;
-			if (x0201_f==NO_X0201) x0201_f=TRUE;
-		    }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
-			     strcmp(codeset, "CSWINDOWS31J") == 0 ||
-			     strcmp(codeset, "CP932") == 0 ||
-			     strcmp(codeset, "MS932") == 0){
-			input_f = SJIS_INPUT;
-			x0201_f = FALSE;
-#ifdef SHIFTJIS_CP932
-			cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-		    }else if(strcmp(codeset, "EUCJP") == 0 ||
-			     strcmp(codeset, "EUC-JP") == 0){
-			input_f = JIS_INPUT;
-		    }else if(strcmp(codeset, "CP51932") == 0){
-			input_f = JIS_INPUT;
-			x0201_f = FALSE;
-#ifdef SHIFTJIS_CP932
-			cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-		    }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
-			     strcmp(codeset, "EUCJP-MS") == 0 ||
-			     strcmp(codeset, "EUCJPMS") == 0){
-			input_f = JIS_INPUT;
-			x0201_f = FALSE;
-#ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_MS;
-#endif
-		    }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
-			     strcmp(codeset, "EUCJP-ASCII") == 0){
-			input_f = JIS_INPUT;
-			x0201_f = FALSE;
-#ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-		    }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
-			     strcmp(codeset, "SHIFT_JIS-2004") == 0){
-			input_f = SJIS_INPUT;
-			x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
-			cp932inv_f = FALSE;
-#endif
-			if (x0201_f==NO_X0201) x0201_f=TRUE;
-		    }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
-			     strcmp(codeset, "EUC-JIS-2004") == 0){
-			input_f = JIS_INPUT;
-			x0201_f = FALSE;
-			x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
-			cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_INPUT_ENABLE
-		    }else if(strcmp(codeset, "UTF-8") == 0 ||
-			     strcmp(codeset, "UTF-8N") == 0 ||
-			     strcmp(codeset, "UTF-8-BOM") == 0){
-			input_f = UTF8_INPUT;
-#ifdef UNICODE_NORMALIZATION
-		    }else if(strcmp(codeset, "UTF8-MAC") == 0 ||
-			     strcmp(codeset, "UTF-8-MAC") == 0){
-			input_f = UTF8_INPUT;
-			nfc_f = TRUE;
-#endif
-		    }else if(strcmp(codeset, "UTF-16") == 0){
-			input_f = UTF16BE_INPUT;
-			utf16_mode = UTF16BE_INPUT;
-		    }else if(strcmp(codeset, "UTF-16BE") == 0 ||
-			     strcmp(codeset, "UTF-16BE-BOM") == 0){
-			input_f = UTF16BE_INPUT;
-			utf16_mode = UTF16BE_INPUT;
-		    }else if(strcmp(codeset, "UTF-16LE") == 0 ||
-			     strcmp(codeset, "UTF-16LE-BOM") == 0){
-			input_f = UTF16LE_INPUT;
-			utf16_mode = UTF16LE_INPUT;
-#endif
-		    }
-                    continue;
-		}
-                if (strcmp(long_option[i].name, "oc=") == 0){
-		    for (i=0; i < 16 && SPACE < p[i] && p[i] < DEL; i++){
-			codeset[i] = nkf_toupper(p[i]);
-		    }
-		    codeset[i] = 0;
-		    if(strcmp(codeset, "ISO-2022-JP") == 0 ||
-		       strcmp(codeset, "CP50220") == 0){
-			output_conv = j_oconv;
-		    }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0){
-			output_conv = j_oconv;
-			no_cp932ext_f = TRUE;
-		    }else if(strcmp(codeset, "CP50221") == 0 ||
-			     strcmp(codeset, "ISO-2022-JP-MS") == 0){
-			output_conv = j_oconv;
-			x0201_f = FALSE;
-		    }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
-			output_conv = j_oconv;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
-#endif
-#ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
-#endif
-		    }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){
-			output_conv = j_oconv;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
-#endif
-			x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
-#endif
-		    }else if(strcmp(codeset, "ISO-2022-JP-MS") == 0){
-			output_conv = j_oconv;
-			x0201_f = FALSE;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
-#endif
-#ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
-#endif
-		    }else if(strcmp(codeset, "SHIFT_JIS") == 0){
-			output_conv = s_oconv;
-		    }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
-			     strcmp(codeset, "CSWINDOWS31J") == 0 ||
-			     strcmp(codeset, "CP932") == 0 ||
-			     strcmp(codeset, "MS932") == 0){
-			output_conv = s_oconv;
-			x0201_f = FALSE;
-#ifdef SHIFTJIS_CP932
-			cp51932_f = TRUE;
-			cp932inv_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-		    }else if(strcmp(codeset, "EUCJP") == 0 ||
-			     strcmp(codeset, "EUC-JP") == 0){
-			output_conv = e_oconv;
-		    }else if(strcmp(codeset, "CP51932") == 0){
-			output_conv = e_oconv;
-			x0201_f = FALSE;
-#ifdef SHIFTJIS_CP932
-			cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-		    }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
-			     strcmp(codeset, "EUCJP-MS") == 0 ||
-			     strcmp(codeset, "EUCJPMS") == 0){
-			output_conv = e_oconv;
-			x0201_f = FALSE;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
-#endif
-#ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_MS;
-#endif
-		    }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
-			     strcmp(codeset, "EUCJP-ASCII") == 0){
-			output_conv = e_oconv;
-			x0201_f = FALSE;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
-#endif
-#ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-			ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-		    }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
-			     strcmp(codeset, "SHIFT_JIS-2004") == 0){
-			output_conv = s_oconv;
-			x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-			cp932inv_f = FALSE;
-#endif
-		    }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
-			     strcmp(codeset, "EUC-JIS-2004") == 0){
-			output_conv = e_oconv;
-#ifdef X0212_ENABLE
-			x0212_f = TRUE;
-#endif
-			x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
-			cp51932_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-		    }else if(strcmp(codeset, "UTF-8") == 0){
-			output_conv = w_oconv;
-		    }else if(strcmp(codeset, "UTF-8N") == 0){
-			output_conv = w_oconv;
-			unicode_bom_f=1;
-		    }else if(strcmp(codeset, "UTF-8-BOM") == 0){
-			output_conv = w_oconv;
-			unicode_bom_f=2;
-		    }else if(strcmp(codeset, "UTF-16BE") == 0){
-			output_conv = w_oconv16; 
-			unicode_bom_f=1;
-		    }else if(strcmp(codeset, "UTF-16") == 0 ||
-			     strcmp(codeset, "UTF-16BE-BOM") == 0){
-			output_conv = w_oconv16; 
-			unicode_bom_f=2;
-		    }else if(strcmp(codeset, "UTF-16LE") == 0){
-			output_conv = w_oconv16; 
-			w_oconv16_LE = 1;
-			unicode_bom_f=1;
-		    }else if(strcmp(codeset, "UTF-16LE-BOM") == 0){
-			output_conv = w_oconv16; 
-			w_oconv16_LE = 1;
-			unicode_bom_f=2;
-#endif
-		    }
-                    continue;
-		}
-#ifdef OVERWRITE
-                if (strcmp(long_option[i].name, "overwrite") == 0){
-                    file_out_f = TRUE;
-                    overwrite_f = TRUE;
-		    preserve_time_f = TRUE;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "overwrite=") == 0){
-                    file_out_f = TRUE;
-                    overwrite_f = TRUE;
-		    preserve_time_f = TRUE;
-		    backup_f = TRUE;
-		    backup_suffix = malloc(strlen((char *) p) + 1);
-		    strcpy(backup_suffix, (char *) p);
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "in-place") == 0){
-                    file_out_f = TRUE;
-                    overwrite_f = TRUE;
-		    preserve_time_f = FALSE;
-		    continue;
-                }
-                if (strcmp(long_option[i].name, "in-place=") == 0){
-                    file_out_f = TRUE;
-                    overwrite_f = TRUE;
-		    preserve_time_f = FALSE;
-		    backup_f = TRUE;
-		    backup_suffix = malloc(strlen((char *) p) + 1);
-		    strcpy(backup_suffix, (char *) p);
-		    continue;
-                }
-#endif
-#ifdef INPUT_OPTION
-                if (strcmp(long_option[i].name, "cap-input") == 0){
-                    cap_f = TRUE;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "url-input") == 0){
-                    url_f = TRUE;
-                    continue;
-                }
-#endif
-#ifdef NUMCHAR_OPTION
-                if (strcmp(long_option[i].name, "numchar-input") == 0){
-                    numchar_f = TRUE;
-                    continue;
-                }
-#endif
-#ifdef CHECK_OPTION
-                if (strcmp(long_option[i].name, "no-output") == 0){
-                    noout_f = TRUE;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "debug") == 0){
-                    debug_f = TRUE;
-                    continue;
-                }
-#endif
-                if (strcmp(long_option[i].name, "cp932") == 0){
-#ifdef SHIFTJIS_CP932
-                    cp51932_f = TRUE;
-                    cp932inv_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-                    ms_ucs_map_f = UCS_MAP_CP932;
-#endif
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "no-cp932") == 0){
-#ifdef SHIFTJIS_CP932
-                    cp51932_f = FALSE;
-                    cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-                    ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-                    continue;
-                }
-#ifdef SHIFTJIS_CP932
-                if (strcmp(long_option[i].name, "cp932inv") == 0){
-                    cp932inv_f = TRUE;
-                    continue;
-                }
-#endif
-
-#ifdef X0212_ENABLE
-                if (strcmp(long_option[i].name, "x0212") == 0){
-                    x0212_f = TRUE;
-                    continue;
-                }
-#endif
-
-#ifdef EXEC_IO
-                  if (strcmp(long_option[i].name, "exec-in") == 0){
-                      exec_f = 1;
-                      return;
-                  }
-                  if (strcmp(long_option[i].name, "exec-out") == 0){
-                      exec_f = -1;
-                      return;
-                  }
-#endif
-#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE)
-                if (strcmp(long_option[i].name, "no-cp932ext") == 0){
-		    no_cp932ext_f = TRUE;
-                    continue;
-                }
-		if (strcmp(long_option[i].name, "no-best-fit-chars") == 0){
-		    no_best_fit_chars_f = TRUE;
-		    continue;
-		}
-                if (strcmp(long_option[i].name, "fb-skip") == 0){
-		    encode_fallback = NULL;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-html") == 0){
-		    encode_fallback = encode_fallback_html;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-xml" ) == 0){
-		    encode_fallback = encode_fallback_xml;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-java") == 0){
-		    encode_fallback = encode_fallback_java;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-perl") == 0){
-		    encode_fallback = encode_fallback_perl;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-subchar") == 0){
-		    encode_fallback = encode_fallback_subchar;
-                    continue;
-                }
-                if (strcmp(long_option[i].name, "fb-subchar=") == 0){
-		    encode_fallback = encode_fallback_subchar;
-		    unicode_subchar = 0;
-		    if (p[0] != '0'){
-			/* decimal number */
-			for (i = 0; i < 7 && nkf_isdigit(p[i]); i++){
-			    unicode_subchar *= 10;
-			    unicode_subchar += hex2bin(p[i]);
-			}
-		    }else if(p[1] == 'x' || p[1] == 'X'){
-			/* hexadecimal number */
-			for (i = 2; i < 8 && nkf_isxdigit(p[i]); i++){
-			    unicode_subchar <<= 4;
-			    unicode_subchar |= hex2bin(p[i]);
-			}
-		    }else{
-			/* octal number */
-			for (i = 1; i < 8 && nkf_isoctal(p[i]); i++){
-			    unicode_subchar *= 8;
-			    unicode_subchar += hex2bin(p[i]);
-			}
-		    }
-		    w16e_conv(unicode_subchar, &i, &j);
-		    unicode_subchar = i<<8 | j;
-                    continue;
-                }
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-                if (strcmp(long_option[i].name, "ms-ucs-map") == 0){
-                    ms_ucs_map_f = UCS_MAP_MS;
-                    continue;
-                }
-#endif
-#ifdef UNICODE_NORMALIZATION
-		if (strcmp(long_option[i].name, "utf8mac-input") == 0){
-		    input_f = UTF8_INPUT;
-		    nfc_f = TRUE;
-		    continue;
-		}
-#endif
-                if (strcmp(long_option[i].name, "prefix=") == 0){
-                    if (nkf_isgraph(p[0])){
-                        for (i = 1; nkf_isgraph(p[i]); i++){
-                            prefix_table[p[i]] = p[0];
-                        }
-                    }
-                    continue;
-                }
-            }
-            continue;
-        case 'b':           /* buffered mode */
-            unbuf_f = FALSE;
-            continue;
-        case 'u':           /* non bufferd mode */
-            unbuf_f = TRUE;
-            continue;
-        case 't':           /* transparent mode */
-            if (*cp=='1') {
-		/* alias of -t */
-		nop_f = TRUE;
-		*cp++;
-	    } else if (*cp=='2') {
-		/*
-		 * -t with put/get
-		 *
-		 * nkf -t2MB hoge.bin | nkf -t2mB | diff -s - hoge.bin
-		 *
-		 */
-		nop_f = 2;
-		*cp++;
-            } else
-		nop_f = TRUE;
-            continue;
-        case 'j':           /* JIS output */
-        case 'n':
-            output_conv = j_oconv;
-            continue;
-        case 'e':           /* AT&T EUC output */
-            output_conv = e_oconv;
-            continue;
-        case 's':           /* SJIS output */
-            output_conv = s_oconv;
-            continue;
-        case 'l':           /* ISO8859 Latin-1 support, no conversion */
-            iso8859_f = TRUE;  /* Only compatible with ISO-2022-JP */
-            input_f = LATIN1_INPUT;
-            continue;
-        case 'i':           /* Kanji IN ESC-$-@/B */
-            if (*cp=='@'||*cp=='B') 
-                kanji_intro = *cp++;
-            continue;
-        case 'o':           /* ASCII IN ESC-(-J/B */
-            if (*cp=='J'||*cp=='B'||*cp=='H') 
-                ascii_intro = *cp++;
-            continue;
-        case 'h':
-            /*  
-                bit:1   katakana->hiragana
-                bit:2   hiragana->katakana
-            */
-            if ('9'>= *cp && *cp>='0') 
-                hira_f |= (*cp++ -'0');
-            else 
-                hira_f |= 1;
-            continue;
-        case 'r':
-            rot_f = TRUE;
-            continue;
-#if defined(MSDOS) || defined(__OS2__) 
-        case 'T':
-            binmode_f = FALSE;
-            continue;
-#endif
-#ifndef PERL_XS
-        case 'V':
-            version();
-            exit(1);
-            break;
-        case 'v':
-            usage();
-            exit(1);
-            break;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-        case 'w':           /* UTF-8 output */
-            if ('1'== cp[0] && '6'==cp[1]) {
-		output_conv = w_oconv16; cp+=2;
-		if (cp[0]=='L') {
-		    unicode_bom_f=2; cp++;
-		    w_oconv16_LE = 1;
-                    if (cp[0] == '0'){
-                        unicode_bom_f=1; cp++;
-                    }
-		} else if (cp[0] == 'B') {
-		    unicode_bom_f=2; cp++;
-                    if (cp[0] == '0'){
-                        unicode_bom_f=1; cp++;
-                    }
-                } 
-	    } else if (cp[0] == '8') {
-		output_conv = w_oconv; cp++;
-		unicode_bom_f=2;
-		if (cp[0] == '0'){
-		    unicode_bom_f=1; cp++;
-		}
-	    } else
-                output_conv = w_oconv;
-            continue;
-#endif
-#ifdef UTF8_INPUT_ENABLE
-        case 'W':           /* UTF-8 input */
-            if ('1'== cp[0] && '6'==cp[1]) {
-		input_f = UTF16BE_INPUT;
-		utf16_mode = UTF16BE_INPUT;
-		cp += 2;
-		if (cp[0]=='L') {
-		    cp++;
-		    input_f = UTF16LE_INPUT;
-		    utf16_mode = UTF16LE_INPUT;
-		} else if (cp[0] == 'B') {
-		    cp++;
-		    input_f = UTF16BE_INPUT;
-		    utf16_mode = UTF16BE_INPUT;
-		}
-	    } else if (cp[0] == '8') {
-		cp++;
-		input_f = UTF8_INPUT;
-	    } else
-                input_f = UTF8_INPUT;
-            continue;
-#endif
-        /* Input code assumption */
-        case 'J':   /* JIS input */
-        case 'E':   /* AT&T EUC input */
-            input_f = JIS_INPUT;
-            continue;
-        case 'S':   /* MS Kanji input */
-            input_f = SJIS_INPUT;
-            if (x0201_f==NO_X0201) x0201_f=TRUE;
-            continue;
-        case 'Z':   /* Convert X0208 alphabet to asii */
-            /*  bit:0   Convert X0208
-                bit:1   Convert Kankaku to one space
-                bit:2   Convert Kankaku to two spaces
-                bit:3   Convert HTML Entity
-            */
-            if ('9'>= *cp && *cp>='0') 
-                alpha_f |= 1<<(*cp++ -'0');
-            else 
-                alpha_f |= TRUE;
-            continue;
-        case 'x':   /* Convert X0201 kana to X0208 or X0201 Conversion */
-            x0201_f = FALSE;    /* No X0201->X0208 conversion */
-            /* accept  X0201
-                    ESC-(-I     in JIS, EUC, MS Kanji
-                    SI/SO       in JIS, EUC, MS Kanji
-                    SSO         in EUC, JIS, not in MS Kanji
-                    MS Kanji (0xa0-0xdf) 
-               output  X0201
-                    ESC-(-I     in JIS (0x20-0x5f)
-                    SSO         in EUC (0xa0-0xdf)
-                    0xa0-0xd    in MS Kanji (0xa0-0xdf) 
-            */
-            continue;
-        case 'X':   /* Assume X0201 kana */
-            /* Default value is NO_X0201 for EUC/MS-Kanji mix */
-            x0201_f = TRUE;
-            continue;
-        case 'F':   /* prserve new lines */
-	    fold_preserve_f = TRUE;
-        case 'f':   /* folding -f60 or -f */
-            fold_f = TRUE;
-            fold_len = 0;
-            while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
-		fold_len *= 10;
-		fold_len += *cp++ - '0';
-	    }
-            if (!(0<fold_len && fold_len<BUFSIZ)) 
-                fold_len = DEFAULT_FOLD;
-	    if (*cp=='-') {
-		fold_margin = 0;
-		cp++;
-		while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
-		    fold_margin *= 10;
-		    fold_margin += *cp++ - '0';
-		}
-	    }
-            continue;
-        case 'm':   /* MIME support */
-            /* mime_decode_f = TRUE; */ /* this has too large side effects... */
-            if (*cp=='B'||*cp=='Q') {
-                mime_decode_mode = *cp++;
-                mimebuf_f = FIXED_MIME;
-            } else if (*cp=='N') {
-                mime_f = TRUE; cp++;
-            } else if (*cp=='S') {
-                mime_f = STRICT_MIME; cp++;
-            } else if (*cp=='0') {
-                mime_decode_f = FALSE;
-                mime_f = FALSE; cp++;
-            }
-            continue;
-        case 'M':   /* MIME output */
-            if (*cp=='B') {
-                mimeout_mode = 'B';
-                mimeout_f = FIXED_MIME; cp++;
-            } else if (*cp=='Q') {
-                mimeout_mode = 'Q';
-                mimeout_f = FIXED_MIME; cp++;
-            } else {
-		mimeout_f = TRUE;
-	    }
-            continue;
-        case 'B':   /* Broken JIS support */
-            /*  bit:0   no ESC JIS
-                bit:1   allow any x on ESC-(-x or ESC-$-x
-                bit:2   reset to ascii on NL
-            */
-            if ('9'>= *cp && *cp>='0') 
-                broken_f |= 1<<(*cp++ -'0');
-            else 
-                broken_f |= TRUE;
-            continue;
-#ifndef PERL_XS
-        case 'O':/* for Output file */
-            file_out_f = TRUE;
-            continue;
-#endif
-        case 'c':/* add cr code */
-            crmode_f = CRLF;
-            continue;
-        case 'd':/* delete cr code */
-            crmode_f = NL;
-            continue;
-        case 'I':   /* ISO-2022-JP output */
-            iso2022jp_f = TRUE;
-            continue;
-        case 'L':  /* line mode */
-            if (*cp=='u') {         /* unix */
-                crmode_f = NL; cp++;
-            } else if (*cp=='m') { /* mac */
-                crmode_f = CR; cp++;
-            } else if (*cp=='w') { /* windows */
-                crmode_f = CRLF; cp++;
-            } else if (*cp=='0') { /* no conversion  */
-                crmode_f = 0; cp++;
-            }
-            continue;
-        case 'g':
-#ifndef PERL_XS
-            guess_f = TRUE;
-#endif
-            continue;
-        case ' ':    
-        /* module muliple options in a string are allowed for Perl moudle  */
-	    while(*cp && *cp++!='-');
-            continue;
-        default:
-            /* bogus option but ignored */
-            continue;
-        }
-    }
-}
-
-#ifdef ANSI_C_PROTOTYPE
-struct input_code * find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
-#else
-struct input_code * find_inputcode_byfunc(iconv_func)
-     nkf_char (*iconv_func)();
-#endif
-{
-    if (iconv_func){
-        struct input_code *p = input_code_list;
-        while (p->name){
-            if (iconv_func == p->iconv_func){
-                return p;
-            }
-            p++;
-        }
-    }
-    return 0;
-}
-
-void set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
-{
-#ifdef INPUT_CODE_FIX
-    if (f || !input_f)
-#endif
-        if (estab_f != f){
-            estab_f = f;
-        }
-
-    if (iconv_func
-#ifdef INPUT_CODE_FIX
-        && (f == -TRUE || !input_f) /* -TRUE means "FORCE" */
-#endif
-        ){
-        iconv = iconv_func;
-    }
-#ifdef CHECK_OPTION
-    if (estab_f && iconv_for_check != iconv){
-        struct input_code *p = find_inputcode_byfunc(iconv);
-        if (p){
-            set_input_codename(p->name);
-            debug(input_codename);
-        }
-        iconv_for_check = iconv;
-    }
-#endif
-}
-
-#define SCORE_L2       (1)                   /* $BBh(B2$B?e=`4A;z(B */
-#define SCORE_KANA     (SCORE_L2 << 1)       /* $B$$$o$f$kH>3Q%+%J(B */
-#define SCORE_DEPEND   (SCORE_KANA << 1)     /* $B5!<o0MB8J8;z(B */
-#ifdef SHIFTJIS_CP932
-#define SCORE_CP932    (SCORE_DEPEND << 1)   /* CP932 $B$K$h$kFI$_49$((B */
-#define SCORE_NO_EXIST (SCORE_CP932 << 1)    /* $BB8:_$7$J$$J8;z(B */
-#else
-#define SCORE_NO_EXIST (SCORE_DEPEND << 1)   /* $BB8:_$7$J$$J8;z(B */
-#endif
-#define SCORE_iMIME    (SCORE_NO_EXIST << 1) /* MIME $B$K$h$k;XDj(B */
-#define SCORE_ERROR    (SCORE_iMIME << 1) /* $B%(%i!<(B */
-
-#define SCORE_INIT (SCORE_iMIME)
-
-const nkf_char score_table_A0[] = {
-    0, 0, 0, 0,
-    0, 0, 0, 0,
-    0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
-    SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST,
-};
-
-const nkf_char score_table_F0[] = {
-    SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2,
-    SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST,
-    SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
-    SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR,
-};
-
-void set_code_score(struct input_code *ptr, nkf_char score)
-{
-    if (ptr){
-        ptr->score |= score;
-    }
-}
-
-void clr_code_score(struct input_code *ptr, nkf_char score)
-{
-    if (ptr){
-        ptr->score &= ~score;
-    }
-}
-
-void code_score(struct input_code *ptr)
-{
-    nkf_char c2 = ptr->buf[0];
-#ifdef UTF8_OUTPUT_ENABLE
-    nkf_char c1 = ptr->buf[1];
-#endif
-    if (c2 < 0){
-        set_code_score(ptr, SCORE_ERROR);
-    }else if (c2 == SSO){
-        set_code_score(ptr, SCORE_KANA);
-#ifdef UTF8_OUTPUT_ENABLE
-    }else if (!e2w_conv(c2, c1)){
-        set_code_score(ptr, SCORE_NO_EXIST);
-#endif
-    }else if ((c2 & 0x70) == 0x20){
-        set_code_score(ptr, score_table_A0[c2 & 0x0f]);
-    }else if ((c2 & 0x70) == 0x70){
-        set_code_score(ptr, score_table_F0[c2 & 0x0f]);
-    }else if ((c2 & 0x70) >= 0x50){
-        set_code_score(ptr, SCORE_L2);
-    }
-}
-
-void status_disable(struct input_code *ptr)
-{
-    ptr->stat = -1;
-    ptr->buf[0] = -1;
-    code_score(ptr);
-    if (iconv == ptr->iconv_func) set_iconv(FALSE, 0);
-}
-
-void status_push_ch(struct input_code *ptr, nkf_char c)
-{
-    ptr->buf[ptr->index++] = c;
-}
-
-void status_clear(struct input_code *ptr)
-{
-    ptr->stat = 0;
-    ptr->index = 0;
-}
-
-void status_reset(struct input_code *ptr)
-{
-    status_clear(ptr);
-    ptr->score = SCORE_INIT;
-}
-
-void status_reinit(struct input_code *ptr)
-{
-    status_reset(ptr);
-    ptr->_file_stat = 0;
-}
-
-void status_check(struct input_code *ptr, nkf_char c)
-{
-    if (c <= DEL && estab_f){
-        status_reset(ptr);
-    }
-}
-
-void s_status(struct input_code *ptr, nkf_char c)
-{
-    switch(ptr->stat){
-      case -1:
-          status_check(ptr, c);
-          break;
-      case 0:
-          if (c <= DEL){
-              break;
-#ifdef NUMCHAR_OPTION
-          }else if (is_unicode_capsule(c)){
-              break;
-#endif
-          }else if (0xa1 <= c && c <= 0xdf){
-              status_push_ch(ptr, SSO);
-              status_push_ch(ptr, c);
-              code_score(ptr);
-              status_clear(ptr);
-          }else if ((0x81 <= c && c < 0xa0) || (0xe0 <= c && c <= 0xef)){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-#ifdef SHIFTJIS_CP932
-          }else if (cp51932_f
-                    && is_ibmext_in_sjis(c)){
-              ptr->stat = 2;
-              status_push_ch(ptr, c);
-#endif /* SHIFTJIS_CP932 */
-#ifdef X0212_ENABLE
-          }else if (x0212_f && 0xf0 <= c && c <= 0xfc){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-#endif /* X0212_ENABLE */
-          }else{
-              status_disable(ptr);
-          }
-          break;
-      case 1:
-          if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
-              status_push_ch(ptr, c);
-              s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]);
-              code_score(ptr);
-              status_clear(ptr);
-          }else{
-              status_disable(ptr);
-          }
-          break;
-      case 2:
-#ifdef SHIFTJIS_CP932
-          if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
-              status_push_ch(ptr, c);
-              if (s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]) == 0){
-                  set_code_score(ptr, SCORE_CP932);
-                  status_clear(ptr);
-                  break;
-              }
-          }
-#endif /* SHIFTJIS_CP932 */
-#ifndef X0212_ENABLE
-          status_disable(ptr);
-#endif
-          break;
-    }
-}
-
-void e_status(struct input_code *ptr, nkf_char c)
-{
-    switch (ptr->stat){
-      case -1:
-          status_check(ptr, c);
-          break;
-      case 0:
-          if (c <= DEL){
-              break;
-#ifdef NUMCHAR_OPTION
-          }else if (is_unicode_capsule(c)){
-              break;
-#endif
-          }else if (SSO == c || (0xa1 <= c && c <= 0xfe)){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-#ifdef X0212_ENABLE
-          }else if (0x8f == c){
-              ptr->stat = 2;
-              status_push_ch(ptr, c);
-#endif /* X0212_ENABLE */
-          }else{
-              status_disable(ptr);
-          }
-          break;
-      case 1:
-          if (0xa1 <= c && c <= 0xfe){
-              status_push_ch(ptr, c);
-              code_score(ptr);
-              status_clear(ptr);
-          }else{
-              status_disable(ptr);
-          }
-          break;
-#ifdef X0212_ENABLE
-      case 2:
-          if (0xa1 <= c && c <= 0xfe){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-          }else{
-              status_disable(ptr);
-          }
-#endif /* X0212_ENABLE */
-    }
-}
-
-#ifdef UTF8_INPUT_ENABLE
-void w16_status(struct input_code *ptr, nkf_char c)
-{
-    switch (ptr->stat){
-      case -1:
-          break;
-      case 0:
-          if (ptr->_file_stat == 0){
-              if (c == 0xfe || c == 0xff){
-                  ptr->stat = c;
-                  status_push_ch(ptr, c);
-                  ptr->_file_stat = 1;
-              }else{
-                  status_disable(ptr);
-                  ptr->_file_stat = -1;
-              }
-          }else if (ptr->_file_stat > 0){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-          }else if (ptr->_file_stat < 0){
-              status_disable(ptr);
-          }
-          break;
-
-      case 1:
-          if (c == EOF){
-              status_disable(ptr);
-              ptr->_file_stat = -1;
-          }else{
-              status_push_ch(ptr, c);
-              status_clear(ptr);
-          }
-          break;
-
-      case 0xfe:
-      case 0xff:
-          if (ptr->stat != c && (c == 0xfe || c == 0xff)){
-              status_push_ch(ptr, c);
-              status_clear(ptr);
-          }else{
-              status_disable(ptr);
-              ptr->_file_stat = -1;
-          }
-          break;
-    }
-}
-
-void w_status(struct input_code *ptr, nkf_char c)
-{
-    switch (ptr->stat){
-      case -1:
-          status_check(ptr, c);
-          break;
-      case 0:
-          if (c <= DEL){
-              break;
-#ifdef NUMCHAR_OPTION
-          }else if (is_unicode_capsule(c)){
-              break;
-#endif
-          }else if (0xc0 <= c && c <= 0xdf){
-              ptr->stat = 1;
-              status_push_ch(ptr, c);
-          }else if (0xe0 <= c && c <= 0xef){
-              ptr->stat = 2;
-              status_push_ch(ptr, c);
-          }else{
-              status_disable(ptr);
-          }
-          break;
-      case 1:
-      case 2:
-          if (0x80 <= c && c <= 0xbf){
-              status_push_ch(ptr, c);
-              if (ptr->index > ptr->stat){
-                  int bom = (ptr->buf[0] == 0xef && ptr->buf[1] == 0xbb
-                             && ptr->buf[2] == 0xbf);
-                  w2e_conv(ptr->buf[0], ptr->buf[1], ptr->buf[2],
-                           &ptr->buf[0], &ptr->buf[1]);
-                  if (!bom){
-                      code_score(ptr);
-                  }
-                  status_clear(ptr);
-              }
-          }else{
-              status_disable(ptr);
-          }
-          break;
-    }
-}
-#endif
-
-void code_status(nkf_char c)
-{
-    int action_flag = 1;
-    struct input_code *result = 0;
-    struct input_code *p = input_code_list;
-    while (p->name){
-        (p->status_func)(p, c);
-        if (p->stat > 0){
-            action_flag = 0;
-        }else if(p->stat == 0){
-            if (result){
-                action_flag = 0;
-            }else{
-                result = p;
-            }
-        }
-        ++p;
-    }
-
-    if (action_flag){
-        if (result && !estab_f){
-            set_iconv(TRUE, result->iconv_func);
-        }else if (c <= DEL){
-            struct input_code *ptr = input_code_list;
-            while (ptr->name){
-                status_reset(ptr);
-                ++ptr;
-            }
-        }
-    }
-}
-
-#ifndef WIN32DLL
-nkf_char std_getc(FILE *f)
-{
-    if (std_gc_ndx){
-        return std_gc_buf[--std_gc_ndx];
-    }
-    return getc(f);
-}
-#endif /*WIN32DLL*/
-
-nkf_char std_ungetc(nkf_char c, FILE *f)
-{
-    if (std_gc_ndx == STD_GC_BUFSIZE){
-        return EOF;
-    }
-    std_gc_buf[std_gc_ndx++] = c;
-    return c;
-}
-
-#ifndef WIN32DLL
-void std_putc(nkf_char c)
-{
-    if(c!=EOF)
-      putchar(c);
-}
-#endif /*WIN32DLL*/
-
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-nkf_char noconvert(FILE *f)
-{
-    nkf_char    c;
-
-    if (nop_f == 2)
-	module_connection();
-    while ((c = (*i_getc)(f)) != EOF)
-      (*o_putc)(c);
-    (*o_putc)(EOF);
-    return 1;
-}
-#endif
-
-void module_connection(void)
-{
-    oconv = output_conv; 
-    o_putc = std_putc;
-
-    /* replace continucation module, from output side */
-
-    /* output redicrection */
-#ifdef CHECK_OPTION
-    if (noout_f || guess_f){
-        o_putc = no_putc;
-    }
-#endif
-    if (mimeout_f) {
-	o_mputc = o_putc;
-	o_putc = mime_putc;
-	if (mimeout_f == TRUE) {
-	    o_base64conv = oconv; oconv = base64_conv;
-	}
-	/* base64_count = 0; */
-    }
-
-    if (crmode_f) {
-	o_crconv = oconv; oconv = cr_conv;
-    }
-    if (rot_f) {
-	o_rot_conv = oconv; oconv = rot_conv;
-    }
-    if (iso2022jp_f) {
-	o_iso2022jp_check_conv = oconv; oconv = iso2022jp_check_conv;
-    }
-    if (hira_f) {
-	o_hira_conv = oconv; oconv = hira_conv;
-    }
-    if (fold_f) {
-	o_fconv = oconv; oconv = fold_conv;
-	f_line = 0;
-    }
-    if (alpha_f || x0201_f) {
-	o_zconv = oconv; oconv = z_conv;
-    }
-
-    i_getc = std_getc;
-    i_ungetc = std_ungetc;
-    /* input redicrection */
-#ifdef INPUT_OPTION
-    if (cap_f){
-        i_cgetc = i_getc; i_getc = cap_getc;
-        i_cungetc = i_ungetc; i_ungetc= cap_ungetc;
-    }
-    if (url_f){
-        i_ugetc = i_getc; i_getc = url_getc;
-        i_uungetc = i_ungetc; i_ungetc= url_ungetc;
-    }
-#endif
-#ifdef NUMCHAR_OPTION
-    if (numchar_f){
-        i_ngetc = i_getc; i_getc = numchar_getc;
-        i_nungetc = i_ungetc; i_ungetc= numchar_ungetc;
-    }
-#endif
-#ifdef UNICODE_NORMALIZATION
-    if (nfc_f && input_f == UTF8_INPUT){
-        i_nfc_getc = i_getc; i_getc = nfc_getc;
-        i_nfc_ungetc = i_ungetc; i_ungetc= nfc_ungetc;
-    }
-#endif
-    if (mime_f && mimebuf_f==FIXED_MIME) {
-	i_mgetc = i_getc; i_getc = mime_getc;
-	i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
-    }
-    if (broken_f & 1) {
-	i_bgetc = i_getc; i_getc = broken_getc;
-	i_bungetc = i_ungetc; i_ungetc = broken_ungetc;
-    }
-    if (input_f == JIS_INPUT || input_f == LATIN1_INPUT) {
-        set_iconv(-TRUE, e_iconv);
-    } else if (input_f == SJIS_INPUT) {
-        set_iconv(-TRUE, s_iconv);
-#ifdef UTF8_INPUT_ENABLE
-    } else if (input_f == UTF8_INPUT) {
-        set_iconv(-TRUE, w_iconv);
-    } else if (input_f == UTF16BE_INPUT) {
-        set_iconv(-TRUE, w_iconv16);
-    } else if (input_f == UTF16LE_INPUT) {
-        set_iconv(-TRUE, w_iconv16);
-#endif
-    } else {
-        set_iconv(FALSE, e_iconv);
-    }
-
-    {
-        struct input_code *p = input_code_list;
-        while (p->name){
-            status_reinit(p++);
-        }
-    }
-}
-
-/*
-   Conversion main loop. Code detection only. 
- */
-
-nkf_char kanji_convert(FILE *f)
-{
-    nkf_char    c1,
-                    c2, c3;
-    int is_8bit = FALSE;
-
-    module_connection();
-    c2 = 0;
-
-    if(input_f == SJIS_INPUT
-#ifdef UTF8_INPUT_ENABLE
-       || input_f == UTF8_INPUT || input_f == UTF16BE_INPUT || input_f == UTF16LE_INPUT
-#endif
-      ){
-	is_8bit = TRUE;
-    }
-
-
-    input_mode = ASCII;
-    output_mode = ASCII;
-    shift_mode = FALSE;
-
-#define NEXT continue      /* no output, get next */
-#define SEND ;             /* output c1 and c2, get next */
-#define LAST break         /* end of loop, go closing  */
-
-    while ((c1 = (*i_getc)(f)) != EOF) {
-#ifdef INPUT_CODE_FIX
-	if (!input_f)
-#endif
-	    code_status(c1);
-        if (c2) {
-            /* second byte */
-            if (c2 > DEL) {
-                /* in case of 8th bit is on */
-                if (!estab_f&&!mime_decode_mode) {
-                    /* in case of not established yet */
-                    /* It is still ambiguious */
-                    if (h_conv(f, c2, c1)==EOF) 
-                        LAST;
-                    else 
-                        c2 = 0;
-                    NEXT;
-                } else
-                    /* in case of already established */
-                    if (c1 < AT) {
-                        /* ignore bogus code */
-                        c2 = 0;
-                        NEXT;
-                    } else
-                        SEND;
-            } else
-                /* second byte, 7 bit code */
-                /* it might be kanji shitfted */
-                if ((c1 == DEL) || (c1 <= SPACE)) {
-                    /* ignore bogus first code */
-                    c2 = 0;
-                    NEXT;
-                } else
-                    SEND;
-        } else {
-            /* first byte */
-	    if (
-#ifdef UTF8_INPUT_ENABLE
-                iconv == w_iconv16
-#else
-                0
-#endif
-                ) {
-		c2 = c1;
-		c1 = (*i_getc)(f);
-		SEND;
-#ifdef NUMCHAR_OPTION
-            } else if (is_unicode_capsule(c1)){
-                SEND;
-#endif
-	    } else if (c1 > DEL) {
-                /* 8 bit code */
-                if (!estab_f && !iso8859_f) {
-                    /* not established yet */
-		    if (!is_8bit) is_8bit = TRUE;
-                    c2 = c1;
-                    NEXT;
-                } else { /* estab_f==TRUE */
-                    if (iso8859_f) {
-                        c2 = ISO8859_1;
-                        c1 &= 0x7f;
-                        SEND;
-                    } else if (SSP<=c1 && c1<0xe0 && iconv == s_iconv) {
-                        /* SJIS X0201 Case... */
-                        if(iso2022jp_f && x0201_f==NO_X0201) {
-                            (*oconv)(GETA1, GETA2);
-                            NEXT;
-                        } else {
-			    c2 = X0201;
-			    c1 &= 0x7f;
-			    SEND;
-			}
-                    } else if (c1==SSO && iconv != s_iconv) {
-                        /* EUC X0201 Case */
-                        c1 = (*i_getc)(f);  /* skip SSO */
-                        code_status(c1);
-                        if (SSP<=c1 && c1<0xe0) {
-			    if(iso2022jp_f &&  x0201_f==NO_X0201) {
-				(*oconv)(GETA1, GETA2);
-				NEXT;
-			    } else {
-				c2 = X0201;
-				c1 &= 0x7f;
-				SEND;
-			    }
-                        } else  { /* bogus code, skip SSO and one byte */
-                            NEXT;
-                        }
-                    } else {
-                       /* already established */
-                       c2 = c1;
-                       NEXT;
-                    }
-                }
-            } else if ((c1 > SPACE) && (c1 != DEL)) {
-                /* in case of Roman characters */
-                if (shift_mode) { 
-                    /* output 1 shifted byte */
-                    if (iso8859_f) {
-                        c2 = ISO8859_1;
-                        SEND;
-                    } else if (SPACE<=c1 && c1<(0xe0&0x7f) ){
-                      /* output 1 shifted byte */
-			if(iso2022jp_f && x0201_f==NO_X0201) {
-			    (*oconv)(GETA1, GETA2);
-			    NEXT;
-			} else {
-			    c2 = X0201;
-			    SEND;
-			}
-                    } else {
-                        /* look like bogus code */
-                        NEXT;
-                    }
-                } else if (input_mode == X0208 || input_mode == X0212 ||
-			   input_mode == X0213_1 || input_mode == X0213_2) {
-                    /* in case of Kanji shifted */
-                    c2 = c1;
-                    NEXT;
-                } else if (c1 == '=' && mime_f && !mime_decode_mode ) {
-                    /* Check MIME code */
-                    if ((c1 = (*i_getc)(f)) == EOF) {
-                        (*oconv)(0, '=');
-                        LAST;
-                    } else if (c1 == '?') {
-                        /* =? is mime conversion start sequence */
-			if(mime_f == STRICT_MIME) {
-			    /* check in real detail */
-			    if (mime_begin_strict(f) == EOF) 
-				LAST;
-			    else
-				NEXT;
-			} else if (mime_begin(f) == EOF) 
-                            LAST;
-                        else
-                            NEXT;
-                    } else {
-                        (*oconv)(0, '=');
-                        (*i_ungetc)(c1,f);
-                        NEXT;
-                    }
-                } else {
-                    /* normal ASCII code */ 
-                    SEND;
-                }
-            } else if (!is_8bit && c1 == SI) {
-                shift_mode = FALSE; 
-                NEXT;
-            } else if (!is_8bit && c1 == SO) {
-                shift_mode = TRUE; 
-                NEXT;
-            } else if (!is_8bit && c1 == ESC ) {
-                if ((c1 = (*i_getc)(f)) == EOF) {
-                    /*  (*oconv)(0, ESC); don't send bogus code */
-                    LAST;
-                } else if (c1 == '$') {
-                    if ((c1 = (*i_getc)(f)) == EOF) {
-                        /*
-                        (*oconv)(0, ESC); don't send bogus code 
-                        (*oconv)(0, '$'); */
-                        LAST;
-                    } else if (c1 == '@'|| c1 == 'B') {
-                        /* This is kanji introduction */
-                        input_mode = X0208;
-                        shift_mode = FALSE;
-                        set_input_codename("ISO-2022-JP");
-#ifdef CHECK_OPTION
-                        debug(input_codename);
-#endif
-                        NEXT;
-                    } else if (c1 == '(') {
-                        if ((c1 = (*i_getc)(f)) == EOF) {
-                            /* don't send bogus code 
-                            (*oconv)(0, ESC);
-                            (*oconv)(0, '$');
-                            (*oconv)(0, '(');
-                                */
-                            LAST;
-                        } else if (c1 == '@'|| c1 == 'B') {
-                            /* This is kanji introduction */
-                            input_mode = X0208;
-                            shift_mode = FALSE;
-                            NEXT;
-#ifdef X0212_ENABLE
-                        } else if (c1 == 'D'){
-                            input_mode = X0212;
-                            shift_mode = FALSE;
-                            NEXT;
-#endif /* X0212_ENABLE */
-                        } else if (c1 == (X0213_1&0x7F)){
-                            input_mode = X0213_1;
-                            shift_mode = FALSE;
-                            NEXT;
-                        } else if (c1 == (X0213_2&0x7F)){
-                            input_mode = X0213_2;
-                            shift_mode = FALSE;
-                            NEXT;
-                        } else {
-                            /* could be some special code */
-                            (*oconv)(0, ESC);
-                            (*oconv)(0, '$');
-                            (*oconv)(0, '(');
-                            (*oconv)(0, c1);
-                            NEXT;
-                        }
-                    } else if (broken_f&0x2) {
-                        /* accept any ESC-(-x as broken code ... */
-                        input_mode = X0208;
-                        shift_mode = FALSE;
-                        NEXT;
-                    } else {
-                        (*oconv)(0, ESC);
-                        (*oconv)(0, '$');
-                        (*oconv)(0, c1);
-                        NEXT;
-                    }
-                } else if (c1 == '(') {
-                    if ((c1 = (*i_getc)(f)) == EOF) {
-                        /* don't send bogus code 
-                        (*oconv)(0, ESC);
-                        (*oconv)(0, '('); */
-                        LAST;
-                    } else {
-                        if (c1 == 'I') {
-                            /* This is X0201 kana introduction */
-                            input_mode = X0201; shift_mode = X0201;
-                            NEXT;
-                        } else if (c1 == 'B' || c1 == 'J' || c1 == 'H') {
-                            /* This is X0208 kanji introduction */
-                            input_mode = ASCII; shift_mode = FALSE;
-                            NEXT;
-                        } else if (broken_f&0x2) {
-                            input_mode = ASCII; shift_mode = FALSE;
-                            NEXT;
-                        } else {
-                            (*oconv)(0, ESC);
-                            (*oconv)(0, '(');
-                            /* maintain various input_mode here */
-                            SEND;
-                        }
-                    }
-               } else if ( c1 == 'N' || c1 == 'n' ){
-                   /* SS2 */
-                   c3 = (*i_getc)(f);  /* skip SS2 */
-                   if ( (SPACE<=c3 && c3 < 0x60) || (0xa0<=c3 && c3 < 0xe0)){
-                       c1 = c3;
-                       c2 = X0201;
-                       SEND;
-                   }else{
-                       (*i_ungetc)(c3, f);
-                       /* lonely ESC  */
-                       (*oconv)(0, ESC);
-                       SEND;
-                   }
-                } else {
-                    /* lonely ESC  */
-                    (*oconv)(0, ESC);
-                    SEND;
-                }
-            } else if ((c1 == NL || c1 == CR) && broken_f&4) {
-                input_mode = ASCII; set_iconv(FALSE, 0);
-                SEND;
-	    } else if (c1 == NL && mime_decode_f && !mime_decode_mode ) {
-		if ((c1=(*i_getc)(f))!=EOF && c1 == SPACE) {
-		    i_ungetc(SPACE,f);
-		    continue;
-		} else {
-		    i_ungetc(c1,f);
-		}
-		c1 = NL;
-		SEND;
-	    } else if (c1 == CR && mime_decode_f && !mime_decode_mode ) {
-		if ((c1=(*i_getc)(f))!=EOF) {
-		    if (c1==SPACE) {
-			i_ungetc(SPACE,f);
-			continue;
-		    } else if (c1 == NL && (c1=(*i_getc)(f))!=EOF && c1 == SPACE) {
-			i_ungetc(SPACE,f);
-			continue;
-		    } else {
-			i_ungetc(c1,f);
-		    }
-		    i_ungetc(NL,f);
-		} else {
-		    i_ungetc(c1,f);
-		}
-		c1 = CR;
-		SEND;
-	    } else 
-                SEND;
-        }
-        /* send: */
-	switch(input_mode){
-	case ASCII:
-	    if ((*iconv)(c2, c1, 0) < 0){  /* can be EUC/SJIS */
-		nkf_char c0 = (*i_getc)(f);
-		if (c0 != EOF){
-		    code_status(c0);
-		    (*iconv)(c2, c1, c0);
-		}
-	    }
-	    break;
-	case X0208:
-	case X0213_1:
-	    (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */
-	    break;
-#ifdef X0212_ENABLE
-	case X0212:
-	    (*oconv)(PREFIX_EUCG3 | c2, c1);
-	    break;
-#endif /* X0212_ENABLE */
-	case X0213_2:
-	    (*oconv)(PREFIX_EUCG3 | c2, c1);
-	    break;
-	default:
-	    (*oconv)(input_mode, c1);  /* other special case */
-	}
-
-        c2 = 0;
-        continue;
-        /* goto next_word */
-    }
-
-    /* epilogue */
-    (*iconv)(EOF, 0, 0);
-    if (!is_inputcode_set)
-    {
-	if (is_8bit) {
-	    struct input_code *p = input_code_list;
-	    struct input_code *result = p;
-	    while (p->name){
-		if (p->score < result->score) result = p;
-		++p;
-	    }
-	    set_input_codename(result->name);
-	}
-    }
-    return 1;
-}
-
-nkf_char
-h_conv(FILE *f, nkf_char c2, nkf_char c1)
-{
-    nkf_char    wc,c3;
-
-
-    /** it must NOT be in the kanji shifte sequence      */
-    /** it must NOT be written in JIS7                   */
-    /** and it must be after 2 byte 8bit code            */
-
-    hold_count = 0;
-    push_hold_buf(c2);
-    push_hold_buf(c1);
-
-    while ((c1 = (*i_getc)(f)) != EOF) {
-        if (c1 == ESC){
-	    (*i_ungetc)(c1,f);
-            break;
-        }
-        code_status(c1);
-        if (push_hold_buf(c1) == EOF || estab_f){
-            break;
-        }
-    }
-
-    if (!estab_f){
-        struct input_code *p = input_code_list;
-        struct input_code *result = p;
-        if (c1 == EOF){
-            code_status(c1);
-        }
-        while (p->name){
-            if (p->score < result->score){
-                result = p;
-            }
-            ++p;
-        }
-        set_iconv(FALSE, result->iconv_func);
-    }
-
-
-    /** now,
-     ** 1) EOF is detected, or
-     ** 2) Code is established, or
-     ** 3) Buffer is FULL (but last word is pushed)
-     **
-     ** in 1) and 3) cases, we continue to use
-     ** Kanji codes by oconv and leave estab_f unchanged.
-     **/
-
-    c3=c1;
-    wc = 0;
-    while (wc < hold_count){
-        c2 = hold_buf[wc++];
-        if (c2 <= DEL
-#ifdef NUMCHAR_OPTION
-            || is_unicode_capsule(c2)
-#endif
-            ){
-            (*iconv)(0, c2, 0);
-            continue;
-        }else if (iconv == s_iconv && 0xa1 <= c2 && c2 <= 0xdf){
-            (*iconv)(X0201, c2, 0);
-            continue;
-        }
-        if (wc < hold_count){
-            c1 = hold_buf[wc++];
-        }else{
-            c1 = (*i_getc)(f);
-            if (c1 == EOF){
-                c3 = EOF;
-                break;
-            }
-            code_status(c1);
-        }
-        if ((*iconv)(c2, c1, 0) < 0){
-            nkf_char c0;
-            if (wc < hold_count){
-                c0 = hold_buf[wc++];
-            }else{
-                c0 = (*i_getc)(f);
-                if (c0 == EOF){
-                    c3 = EOF;
-                    break;
-                }
-                code_status(c0);
-            }
-            (*iconv)(c2, c1, c0);
-        }
-    }
-    return c3;
-}
-
-
-
-nkf_char
-push_hold_buf(nkf_char c2)
-{
-    if (hold_count >= HOLD_SIZE*2)
-        return (EOF);
-    hold_buf[hold_count++] = (unsigned char)c2;
-    return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count);
-}
-
-nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
-{
-#if defined(SHIFTJIS_CP932) || defined(X0212_ENABLE)
-    nkf_char val;
-#endif
-    static const nkf_char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
-#ifdef SHIFTJIS_CP932
-    if (cp51932_f && is_ibmext_in_sjis(c2)){
-#if 0
-        extern const unsigned short shiftjis_cp932[3][189];
-#endif
-        val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40];
-        if (val){
-            c2 = val >> 8;
-            c1 = val & 0xff;
-        }
-    }
-#endif /* SHIFTJIS_CP932 */
-#ifdef X0212_ENABLE
-    if (!x0213_f && is_ibmext_in_sjis(c2)){
-#if 0
-        extern const unsigned short shiftjis_x0212[3][189];
-#endif
-        val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40];
-        if (val){
-            if (val > 0x7FFF){
-                c2 = PREFIX_EUCG3 | (val >> 8);
-                c1 = val & 0xff;
-            }else{
-                c2 = val >> 8;
-                c1 = val & 0xff;
-            }
-            if (p2) *p2 = c2;
-            if (p1) *p1 = c1;
-            return 0;
-        }
-    }
-#endif
-    if(c2 >= 0x80){
-	if(x0213_f && c2 >= 0xF0){
-	    if(c2 <= 0xF3 || (c2 == 0xF4 && c1 < 0x9F)){ /* k=1, 3<=k<=5, k=8, 12<=k<=15 */
-		c2 = PREFIX_EUCG3 | 0x20 | shift_jisx0213_s1a3_table[c2 - 0xF0][0x9E < c1];
-	    }else{ /* 78<=k<=94 */
-		c2 = PREFIX_EUCG3 | (c2 * 2 - 0x17B);
-		if (0x9E < c1) c2++;
-	    }
-	}else{
-	    c2 = c2 + c2 - ((c2 <= 0x9F) ? SJ0162 : SJ6394);
-	    if (0x9E < c1) c2++;
-	}
-	if (c1 < 0x9F)
-	    c1 = c1 - ((c1 > DEL) ? SPACE : 0x1F);
-	else {
-	    c1 = c1 - 0x7E;
-	}
-    }
-
-#ifdef X0212_ENABLE
-    c2 = x0212_unshift(c2);
-#endif
-    if (p2) *p2 = c2;
-    if (p1) *p1 = c1;
-    return 0;
-}
-
-nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    if (c2 == X0201) {
-	c1 &= 0x7f;
-    } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) {
-        /* NOP */
-    } else {
-        nkf_char ret = s2e_conv(c2, c1, &c2, &c1);
-        if (ret) return ret;
-    }
-    (*oconv)(c2, c1);
-    return 0;
-}
-
-nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    if (c2 == X0201) {
-	c1 &= 0x7f;
-#ifdef X0212_ENABLE
-    }else if (c2 == 0x8f){
-        if (c0 == 0){
-            return -1;
-        }
-        c2 = (c2 << 8) | (c1 & 0x7f);
-        c1 = c0 & 0x7f;
-#ifdef SHIFTJIS_CP932
-        if (cp51932_f){
-            nkf_char s2, s1;
-            if (e2s_conv(c2, c1, &s2, &s1) == 0){
-                s2e_conv(s2, s1, &c2, &c1);
-                if (c2 < 0x100){
-                    c1 &= 0x7f;
-                    c2 &= 0x7f;
-                }
-            }
-        }
-#endif /* SHIFTJIS_CP932 */
-#endif /* X0212_ENABLE */
-    } else if (c2 == SSO){
-        c2 = X0201;
-        c1 &= 0x7f;
-    } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) {
-        /* NOP */
-    } else {
-        c1 &= 0x7f;
-        c2 &= 0x7f;
-    }
-    (*oconv)(c2, c1);
-    return 0;
-}
-
-#ifdef UTF8_INPUT_ENABLE
-nkf_char w2e_conv(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
-{
-    nkf_char ret = 0;
-
-    if (!c1){
-        *p2 = 0;
-        *p1 = c2;
-    }else if (0xc0 <= c2 && c2 <= 0xef) {
-	ret =  unicode_to_jis_common(c2, c1, c0, p2, p1);
-#ifdef NUMCHAR_OPTION
-        if (ret > 0){
-            if (p2) *p2 = 0;
-            if (p1) *p1 = CLASS_UTF16 | ww16_conv(c2, c1, c0);
-            ret = 0;
-        }
-#endif
-    }
-    return ret;
-}
-
-nkf_char w_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    nkf_char ret = 0;
-    
-    /* throw away ZERO WIDTH NO-BREAK SPACE (U+FEFF) */
-    if(ignore_zwnbsp_f){
-	ignore_zwnbsp_f = FALSE;
-	if(c2 == 0xef && c1 == 0xbb && c0 == 0xbf)
-	    return 0;
-    }
-    
-    if (c2 == 0) /* 0x00-0x7f */
-	c1 &= 0x7F; /* 1byte */
-    else if (c0 == 0){
-	if ((c2 & 0xe0) == 0xc0){ /* 0xc0-0xdf */
-	    /* 2ytes */
-	    if((c2 & 0xFE) == 0xC0 || c1 < 0x80 || 0xBF < c1) return 0;
-	}else if ((c2 & 0xf0) == 0xe0) /* 0xe0-0xef */
-	    return -1; /* 3bytes */
-#ifdef __COMMENT__
-	else if (0xf0 <= c2)
-	    return 0; /* 4,5,6bytes */
-	else if ((c2 & 0xc0) == 0x80) /* 0x80-0xbf */
-	    return 0; /* trail byte */
-#endif
-	else return 0;
-    }else{
-	/* must be 3bytes */
-	if(c2 == 0xE0){
-	    if(c1 < 0xA0 || 0xBF < c1 || c0 < 0x80 || 0xBF < c0)
-		return 0;
-	}else if(c2 == 0xED){
-	    if(c1 < 0x80 || 0x9F < c1 || c0 < 0x80 || 0xBF < c0)
-		return 0;
-	}else if((c2 & 0xf0) == 0xe0){
-	    if(c1 < 0x80 || 0xBF < c1 || c0 < 0x80 || 0xBF < c0)
-		return 0;
-	}else return 0;
-    }
-    if (c2 == 0 || c2 == EOF){
-    } else {
-	ret = w2e_conv(c2, c1, c0, &c2, &c1);
-    }
-    if (ret == 0){
-        (*oconv)(c2, c1);
-    }
-    return ret;
-}
-#endif
-
-#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
-void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0)
-{
-    val &= VALUE_MASK;
-    if (val < 0x80){
-        *p2 = val;
-        *p1 = 0;
-        *p0 = 0;
-    }else if (val < 0x800){
-	*p2 = 0xc0 | (val >> 6);
-	*p1 = 0x80 | (val & 0x3f);
-        *p0 = 0;
-    } else if (val <= NKF_INT32_C(0xFFFF)) {
-        *p2 = 0xe0 | (val >> 12);
-        *p1 = 0x80 | ((val >> 6) & 0x3f);
-        *p0 = 0x80 | (val        & 0x3f);
-    } else {
-        *p2 = 0;
-        *p1 = 0;
-        *p0 = 0;
-    }
-}
-#endif
-
-#ifdef UTF8_INPUT_ENABLE
-nkf_char ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    nkf_char val;
-    if (c2 >= 0xf0){
-	val = -1;
-    }else if (c2 >= 0xe0){
-        val = (c2 & 0x0f) << 12;
-        val |= (c1 & 0x3f) << 6;
-        val |= (c0 & 0x3f);
-    }else if (c2 >= 0xc0){
-        val = (c2 & 0x1f) << 6;
-        val |= (c1 & 0x3f);
-    }else{
-        val = c2;
-    }
-    return val;
-}
-
-nkf_char w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
-{
-    nkf_char c2, c1, c0;
-    nkf_char ret = 0;
-    val &= VALUE_MASK;
-    if (val < 0x80){
-        *p2 = 0;
-        *p1 = val;
-    }else{
-	w16w_conv(val, &c2, &c1, &c0);
-	ret =  unicode_to_jis_common(c2, c1, c0, p2, p1);
-#ifdef NUMCHAR_OPTION
-	if (ret > 0){
-	    *p2 = 0;
-	    *p1 = CLASS_UTF16 | val;
-	    ret = 0;
-	}
-#endif
-    }
-    return ret;
-}
-#endif
-
-#ifdef UTF8_INPUT_ENABLE
-nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    nkf_char ret;
-
-    /* throw away ZERO WIDTH NO-BREAK SPACE (U+FEFF) */
-    if(ignore_zwnbsp_f){
-	ignore_zwnbsp_f = FALSE;
-	if (c2==0376 && c1==0377){
-	    utf16_mode = UTF16BE_INPUT;
-	    return 0;
-	}else if(c2==0377 && c1==0376){
-	    utf16_mode = UTF16LE_INPUT;
-	    return 0;
-	}
-    }
-    if (c2 != EOF && utf16_mode == UTF16LE_INPUT) {
-	nkf_char tmp;
-	tmp=c1; c1=c2; c2=tmp;
-    }
-    if ((c2==0 && c1 < 0x80) || c2==EOF) {
-	(*oconv)(c2, c1);
-	return 0;
-    }else if((c2>>3)==27){ /* surrogate pair */
-	return 1;
-    }else ret = w16e_conv(((c2 & 0xff)<<8) + c1, &c2, &c1);
-    if (ret) return ret;
-    (*oconv)(c2, c1);
-    return 0;
-}
-
-nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
-{
-#if 0
-    extern const unsigned short *const utf8_to_euc_2bytes[];
-    extern const unsigned short *const utf8_to_euc_2bytes_ms[];
-    extern const unsigned short *const utf8_to_euc_2bytes_932[];
-    extern const unsigned short *const *const utf8_to_euc_3bytes[];
-    extern const unsigned short *const *const utf8_to_euc_3bytes_ms[];
-    extern const unsigned short *const *const utf8_to_euc_3bytes_932[];
-#endif
-    const unsigned short *const *pp;
-    const unsigned short *const *const *ppp;
-    static const int no_best_fit_chars_table_C2[] =
-    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 2, 1, 1, 2,
-	0, 0, 1, 1, 0, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1};
-    static const int no_best_fit_chars_table_C2_ms[] =
-    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0,
-	0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0};
-    static const int no_best_fit_chars_table_932_C2[] =
-    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1,
-	0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0};
-    static const int no_best_fit_chars_table_932_C3[] =
-    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1};
-    nkf_char ret = 0;
-
-    if(c2 < 0x80){
-	*p2 = 0;
-	*p1 = c2;
-    }else if(c2 < 0xe0){
-	if(no_best_fit_chars_f){
-	    if(ms_ucs_map_f == UCS_MAP_CP932){
-		switch(c2){
-		case 0xC2:
-		    if(no_best_fit_chars_table_932_C2[c1&0x3F]) return 1;
-		    break;
-		case 0xC3:
-		    if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1;
-		    break;
-		}
-	    }else if(cp51932_f){
-		switch(c2){
-		case 0xC2:
-		    if(no_best_fit_chars_table_C2[c1&0x3F]) return 1;
-		    break;
-		case 0xC3:
-		    if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1;
-		    break;
-		}
-	    }else if(ms_ucs_map_f == UCS_MAP_MS){
-		if(c2 == 0xC2 && no_best_fit_chars_table_C2_ms[c1&0x3F]) return 1;
-	    }
-	}
-	pp =
-	    ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_2bytes_932 :
-	    ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_2bytes_ms :
-	    utf8_to_euc_2bytes;
-	ret =  w_iconv_common(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1);
-    }else if(c0 < 0xF0){
-	if(no_best_fit_chars_f){
-	    if(ms_ucs_map_f == UCS_MAP_CP932){
-		if(c2 == 0xE3 && c1 == 0x82 && c0 == 0x94) return 1;
-	    }else if(ms_ucs_map_f == UCS_MAP_MS){
-		switch(c2){
-		case 0xE2:
-		    switch(c1){
-		    case 0x80:
-			if(c0 == 0x94 || c0 == 0x96 || c0 == 0xBE) return 1;
-			break;
-		    case 0x88:
-			if(c0 == 0x92) return 1;
-			break;
-		    }
-		    break;
-		case 0xE3:
-		    if(c1 == 0x80 || c0 == 0x9C) return 1;
-		    break;
-		}
-	    }else{
-		switch(c2){
-		case 0xE2:
-		    switch(c1){
-		    case 0x80:
-			if(c0 == 0x95) return 1;
-			break;
-		    case 0x88:
-			if(c0 == 0xA5) return 1;
-			break;
-		    }
-		    break;
-		case 0xEF:
-		    switch(c1){
-		    case 0xBC:
-			if(c0 == 0x8D) return 1;
-			break;
-		    case 0xBD:
-			if(c0 == 0x9E && cp51932_f) return 1;
-			break;
-		    case 0xBF:
-			if(0xA0 <= c0 && c0 <= 0xA5) return 1;
-			break;
-		    }
-		    break;
-		}
-	    }
-	}
-	ppp =
-	    ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_3bytes_932 :
-	    ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_3bytes_ms :
-	    utf8_to_euc_3bytes;
-	ret = w_iconv_common(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
-    }else return -1;
-#ifdef SHIFTJIS_CP932
-    if (!ret && cp51932_f && is_eucg3(*p2)) {
-	nkf_char s2, s1;
-	if (e2s_conv(*p2, *p1, &s2, &s1) == 0) {
-	    s2e_conv(s2, s1, p2, p1);
-	}else{
-	    ret = 1;
-	}
-    }
-#endif
-    return ret;
-}
-
-nkf_char w_iconv_common(nkf_char c1, nkf_char c0, const unsigned short *const *pp, nkf_char psize, nkf_char *p2, nkf_char *p1)
-{
-    nkf_char c2;
-    const unsigned short *p;
-    unsigned short val;
-
-    if (pp == 0) return 1;
-
-    c1 -= 0x80;
-    if (c1 < 0 || psize <= c1) return 1;
-    p = pp[c1];
-    if (p == 0)  return 1;
-
-    c0 -= 0x80;
-    if (c0 < 0 || sizeof_utf8_to_euc_C2 <= c0) return 1;
-    val = p[c0];
-    if (val == 0) return 1;
-    if (no_cp932ext_f && (
-	(val>>8) == 0x2D || /* NEC special characters */
-	val > NKF_INT32_C(0xF300) /* IBM extended characters */
-	)) return 1;
-
-    c2 = val >> 8;
-   if (val > 0x7FFF){
-        c2 &= 0x7f;
-        c2 |= PREFIX_EUCG3;
-    }
-    if (c2 == SO) c2 = X0201;
-    c1 = val & 0x7f;
-    if (p2) *p2 = c2;
-    if (p1) *p1 = c1;
-    return 0;
-}
-
-void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c)
-{
-    const char *hex = "0123456789ABCDEF";
-    int shift = 20;
-    c &= VALUE_MASK;
-    while(shift >= 0){
-	if(c >= 1<<shift){
-	    while(shift >= 0){
-		(*f)(0, hex[(c>>shift)&0xF]);
-		shift -= 4;
-	    }
-	}else{
-	    shift -= 4;
-	}
-    }
-    return;
-}
-
-void encode_fallback_html(nkf_char c)
-{
-    (*oconv)(0, '&');
-    (*oconv)(0, '#');
-    c &= VALUE_MASK;
-    if(c >= NKF_INT32_C(1000000))
-	(*oconv)(0, 0x30+(c/NKF_INT32_C(1000000))%10);
-    if(c >= NKF_INT32_C(100000))
-	(*oconv)(0, 0x30+(c/NKF_INT32_C(100000) )%10);
-    if(c >= 10000)
-	(*oconv)(0, 0x30+(c/10000  )%10);
-    if(c >= 1000)
-	(*oconv)(0, 0x30+(c/1000   )%10);
-    if(c >= 100)
-	(*oconv)(0, 0x30+(c/100    )%10);
-    if(c >= 10)
-	(*oconv)(0, 0x30+(c/10     )%10);
-    if(c >= 0)
-	(*oconv)(0, 0x30+ c         %10);
-    (*oconv)(0, ';');
-    return;
-}
-
-void encode_fallback_xml(nkf_char c)
-{
-    (*oconv)(0, '&');
-    (*oconv)(0, '#');
-    (*oconv)(0, 'x');
-    nkf_each_char_to_hex(oconv, c);
-    (*oconv)(0, ';');
-    return;
-}
-
-void encode_fallback_java(nkf_char c)
-{
-    const char *hex = "0123456789ABCDEF";
-    (*oconv)(0, '\\');
-    c &= VALUE_MASK;
-    if(!is_unicode_bmp(c)){
-	(*oconv)(0, 'U');
-	(*oconv)(0, '0');
-	(*oconv)(0, '0');
-	(*oconv)(0, hex[(c>>20)&0xF]);
-	(*oconv)(0, hex[(c>>16)&0xF]);
-    }else{
-	(*oconv)(0, 'u');
-    }
-    (*oconv)(0, hex[(c>>12)&0xF]);
-    (*oconv)(0, hex[(c>> 8)&0xF]);
-    (*oconv)(0, hex[(c>> 4)&0xF]);
-    (*oconv)(0, hex[ c     &0xF]);
-    return;
-}
-
-void encode_fallback_perl(nkf_char c)
-{
-    (*oconv)(0, '\\');
-    (*oconv)(0, 'x');
-    (*oconv)(0, '{');
-    nkf_each_char_to_hex(oconv, c);
-    (*oconv)(0, '}');
-    return;
-}
-
-void encode_fallback_subchar(nkf_char c)
-{
-    c = unicode_subchar;
-    (*oconv)((c>>8)&0xFF, c&0xFF);
-    return;
-}
-#endif
-
-#ifdef UTF8_OUTPUT_ENABLE
-nkf_char e2w_conv(nkf_char c2, nkf_char c1)
-{
-#if 0
-    extern const unsigned short euc_to_utf8_1byte[];
-    extern const unsigned short *const euc_to_utf8_2bytes[];
-    extern const unsigned short *const euc_to_utf8_2bytes_ms[];
-    extern const unsigned short *const x0212_to_utf8_2bytes[];
-#endif
-    const unsigned short *p;
-
-    if (c2 == X0201) {
-        p = euc_to_utf8_1byte;
-#ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == NKF_INT32_C(0x8F22) && c1 == 0x43){
-	    return 0xA6;
-	}
-        c2 = (c2&0x7f) - 0x21;
-        if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
-	    p = x0212_to_utf8_2bytes[c2];
-        else
-            return 0;
-#endif
-    } else {
-        c2 &= 0x7f;
-        c2 = (c2&0x7f) - 0x21;
-        if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
-            p = ms_ucs_map_f != UCS_MAP_ASCII ? euc_to_utf8_2bytes_ms[c2] : euc_to_utf8_2bytes[c2];
-	else
-	    return 0;
-    }
-    if (!p) return 0;
-    c1 = (c1 & 0x7f) - 0x21;
-    if (0<=c1 && c1<sizeof_euc_to_utf8_1byte)
-	return p[c1];
-    return 0;
-}
-
-void w_oconv(nkf_char c2, nkf_char c1)
-{
-    nkf_char c0;
-    nkf_char val;
-    if (c2 == EOF) {
-        (*o_putc)(EOF);
-        return;
-    }
-
-    if (unicode_bom_f==2) {
-	(*o_putc)('\357');
-	(*o_putc)('\273');
-	(*o_putc)('\277');
-	unicode_bom_f=1;
-    }
-
-#ifdef NUMCHAR_OPTION
-    if (c2 == 0 && is_unicode_capsule(c1)){
-        val = c1 & VALUE_MASK;
-        if (val < 0x80){
-            (*o_putc)(val);
-        }else if (val < 0x800){
-            (*o_putc)(0xC0 | (val >> 6));
-            (*o_putc)(0x80 | (val & 0x3f));
-        } else if (val <= NKF_INT32_C(0xFFFF)) {
-            (*o_putc)(0xE0 | (val >> 12));
-            (*o_putc)(0x80 | ((val >> 6) & 0x3f));
-            (*o_putc)(0x80 | (val        & 0x3f));
-        } else if (val <= NKF_INT32_C(0x10FFFF)) {
-            (*o_putc)(0xE0 | ( val>>18));
-            (*o_putc)(0x80 | ((val>>12) & 0x3f));
-            (*o_putc)(0x80 | ((val>> 6) & 0x3f));
-            (*o_putc)(0x80 | ( val      & 0x3f));
-        }
-        return;
-    }
-#endif
-
-    if (c2 == 0) { 
-	output_mode = ASCII;
-        (*o_putc)(c1);
-    } else if (c2 == ISO8859_1) {
-	output_mode = ISO8859_1;
-        (*o_putc)(c1 | 0x080);
-    } else {
-        output_mode = UTF8;
-	val = e2w_conv(c2, c1);
-        if (val){
-            w16w_conv(val, &c2, &c1, &c0);
-            (*o_putc)(c2);
-            if (c1){
-                (*o_putc)(c1);
-                if (c0) (*o_putc)(c0);
-            }
-        }
-    }
-}
-
-void w_oconv16(nkf_char c2, nkf_char c1)
-{
-    if (c2 == EOF) {
-        (*o_putc)(EOF);
-        return;
-    }    
-
-    if (unicode_bom_f==2) {
-        if (w_oconv16_LE){
-            (*o_putc)((unsigned char)'\377');
-            (*o_putc)('\376');
-        }else{
-            (*o_putc)('\376');
-            (*o_putc)((unsigned char)'\377');
-        }
-	unicode_bom_f=1;
-    }
-
-    if (c2 == ISO8859_1) {
-        c2 = 0;
-        c1 |= 0x80;
-#ifdef NUMCHAR_OPTION
-    } else if (c2 == 0 && is_unicode_capsule(c1)) {
-        if (is_unicode_bmp(c1)) {
-            c2 = (c1 >> 8) & 0xff;
-            c1 &= 0xff;
-        } else {
-            c1 &= VALUE_MASK;
-            if (c1 <= UNICODE_MAX) {
-                c2 = (c1 >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */
-                c1 = (c1 & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
-                if (w_oconv16_LE){
-                    (*o_putc)(c2 & 0xff);
-                    (*o_putc)((c2 >> 8) & 0xff);
-                    (*o_putc)(c1 & 0xff);
-                    (*o_putc)((c1 >> 8) & 0xff);
-                }else{
-                    (*o_putc)((c2 >> 8) & 0xff);
-                    (*o_putc)(c2 & 0xff);
-                    (*o_putc)((c1 >> 8) & 0xff);
-                    (*o_putc)(c1 & 0xff);
-                }
-            }
-            return;
-        }
-#endif
-    } else if (c2) {
-        nkf_char val = e2w_conv(c2, c1);
-        c2 = (val >> 8) & 0xff;
-        c1 = val & 0xff;
-    }
-    if (w_oconv16_LE){
-        (*o_putc)(c1);
-        (*o_putc)(c2);
-    }else{
-        (*o_putc)(c2);
-        (*o_putc)(c1);
-    }
-}
-
-#endif
-
-void e_oconv(nkf_char c2, nkf_char c1)
-{
-#ifdef NUMCHAR_OPTION
-    if (c2 == 0 && is_unicode_capsule(c1)){
-        w16e_conv(c1, &c2, &c1);
-        if (c2 == 0 && is_unicode_capsule(c1)){
-	    if(encode_fallback)(*encode_fallback)(c1);
-            return;
-        }
-    }
-#endif
-    if (c2 == EOF) {
-        (*o_putc)(EOF);
-        return;
-    } else if (c2 == 0) { 
-	output_mode = ASCII;
-        (*o_putc)(c1);
-    } else if (c2 == X0201) {
-	output_mode = JAPANESE_EUC;
-        (*o_putc)(SSO); (*o_putc)(c1|0x80);
-    } else if (c2 == ISO8859_1) {
-	output_mode = ISO8859_1;
-        (*o_putc)(c1 | 0x080);
-#ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	output_mode = JAPANESE_EUC;
-#ifdef SHIFTJIS_CP932
-        if (cp51932_f){
-            nkf_char s2, s1;
-            if (e2s_conv(c2, c1, &s2, &s1) == 0){
-                s2e_conv(s2, s1, &c2, &c1);
-            }
-        }
-#endif
-        if (c2 == 0) {
-	    output_mode = ASCII;
-	    (*o_putc)(c1);
-	}else if (is_eucg3(c2)){
-            if (x0212_f){
-                (*o_putc)(0x8f);
-                (*o_putc)((c2 & 0x7f) | 0x080);
-                (*o_putc)(c1 | 0x080);
-            }
-        }else{
-            (*o_putc)((c2 & 0x7f) | 0x080);
-            (*o_putc)(c1 | 0x080);
-        }
-#endif
-    } else {
-        if (!nkf_isgraph(c1) || !nkf_isgraph(c2)) {
-            set_iconv(FALSE, 0);
-            return; /* too late to rescue this char */
-        }
-	output_mode = JAPANESE_EUC;
-        (*o_putc)(c2 | 0x080);
-        (*o_putc)(c1 | 0x080);
-    }
-}
-
-#ifdef X0212_ENABLE
-nkf_char x0212_shift(nkf_char c)
-{
-    nkf_char ret = c;
-    c &= 0x7f;
-    if (is_eucg3(ret)){
-        if (0x75 <= c && c <= 0x7f){
-            ret = c + (0x109 - 0x75);
-        }
-    }else{
-        if (0x75 <= c && c <= 0x7f){
-            ret = c + (0x113 - 0x75);
-        }
-    }
-    return ret;
-}
-
-
-nkf_char x0212_unshift(nkf_char c)
-{
-    nkf_char ret = c;
-    if (0x7f <= c && c <= 0x88){
-        ret = c + (0x75 - 0x7f);
-    }else if (0x89 <= c && c <= 0x92){
-        ret = PREFIX_EUCG3 | 0x80 | (c + (0x75 - 0x89));
-    }
-    return ret;
-}
-#endif /* X0212_ENABLE */
-
-nkf_char e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
-{
-    nkf_char ndx;
-    if (is_eucg3(c2)){
-	ndx = c2 & 0xff;
-	if (x0213_f){
-	    if((0x21 <= ndx && ndx <= 0x2F)){
-		if (p2) *p2 = ((ndx - 1) >> 1) + 0xec - ndx / 8 * 3;
-		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
-		return 0;
-	    }else if(0x6E <= ndx && ndx <= 0x7E){
-		if (p2) *p2 = ((ndx - 1) >> 1) + 0xbe;
-		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
-		return 0;
-	    }
-	    return 1;
-	}
-#ifdef X0212_ENABLE
-	else if(nkf_isgraph(ndx)){
-	    nkf_char val = 0;
-	    const unsigned short *ptr;
-#if 0
-	    extern const unsigned short *const x0212_shiftjis[];
-#endif
-	    ptr = x0212_shiftjis[ndx - 0x21];
-	    if (ptr){
-		val = ptr[(c1 & 0x7f) - 0x21];
-	    }
-	    if (val){
-		c2 = val >> 8;
-		c1 = val & 0xff;
-		if (p2) *p2 = c2;
-		if (p1) *p1 = c1;
-		return 0;
-	    }
-	    c2 = x0212_shift(c2);
-	}
-#endif /* X0212_ENABLE */
-    }
-    if(0x7F < c2) return 1;
-    if (p2) *p2 = ((c2 - 1) >> 1) + ((c2 <= 0x5e) ? 0x71 : 0xb1);
-    if (p1) *p1 = c1 + ((c2 & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
-    return 0;
-}
-
-void s_oconv(nkf_char c2, nkf_char c1)
-{
-#ifdef NUMCHAR_OPTION
-    if (c2 == 0 && is_unicode_capsule(c1)){
-        w16e_conv(c1, &c2, &c1);
-        if (c2 == 0 && is_unicode_capsule(c1)){
-	    if(encode_fallback)(*encode_fallback)(c1);
-            return;
-        }
-    }
-#endif
-    if (c2 == EOF) {
-        (*o_putc)(EOF);
-        return;
-    } else if (c2 == 0) {
-	output_mode = ASCII;
-        (*o_putc)(c1);
-    } else if (c2 == X0201) {
-	output_mode = SHIFT_JIS;
-        (*o_putc)(c1|0x80);
-    } else if (c2 == ISO8859_1) {
-	output_mode = ISO8859_1;
-        (*o_putc)(c1 | 0x080);
-#ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	output_mode = SHIFT_JIS;
-        if (e2s_conv(c2, c1, &c2, &c1) == 0){
-            (*o_putc)(c2);
-            (*o_putc)(c1);
-        }
-#endif
-    } else {
-        if (!nkf_isprint(c1) || !nkf_isprint(c2)) {
-            set_iconv(FALSE, 0);
-            return; /* too late to rescue this char */
-        }
-	output_mode = SHIFT_JIS;
-        e2s_conv(c2, c1, &c2, &c1);
-
-#ifdef SHIFTJIS_CP932
-        if (cp932inv_f
-            && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
-#if 0
-            extern const unsigned short cp932inv[2][189];
-#endif
-            nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
-            if (c){
-                c2 = c >> 8;
-                c1 = c & 0xff;
-            }
-        }
-#endif /* SHIFTJIS_CP932 */
-
-        (*o_putc)(c2);
-	if (prefix_table[(unsigned char)c1]){
-            (*o_putc)(prefix_table[(unsigned char)c1]);
-	}
-        (*o_putc)(c1);
-    }
-}
-
-void j_oconv(nkf_char c2, nkf_char c1)
-{
-#ifdef NUMCHAR_OPTION
-    if (c2 == 0 && is_unicode_capsule(c1)){
-        w16e_conv(c1, &c2, &c1);
-        if (c2 == 0 && is_unicode_capsule(c1)){
-	    if(encode_fallback)(*encode_fallback)(c1);
-            return;
-        }
-    }
-#endif
-    if (c2 == EOF) {
-        if (output_mode !=ASCII && output_mode!=ISO8859_1) {
-            (*o_putc)(ESC);
-            (*o_putc)('(');
-            (*o_putc)(ascii_intro);
-	    output_mode = ASCII;
-        }
-        (*o_putc)(EOF);
-#ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	if(x0213_f){
-	    if(output_mode!=X0213_2){
-		output_mode = X0213_2;
-		(*o_putc)(ESC);
-		(*o_putc)('$');
-		(*o_putc)('(');
-		(*o_putc)(X0213_2&0x7F);
-	    }
-	}else{
-	    if(output_mode!=X0212){
-		output_mode = X0212;
-		(*o_putc)(ESC);
-		(*o_putc)('$');
-		(*o_putc)('(');
-		(*o_putc)(X0212&0x7F);
-	    }
-        }
-        (*o_putc)(c2 & 0x7f);
-        (*o_putc)(c1);
-#endif
-    } else if (c2==X0201) {
-        if (output_mode!=X0201) {
-            output_mode = X0201;
-            (*o_putc)(ESC);
-            (*o_putc)('(');
-            (*o_putc)('I');
-        }
-        (*o_putc)(c1);
-    } else if (c2==ISO8859_1) {
-            /* iso8859 introduction, or 8th bit on */
-            /* Can we convert in 7bit form using ESC-'-'-A ? 
-               Is this popular? */
-	output_mode = ISO8859_1;
-        (*o_putc)(c1|0x80);
-    } else if (c2 == 0) {
-        if (output_mode !=ASCII && output_mode!=ISO8859_1) {
-            (*o_putc)(ESC);
-            (*o_putc)('(');
-            (*o_putc)(ascii_intro);
-            output_mode = ASCII;
-        }
-        (*o_putc)(c1);
-    } else {
-	if(c2<0x20 || 0x7e<c2 || c1<0x20 || 0x7e<c1) return;
-	if(x0213_f){
-	    if (output_mode!=X0213_1) {
-		output_mode = X0213_1;
-		(*o_putc)(ESC);
-		(*o_putc)('$');
-		(*o_putc)('(');
-		(*o_putc)(X0213_1&0x7F);
-	    }
-	}else if (output_mode != X0208) {
-            output_mode = X0208;
-            (*o_putc)(ESC);
-            (*o_putc)('$');
-            (*o_putc)(kanji_intro);
-        }
-        (*o_putc)(c2);
-        (*o_putc)(c1);
-    }
-}
-
-void base64_conv(nkf_char c2, nkf_char c1)
-{
-    mime_prechar(c2, c1);
-    (*o_base64conv)(c2,c1);
-}
-
-
-static nkf_char broken_buf[3];
-static int broken_counter = 0;
-static int broken_last = 0;
-nkf_char broken_getc(FILE *f)
-{
-    nkf_char c,c1;
-
-    if (broken_counter>0) {
-	return broken_buf[--broken_counter];
-    }
-    c= (*i_bgetc)(f);
-    if (c=='$' && broken_last != ESC 
-            && (input_mode==ASCII || input_mode==X0201)) {
-	c1= (*i_bgetc)(f);
-	broken_last = 0;
-	if (c1=='@'|| c1=='B') {
-	    broken_buf[0]=c1; broken_buf[1]=c; 
-	    broken_counter=2;
-	    return ESC;
-	} else {
-	    (*i_bungetc)(c1,f);
-	    return c;
-	}
-    } else if (c=='(' && broken_last != ESC 
-            && (input_mode==X0208 || input_mode==X0201)) { /* ) */
-	c1= (*i_bgetc)(f);
-	broken_last = 0;
-	if (c1=='J'|| c1=='B') {
-	    broken_buf[0]=c1; broken_buf[1]=c;
-	    broken_counter=2;
-	    return ESC;
-	} else {
-	    (*i_bungetc)(c1,f);
-	    return c;
-	}
-    } else {
-	broken_last = c;
-	return c;
-    }
-}
-
-nkf_char broken_ungetc(nkf_char c, FILE *f)
-{
-    if (broken_counter<2)
-	broken_buf[broken_counter++]=c;
-    return c;
-}
-
-static nkf_char prev_cr = 0;
-
-void cr_conv(nkf_char c2, nkf_char c1)
-{
-    if (prev_cr) {
-	prev_cr = 0;
-	if (! (c2==0&&c1==NL) ) {
-	    cr_conv(0,'\n');
-	}
-    }
-    if (c2) {
-        (*o_crconv)(c2,c1);
-    } else if (c1=='\r') {
-	prev_cr = c1;
-    } else if (c1=='\n') {
-        if (crmode_f==CRLF) {
-            (*o_crconv)(0,'\r');
-	} else if (crmode_f==CR) {
-            (*o_crconv)(0,'\r');
-	    return;
-	} 
-	(*o_crconv)(0,NL);
-    } else if (c1!='\032' || crmode_f!=NL){
-        (*o_crconv)(c2,c1);
-    }
-}
-
-/* 
-  Return value of fold_conv()
-
-       \n  add newline  and output char
-       \r  add newline  and output nothing
-       ' ' space
-       0   skip  
-       1   (or else) normal output 
-
-  fold state in prev (previous character)
-
-      >0x80 Japanese (X0208/X0201)
-      <0x80 ASCII
-      \n    new line 
-      ' '   space
-
-  This fold algorthm does not preserve heading space in a line.
-  This is the main difference from fmt.
-*/
-
-#define char_size(c2,c1) (c2?2:1)
-
-void fold_conv(nkf_char c2, nkf_char c1)
-{ 
-    nkf_char prev0;
-    nkf_char fold_state;
-
-    if (c1== '\r' && !fold_preserve_f) {
-    	fold_state=0;  /* ignore cr */
-    }else if (c1== '\n'&&f_prev=='\r' && fold_preserve_f) {
-        f_prev = '\n';
-     	fold_state=0;  /* ignore cr */
-    } else if (c1== BS) {
-        if (f_line>0) f_line--;
-        fold_state =  1;
-    } else if (c2==EOF && f_line != 0) {    /* close open last line */
-            fold_state = '\n';
-    } else if ((c1=='\n' && !fold_preserve_f)
-               || ((c1=='\r'||(c1=='\n'&&f_prev!='\r'))
-                   && fold_preserve_f)) {
-        /* new line */
-        if (fold_preserve_f) { 
-            f_prev = c1;
-            f_line = 0;
-            fold_state =  '\r';
-	} else if ((f_prev == c1 && !fold_preserve_f)
-                   || (f_prev == '\n' && fold_preserve_f)
-                   ) {        /* duplicate newline */
-            if (f_line) {
-                f_line = 0;
-                fold_state =  '\n';    /* output two newline */
-            } else {
-                f_line = 0;
-                fold_state =  1;
-            }
-        } else  {
-            if (f_prev&0x80) {     /* Japanese? */
-                f_prev = c1;
-                fold_state =  0;       /* ignore given single newline */
-            } else if (f_prev==' ') {
-                fold_state =  0;
-            } else {
-                f_prev = c1;
-                if (++f_line<=fold_len) 
-                    fold_state =  ' ';
-                else {
-                    f_line = 0;
-                    fold_state =  '\r';        /* fold and output nothing */
-                }
-            }
-        }
-    } else if (c1=='\f') {
-        f_prev = '\n';
-        f_line = 0;
-        fold_state =  '\n';            /* output newline and clear */
-    } else if ( (c2==0  && c1==' ')||
-               (c2==0  && c1=='\t')||
-               (c2=='!'&& c1=='!')) {
-        /* X0208 kankaku or ascii space */
-            if (f_prev == ' ') {
-                fold_state = 0;         /* remove duplicate spaces */
-            } else {
-                f_prev = ' ';    
-                if (++f_line<=fold_len) 
-                    fold_state = ' ';         /* output ASCII space only */
-                else {
-                    f_prev = ' '; f_line = 0;
-                    fold_state = '\r';        /* fold and output nothing */
-                }
-            }
-    } else {
-        prev0 = f_prev; /* we still need this one... , but almost done */
-        f_prev = c1;
-        if (c2 || c2==X0201) 
-            f_prev |= 0x80;  /* this is Japanese */
-        f_line += char_size(c2,c1);
-        if (f_line<=fold_len) {   /* normal case */
-            fold_state = 1;
-        } else {
-            if (f_line>fold_len+fold_margin) { /* too many kinsoku suspension */
-                f_line = char_size(c2,c1);
-                fold_state =  '\n';       /* We can't wait, do fold now */
-            } else if (c2==X0201) {
-            /* simple kinsoku rules  return 1 means no folding  */
-                if (c1==(0xde&0x7f)) fold_state = 1; /* $B!+(B*/
-                else if (c1==(0xdf&0x7f)) fold_state = 1; /* $B!,(B*/
-                else if (c1==(0xa4&0x7f)) fold_state = 1; /* $B!#(B*/
-                else if (c1==(0xa3&0x7f)) fold_state = 1; /* $B!$(B*/
-                else if (c1==(0xa1&0x7f)) fold_state = 1; /* $B!W(B*/
-                else if (c1==(0xb0&0x7f)) fold_state = 1; /* - */
-                else if (SPACE<=c1 && c1<=(0xdf&0x7f)) {      /* X0201 */
-		    f_line = 1;
-		    fold_state = '\n';/* add one new f_line before this character */
-		} else {
-		    f_line = 1;
-		    fold_state = '\n';/* add one new f_line before this character */
-		}
-            } else if (c2==0) {
-                /* kinsoku point in ASCII */ 
-		if (  c1==')'||    /* { [ ( */
-                     c1==']'||
-                     c1=='}'||
-                     c1=='.'||
-                     c1==','||
-                     c1=='!'||
-                     c1=='?'||
-                     c1=='/'||
-                     c1==':'||
-                     c1==';' ) {
-		    fold_state = 1;
-		/* just after special */
-		} else if (!is_alnum(prev0)) {
-		    f_line = char_size(c2,c1);
-		    fold_state = '\n';
-		} else if ((prev0==' ') ||   /* ignored new f_line */
-                      (prev0=='\n')||        /* ignored new f_line */
-                      (prev0&0x80)) {        /* X0208 - ASCII */
-		    f_line = char_size(c2,c1);
-                    fold_state = '\n';/* add one new f_line before this character */
-                } else {
-                    fold_state = 1;  /* default no fold in ASCII */
-                }
-            } else {
-                if (c2=='!') {
-                    if (c1=='"')  fold_state = 1; /* $B!"(B */
-                    else if (c1=='#')  fold_state = 1; /* $B!#(B */
-                    else if (c1=='W')  fold_state = 1; /* $B!W(B */
-                    else if (c1=='K')  fold_state = 1; /* $B!K(B */
-                    else if (c1=='$')  fold_state = 1; /* $B!$(B */
-                    else if (c1=='%')  fold_state = 1; /* $B!%(B */
-                    else if (c1=='\'') fold_state = 1; /* $B!\(B */
-                    else if (c1=='(')  fold_state = 1; /* $B!((B */
-                    else if (c1==')')  fold_state = 1; /* $B!)(B */
-                    else if (c1=='*')  fold_state = 1; /* $B!*(B */
-                    else if (c1=='+')  fold_state = 1; /* $B!+(B */
-                    else if (c1==',')  fold_state = 1; /* $B!,(B */
-                         /* default no fold in kinsoku */
-		    else { 
-			fold_state = '\n';
-			f_line = char_size(c2,c1);
-			/* add one new f_line before this character */
-		    }
-                } else {
-		    f_line = char_size(c2,c1);
-                    fold_state = '\n'; 
-                    /* add one new f_line before this character */
-                }
-            }
-        }
-    }
-    /* terminator process */
-    switch(fold_state) {
-        case '\n': 
-            (*o_fconv)(0,'\n');
-            (*o_fconv)(c2,c1);
-            break;
-        case 0:    
-            return;
-        case '\r': 
-            (*o_fconv)(0,'\n');
-            break;
-        case '\t': 
-        case ' ': 
-            (*o_fconv)(0,' ');
-            break;
-        default:
-            (*o_fconv)(c2,c1);
-    }
-}
-
-nkf_char z_prev2=0,z_prev1=0;
-
-void z_conv(nkf_char c2, nkf_char c1)
-{
-
-    /* if (c2) c1 &= 0x7f; assertion */
-
-    if (x0201_f && z_prev2==X0201) {  /* X0201 */
-        if (c1==(0xde&0x7f)) { /* $BByE@(B */
-            z_prev2=0;
-            (*o_zconv)(dv[(z_prev1-SPACE)*2],dv[(z_prev1-SPACE)*2+1]);
-            return;
-        } else if (c1==(0xdf&0x7f)&&ev[(z_prev1-SPACE)*2]) {  /* $BH>ByE@(B */
-            z_prev2=0;
-            (*o_zconv)(ev[(z_prev1-SPACE)*2],ev[(z_prev1-SPACE)*2+1]);
-            return;
-        } else {
-            z_prev2=0;
-            (*o_zconv)(cv[(z_prev1-SPACE)*2],cv[(z_prev1-SPACE)*2+1]);
-        }
-    }
-
-    if (c2==EOF) {
-        (*o_zconv)(c2,c1);
-        return;
-    }
-
-    if (x0201_f && c2==X0201) {
-        if (dv[(c1-SPACE)*2]||ev[(c1-SPACE)*2]) {
-            /* wait for $BByE@(B or $BH>ByE@(B */
-            z_prev1 = c1; z_prev2 = c2;
-            return;
-        } else {
-            (*o_zconv)(cv[(c1-SPACE)*2],cv[(c1-SPACE)*2+1]);
-            return;
-        }
-    }
-
-    /* JISX0208 Alphabet */
-    if (alpha_f && c2 == 0x23 ) {
-        c2 = 0;
-    } else if (alpha_f && c2 == 0x21 ) { 
-    /* JISX0208 Kigou */
-       if (0x21==c1) {
-           if (alpha_f&0x2) {
-               c1 = ' ';
-               c2 = 0;
-           } else if (alpha_f&0x4) {
-                (*o_zconv)(0,' ');
-                (*o_zconv)(0,' ');
-                return;
-           } 
-       } else if (0x20<c1 && c1<0x7f && fv[c1-0x20]) {
-           c1 = fv[c1-0x20];
-           c2 =  0;
-           if (alpha_f&0x8) {
-               char *entity = 0;
-               switch (c1){
-                 case '>': entity = "&gt;"; break;
-                 case '<': entity = "&lt;"; break;
-                 case '\"': entity = "&quot;"; break;
-                 case '&': entity = "&amp;"; break;
-               }
-               if (entity){
-                   while (*entity) (*o_zconv)(0, *entity++);
-                   return;
-               }
-           }
-       } 
-    }
-    (*o_zconv)(c2,c1);
-}
-
-
-#define rot13(c)  ( \
-      ( c < 'A' ) ? c: \
-      (c <= 'M')  ? (c + 13): \
-      (c <= 'Z')  ? (c - 13): \
-      (c < 'a')   ? (c): \
-      (c <= 'm')  ? (c + 13): \
-      (c <= 'z')  ? (c - 13): \
-      (c) \
-)
-
-#define  rot47(c) ( \
-      ( c < '!' ) ? c: \
-      ( c <= 'O' ) ? (c + 47) : \
-      ( c <= '~' ) ?  (c - 47) : \
-      c \
-)
-
-void rot_conv(nkf_char c2, nkf_char c1)
-{
-    if (c2==0 || c2==X0201 || c2==ISO8859_1) {
-	c1 = rot13(c1);
-    } else if (c2) {
-	c1 = rot47(c1);
-	c2 = rot47(c2);
-    }
-    (*o_rot_conv)(c2,c1);
-}
-
-void hira_conv(nkf_char c2, nkf_char c1)
-{
-    if (hira_f & 1) {
-        if (c2 == 0x25) {
-            if (0x20 < c1 && c1 < 0x74) {
-                c2 = 0x24;
-                (*o_hira_conv)(c2,c1);
-                return;
-            } else if (c1 == 0x74 && (output_conv == w_oconv || output_conv == w_oconv16)) {
-                c2 = 0;
-                c1 = CLASS_UTF16 | 0x3094;
-                (*o_hira_conv)(c2,c1);
-                return;
-            }
-        } else if (c2 == 0x21 && (c1 == 0x33 || c1 == 0x34)) {
-            c1 += 2;
-            (*o_hira_conv)(c2,c1);
-            return;
-        }
-    }
-    if (hira_f & 2) {
-        if (c2 == 0 && c1 == (CLASS_UTF16 | 0x3094)) {
-            c2 = 0x25;
-            c1 = 0x74;
-        } else if (c2 == 0x24 && 0x20 < c1 && c1 < 0x74) {
-            c2 = 0x25;
-        } else if (c2 == 0x21 && (c1 == 0x35 || c1 == 0x36)) {
-            c1 -= 2;
-        }
-    }
-    (*o_hira_conv)(c2,c1);
-}
-
-
-void iso2022jp_check_conv(nkf_char c2, nkf_char c1)
-{
-    static const nkf_char range[RANGE_NUM_MAX][2] = {
-        {0x222f, 0x2239,},
-        {0x2242, 0x2249,},
-        {0x2251, 0x225b,},
-        {0x226b, 0x2271,},
-        {0x227a, 0x227d,},
-        {0x2321, 0x232f,},
-        {0x233a, 0x2340,},
-        {0x235b, 0x2360,},
-        {0x237b, 0x237e,},
-        {0x2474, 0x247e,},
-        {0x2577, 0x257e,},
-        {0x2639, 0x2640,},
-        {0x2659, 0x267e,},
-        {0x2742, 0x2750,},
-        {0x2772, 0x277e,},
-        {0x2841, 0x287e,},
-        {0x4f54, 0x4f7e,},
-        {0x7425, 0x747e},
-    };
-    nkf_char i;
-    nkf_char start, end, c;
-
-    if(c2 >= 0x00 && c2 <= 0x20 && c1 >= 0x7f && c1 <= 0xff) {
-	c2 = GETA1;
-	c1 = GETA2;
-    }
-    if((c2 >= 0x29 && c2 <= 0x2f) || (c2 >= 0x75 && c2 <= 0x7e)) {
-	c2 = GETA1;
-	c1 = GETA2;
-    }
-
-    for (i = 0; i < RANGE_NUM_MAX; i++) {
-	start = range[i][0];
-	end   = range[i][1];
-	c     = (c2 << 8) + c1;
-	if (c >= start && c <= end) {
-	    c2 = GETA1;
-	    c1 = GETA2;
-	}
-    }
-    (*o_iso2022jp_check_conv)(c2,c1);
-}
-
-
-/* This converts  =?ISO-2022-JP?B?HOGE HOGE?= */
-
-const unsigned char *mime_pattern[] = {
-    (const unsigned char *)"\075?EUC-JP?B?",
-    (const unsigned char *)"\075?SHIFT_JIS?B?",
-    (const unsigned char *)"\075?ISO-8859-1?Q?",
-    (const unsigned char *)"\075?ISO-8859-1?B?",
-    (const unsigned char *)"\075?ISO-2022-JP?B?",
-    (const unsigned char *)"\075?ISO-2022-JP?Q?",
-#if defined(UTF8_INPUT_ENABLE)
-    (const unsigned char *)"\075?UTF-8?B?",
-    (const unsigned char *)"\075?UTF-8?Q?",
-#endif
-    (const unsigned char *)"\075?US-ASCII?Q?",
-    NULL
-};
-
-
-/* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */
-nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
-    e_iconv, s_iconv, 0, 0, 0, 0,
-#if defined(UTF8_INPUT_ENABLE)
-    w_iconv, w_iconv,
-#endif
-    0,
-};
-
-const nkf_char mime_encode[] = {
-    JAPANESE_EUC, SHIFT_JIS,ISO8859_1, ISO8859_1, X0208, X0201,
-#if defined(UTF8_INPUT_ENABLE)
-    UTF8, UTF8,
-#endif
-    ASCII,
-    0
-};
-
-const nkf_char mime_encode_method[] = {
-    'B', 'B','Q', 'B', 'B', 'Q',
-#if defined(UTF8_INPUT_ENABLE)
-    'B', 'Q',
-#endif
-    'Q',
-    0
-};
-
-
-#define MAXRECOVER 20
-
-void switch_mime_getc(void)
-{
-    if (i_getc!=mime_getc) {
-	i_mgetc = i_getc; i_getc = mime_getc;
-	i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
-	if(mime_f==STRICT_MIME) {
-	    i_mgetc_buf = i_mgetc; i_mgetc = mime_getc_buf;
-	    i_mungetc_buf = i_mungetc; i_mungetc = mime_ungetc_buf;
-	}
-    }
-}
-
-void unswitch_mime_getc(void)
-{
-    if(mime_f==STRICT_MIME) {
-	i_mgetc = i_mgetc_buf;
-	i_mungetc = i_mungetc_buf;
-    }
-    i_getc = i_mgetc;
-    i_ungetc = i_mungetc;
-    if(mime_iconv_back)set_iconv(FALSE, mime_iconv_back);
-    mime_iconv_back = NULL;
-}
-
-nkf_char mime_begin_strict(FILE *f)
-{
-    nkf_char c1 = 0;
-    int i,j,k;
-    const unsigned char *p,*q;
-    nkf_char r[MAXRECOVER];    /* recovery buffer, max mime pattern length */
-
-    mime_decode_mode = FALSE;
-    /* =? has been checked */
-    j = 0;
-    p = mime_pattern[j];
-    r[0]='='; r[1]='?';
-
-    for(i=2;p[i]>' ';i++) {                   /* start at =? */
-        if ( ((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i] ) {
-            /* pattern fails, try next one */
-            q = p;
-            while (mime_pattern[++j]) {
-		p = mime_pattern[j];
-                for(k=2;k<i;k++)              /* assume length(p) > i */
-                    if (p[k]!=q[k]) break;
-                if (k==i && nkf_toupper(c1)==p[k]) break;
-            }
-	    p = mime_pattern[j];
-            if (p) continue;  /* found next one, continue */
-            /* all fails, output from recovery buffer */
-            (*i_ungetc)(c1,f);
-            for(j=0;j<i;j++) {
-                (*oconv)(0,r[j]);
-            }
-            return c1;
-        }
-    }
-    mime_decode_mode = p[i-2];
-
-    mime_iconv_back = iconv;
-    set_iconv(FALSE, mime_priority_func[j]);
-    clr_code_score(find_inputcode_byfunc(mime_priority_func[j]), SCORE_iMIME);
-
-    if (mime_decode_mode=='B') {
-        mimebuf_f = unbuf_f;
-        if (!unbuf_f) {
-            /* do MIME integrity check */
-            return mime_integrity(f,mime_pattern[j]);
-        } 
-    }
-    switch_mime_getc();
-    mimebuf_f = TRUE;
-    return c1;
-}
-
-nkf_char mime_getc_buf(FILE *f)
-{
-    /* we don't keep eof of Fifo, becase it contains ?= as
-       a terminator. It was checked in mime_integrity. */
-    return ((mimebuf_f)?
-        (*i_mgetc_buf)(f):Fifo(mime_input++));
-}
-
-nkf_char mime_ungetc_buf(nkf_char c, FILE *f)
-{
-    if (mimebuf_f)
-	(*i_mungetc_buf)(c,f);
-    else 
-	Fifo(--mime_input) = (unsigned char)c;
-    return c;
-}
-
-nkf_char mime_begin(FILE *f)
-{
-    nkf_char c1;
-    int i,k;
-
-    /* In NONSTRICT mode, only =? is checked. In case of failure, we  */
-    /* re-read and convert again from mime_buffer.  */
-
-    /* =? has been checked */
-    k = mime_last;
-    Fifo(mime_last++)='='; Fifo(mime_last++)='?';
-    for(i=2;i<MAXRECOVER;i++) {                   /* start at =? */
-        /* We accept any character type even if it is breaked by new lines */
-        c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
-        if (c1=='\n'||c1==' '||c1=='\r'||
-                c1=='-'||c1=='_'||is_alnum(c1) ) continue;
-        if (c1=='=') {
-            /* Failed. But this could be another MIME preemble */
-            (*i_ungetc)(c1,f);
-            mime_last--;
-            break;
-        }
-        if (c1!='?') break;
-        else {
-            /* c1=='?' */
-            c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
-            if (!(++i<MAXRECOVER) || c1==EOF) break;
-            if (c1=='b'||c1=='B') {
-                mime_decode_mode = 'B';
-            } else if (c1=='q'||c1=='Q') {
-                mime_decode_mode = 'Q';
-            } else {
-                break;
-            }
-            c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
-            if (!(++i<MAXRECOVER) || c1==EOF) break;
-            if (c1!='?') {
-                mime_decode_mode = FALSE;
-            }
-            break;
-        }
-    }
-    switch_mime_getc();
-    if (!mime_decode_mode) {
-        /* false MIME premble, restart from mime_buffer */
-        mime_decode_mode = 1;  /* no decode, but read from the mime_buffer */
-        /* Since we are in MIME mode until buffer becomes empty,    */
-        /* we never go into mime_begin again for a while.           */
-        return c1;
-    }
-    /* discard mime preemble, and goto MIME mode */
-    mime_last = k;
-    /* do no MIME integrity check */
-    return c1;   /* used only for checking EOF */
-}
-
-#ifdef CHECK_OPTION
-void no_putc(nkf_char c)
-{
-    ;
-}
-
-void debug(const char *str)
-{
-    if (debug_f){
-        fprintf(stderr, "%s\n", str);
-    }
-}
-#endif
-
-void set_input_codename(char *codename)
-{
-    if (guess_f && 
-        is_inputcode_set &&
-        strcmp(codename, "") != 0 && 
-        strcmp(codename, input_codename) != 0)
-    {
-        is_inputcode_mixed = TRUE;
-    }
-    input_codename = codename;
-    is_inputcode_set = TRUE;
-}
-
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-void print_guessed_code(char *filename)
-{
-    char *codename = "BINARY";
-    if (!is_inputcode_mixed) {
-        if (strcmp(input_codename, "") == 0) {
-            codename = "ASCII";
-        } else {
-            codename = input_codename;
-        }
-    }
-    if (filename != NULL) printf("%s:", filename);
-    printf("%s\n", codename);
-}
-#endif /*WIN32DLL*/
-
-#ifdef INPUT_OPTION 
-
-nkf_char hex_getc(nkf_char ch, FILE *f, nkf_char (*g)(FILE *f), nkf_char (*u)(nkf_char c, FILE *f))
-{
-    nkf_char c1, c2, c3;
-    c1 = (*g)(f);
-    if (c1 != ch){
-        return c1;
-    }
-    c2 = (*g)(f);
-    if (!nkf_isxdigit(c2)){
-        (*u)(c2, f);
-        return c1;
-    }
-    c3 = (*g)(f);
-    if (!nkf_isxdigit(c3)){
-        (*u)(c2, f);
-        (*u)(c3, f);
-        return c1;
-    }
-    return (hex2bin(c2) << 4) | hex2bin(c3);
-}
-
-nkf_char cap_getc(FILE *f)
-{
-    return hex_getc(':', f, i_cgetc, i_cungetc);
-}
-
-nkf_char cap_ungetc(nkf_char c, FILE *f)
-{
-    return (*i_cungetc)(c, f);
-}
-
-nkf_char url_getc(FILE *f)
-{
-    return hex_getc('%', f, i_ugetc, i_uungetc);
-}
-
-nkf_char url_ungetc(nkf_char c, FILE *f)
-{
-    return (*i_uungetc)(c, f);
-}
-#endif
-
-#ifdef NUMCHAR_OPTION
-nkf_char numchar_getc(FILE *f)
-{
-    nkf_char (*g)(FILE *) = i_ngetc;
-    nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
-    int i = 0, j;
-    nkf_char buf[8];
-    long c = -1;
-
-    buf[i] = (*g)(f);
-    if (buf[i] == '&'){
-        buf[++i] = (*g)(f);
-        if (buf[i] == '#'){
-            c = 0;
-            buf[++i] = (*g)(f);
-            if (buf[i] == 'x' || buf[i] == 'X'){
-                for (j = 0; j < 7; j++){
-                    buf[++i] = (*g)(f);
-                    if (!nkf_isxdigit(buf[i])){
-                        if (buf[i] != ';'){
-                            c = -1;
-                        }
-                        break;
-                    }
-                    c <<= 4;
-                    c |= hex2bin(buf[i]);
-                }
-            }else{
-                for (j = 0; j < 8; j++){
-                    if (j){
-                        buf[++i] = (*g)(f);
-                    }
-                    if (!nkf_isdigit(buf[i])){
-                        if (buf[i] != ';'){
-                            c = -1;
-                        }
-                        break;
-                    }
-                    c *= 10;
-                    c += hex2bin(buf[i]);
-                }
-            }
-        }
-    }
-    if (c != -1){
-        return CLASS_UTF16 | c;
-    }
-    while (i > 0){
-        (*u)(buf[i], f);
-        --i;
-    }
-    return buf[0];
-}
-
-nkf_char numchar_ungetc(nkf_char c, FILE *f)
-{
-    return (*i_nungetc)(c, f);
-}
-#endif
-
-#ifdef UNICODE_NORMALIZATION
-
-/* Normalization Form C */
-nkf_char nfc_getc(FILE *f)
-{
-    nkf_char (*g)(FILE *f) = i_nfc_getc;
-    nkf_char (*u)(nkf_char c ,FILE *f) = i_nfc_ungetc;
-    int i=0, j, k=1, lower, upper;
-    nkf_char buf[9];
-    const nkf_nfchar *array;
-#if 0
-    extern const struct normalization_pair normalization_table[];
-#endif
-    
-    buf[i] = (*g)(f);
-    while (k > 0 && ((buf[i] & 0xc0) != 0x80)){
-	lower=0, upper=NORMALIZATION_TABLE_LENGTH-1;
-	while (upper >= lower) {
-	    j = (lower+upper) / 2;
-	    array = normalization_table[j].nfd;
-	    for (k=0; k < NORMALIZATION_TABLE_NFD_LENGTH && array[k]; k++){
-		if (array[k] != buf[k]){
-		    array[k] < buf[k] ? (lower = j + 1) : (upper = j - 1);
-		    k = 0;
-		    break;
-		} else if (k >= i)
-		    buf[++i] = (*g)(f);
-	    }
-	    if (k > 0){
-		array = normalization_table[j].nfc;
-		for (i=0; i < NORMALIZATION_TABLE_NFC_LENGTH && array[i]; i++)
-		    buf[i] = (nkf_char)(array[i]);
-		i--;
-		break;
-	    }
-	}
-	while (i > 0)
-	    (*u)(buf[i--], f);
-    }
-    return buf[0];
-}
-
-nkf_char nfc_ungetc(nkf_char c, FILE *f)
-{
-    return (*i_nfc_ungetc)(c, f);
-}
-#endif /* UNICODE_NORMALIZATION */
-
-
-nkf_char 
-mime_getc(FILE *f)
-{
-    nkf_char c1, c2, c3, c4, cc;
-    nkf_char t1, t2, t3, t4, mode, exit_mode;
-    nkf_char lwsp_count;
-    char *lwsp_buf;
-    char *lwsp_buf_new;
-    nkf_char lwsp_size = 128;
-
-    if (mime_top != mime_last) {  /* Something is in FIFO */
-        return  Fifo(mime_top++);
-    }
-    if (mime_decode_mode==1 ||mime_decode_mode==FALSE) {
-	mime_decode_mode=FALSE;
-	unswitch_mime_getc();
-	return (*i_getc)(f);
-    }
-
-    if (mimebuf_f == FIXED_MIME)
-        exit_mode = mime_decode_mode;
-    else
-        exit_mode = FALSE;
-    if (mime_decode_mode == 'Q') {
-        if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
-restart_mime_q:
-        if (c1=='_' && mimebuf_f != FIXED_MIME) return ' ';
-	if (c1<=' ' || DEL<=c1) {
-	    mime_decode_mode = exit_mode; /* prepare for quit */
-	    return c1;
-	}
-        if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) {
-	    return c1;
-	}
-                
-        mime_decode_mode = exit_mode; /* prepare for quit */
-        if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF);
-        if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) {
-            /* end Q encoding */
-            input_mode = exit_mode;
-	    lwsp_count = 0;
-	    lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
-	    if (lwsp_buf==NULL) {
-		perror("can't malloc");
-		return -1;
-	    }
-	    while ((c1=(*i_getc)(f))!=EOF) {
-		switch (c1) {
-		case NL:
-		case CR:
-		    if (c1==NL) {
-			if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
-			    i_ungetc(SPACE,f);
-			    continue;
-			} else {
-			    i_ungetc(c1,f);
-			}
-			c1 = NL;
-		    } else {
-			if ((c1=(*i_getc)(f))!=EOF && c1 == NL) {
-			    if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
-				i_ungetc(SPACE,f);
-				continue;
-			    } else {
-				i_ungetc(c1,f);
-			    }
-			    i_ungetc(NL,f);
-			} else {
-			    i_ungetc(c1,f);
-			}
-			c1 = CR;
-		    }
-		    break;
-		case SPACE:
-		case TAB:
-		    lwsp_buf[lwsp_count] = (unsigned char)c1;
-		    if (lwsp_count++>lwsp_size){
-			lwsp_size <<= 1;
-			lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
-			if (lwsp_buf_new==NULL) {
-			    free(lwsp_buf);
-			    perror("can't realloc");
-			    return -1;
-			}
-			lwsp_buf = lwsp_buf_new;
-		    }
-		    continue;
-		}
-		break;
-	    }
-	    if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) {
-		i_ungetc(c1,f);
-		for(lwsp_count--;lwsp_count>0;lwsp_count--)
-		    i_ungetc(lwsp_buf[lwsp_count],f);
-		c1 = lwsp_buf[0];
-	    }
-	    free(lwsp_buf);
-            return c1;
-        }
-        if (c1=='='&&c2<' ') { /* this is soft wrap */
-            while((c1 =  (*i_mgetc)(f)) <=' ') {
-		if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
-	    }
-            mime_decode_mode = 'Q'; /* still in MIME */
-	    goto restart_mime_q;
-	}
-        if (c1=='?') {
-            mime_decode_mode = 'Q'; /* still in MIME */
-            (*i_mungetc)(c2,f);
-            return c1;
-        }
-        if ((c3 = (*i_mgetc)(f)) == EOF) return (EOF);
-        if (c2<=' ') return c2;
-        mime_decode_mode = 'Q'; /* still in MIME */
-        return ((hex2bin(c2)<<4) + hex2bin(c3));
-    }
-
-    if (mime_decode_mode != 'B') {
-        mime_decode_mode = FALSE;
-        return (*i_mgetc)(f);
-    }
-
-
-    /* Base64 encoding */
-    /* 
-        MIME allows line break in the middle of 
-        Base64, but we are very pessimistic in decoding
-        in unbuf mode because MIME encoded code may broken by 
-        less or editor's control sequence (such as ESC-[-K in unbuffered
-        mode. ignore incomplete MIME.
-    */
-    mode = mime_decode_mode;
-    mime_decode_mode = exit_mode;  /* prepare for quit */
-
-    while ((c1 = (*i_mgetc)(f))<=' ') {
-        if (c1==EOF)
-            return (EOF);
-    }
-mime_c2_retry:
-    if ((c2 = (*i_mgetc)(f))<=' ') {
-        if (c2==EOF)
-            return (EOF);
-	if (mime_f != STRICT_MIME) goto mime_c2_retry;
-        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
-        return c2;
-    }
-    if ((c1 == '?') && (c2 == '=')) {
-        input_mode = ASCII;
-	lwsp_count = 0;
-	lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
-	if (lwsp_buf==NULL) {
-	    perror("can't malloc");
-	    return -1;
-	}
-	while ((c1=(*i_getc)(f))!=EOF) {
-	    switch (c1) {
-	    case NL:
-	    case CR:
-		if (c1==NL) {
-		    if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
-			i_ungetc(SPACE,f);
-			continue;
-		    } else {
-			i_ungetc(c1,f);
-		    }
-		    c1 = NL;
-		} else {
-		    if ((c1=(*i_getc)(f))!=EOF) {
-			if (c1==SPACE) {
-			    i_ungetc(SPACE,f);
-			    continue;
-			} else if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
-			    i_ungetc(SPACE,f);
-			    continue;
-			} else {
-			    i_ungetc(c1,f);
-			}
-			i_ungetc(NL,f);
-		    } else {
-			i_ungetc(c1,f);
-		    }
-		    c1 = CR;
-		}
-		break;
-	    case SPACE:
-	    case TAB:
-		lwsp_buf[lwsp_count] = (unsigned char)c1;
-		if (lwsp_count++>lwsp_size){
-		    lwsp_size <<= 1;
-		    lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
-		    if (lwsp_buf_new==NULL) {
-			free(lwsp_buf);
-			perror("can't realloc");
-			return -1;
-		    }
-		    lwsp_buf = lwsp_buf_new;
-		}
-		continue;
-	    }
-	    break;
-	}
-	if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) {
-	    i_ungetc(c1,f);
-	    for(lwsp_count--;lwsp_count>0;lwsp_count--)
-		i_ungetc(lwsp_buf[lwsp_count],f);
-	    c1 = lwsp_buf[0];
-	}
-	free(lwsp_buf);
-        return c1;
-    }
-mime_c3_retry:
-    if ((c3 = (*i_mgetc)(f))<=' ') {
-        if (c3==EOF)
-            return (EOF);
-	if (mime_f != STRICT_MIME) goto mime_c3_retry;
-        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
-        return c3;
-    }
-mime_c4_retry:
-    if ((c4 = (*i_mgetc)(f))<=' ') {
-        if (c4==EOF)
-            return (EOF);
-	if (mime_f != STRICT_MIME) goto mime_c4_retry;
-        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
-        return c4;
-    }
-
-    mime_decode_mode = mode; /* still in MIME sigh... */
-
-    /* BASE 64 decoding */
-
-    t1 = 0x3f & base64decode(c1);
-    t2 = 0x3f & base64decode(c2);
-    t3 = 0x3f & base64decode(c3);
-    t4 = 0x3f & base64decode(c4);
-    cc = ((t1 << 2) & 0x0fc) | ((t2 >> 4) & 0x03);
-    if (c2 != '=') {
-        Fifo(mime_last++) = (unsigned char)cc;
-        cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
-        if (c3 != '=') {
-            Fifo(mime_last++) = (unsigned char)cc;
-            cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
-            if (c4 != '=') 
-                Fifo(mime_last++) = (unsigned char)cc;
-        }
-    } else {
-        return c1;
-    }
-    return  Fifo(mime_top++);
-}
-
-nkf_char mime_ungetc(nkf_char c, FILE *f)
-{
-    Fifo(--mime_top) = (unsigned char)c;
-    return c;
-}
-
-nkf_char mime_integrity(FILE *f, const unsigned char *p)
-{
-    nkf_char c,d;
-    unsigned int q;
-    /* In buffered mode, read until =? or NL or buffer full
-     */
-    mime_input = mime_top;
-    mime_last = mime_top;
-    
-    while(*p) Fifo(mime_input++) = *p++;
-    d = 0;
-    q = mime_input;
-    while((c=(*i_getc)(f))!=EOF) {
-        if (((mime_input-mime_top)&MIME_BUF_MASK)==0) {
-	    break;   /* buffer full */
-	}
-        if (c=='=' && d=='?') {
-            /* checked. skip header, start decode */
-            Fifo(mime_input++) = (unsigned char)c;
-            /* mime_last_input = mime_input; */
-            mime_input = q; 
-	    switch_mime_getc();
-            return 1;
-        }
-        if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c))))
-            break;
-        /* Should we check length mod 4? */
-        Fifo(mime_input++) = (unsigned char)c;
-        d=c;
-    }
-    /* In case of Incomplete MIME, no MIME decode  */
-    Fifo(mime_input++) = (unsigned char)c;
-    mime_last = mime_input;     /* point undecoded buffer */
-    mime_decode_mode = 1;              /* no decode on Fifo last in mime_getc */
-    switch_mime_getc();         /* anyway we need buffered getc */
-    return 1;
-}
-
-nkf_char base64decode(nkf_char c)
-{
-    int             i;
-    if (c > '@') {
-        if (c < '[') {
-            i = c - 'A';                        /* A..Z 0-25 */
-        } else {
-            i = c - 'G'     /* - 'a' + 26 */ ;  /* a..z 26-51 */
-	}
-    } else if (c > '/') {
-        i = c - '0' + '4'   /* - '0' + 52 */ ;  /* 0..9 52-61 */
-    } else if (c == '+') {
-        i = '>'             /* 62 */ ;          /* +  62 */
-    } else {
-        i = '?'             /* 63 */ ;          /* / 63 */
-    }
-    return (i);
-}
-
-static const char basis_64[] =
-   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static nkf_char b64c;
-#define MIMEOUT_BUF_LENGTH (60)
-char mimeout_buf[MIMEOUT_BUF_LENGTH+1];
-int mimeout_buf_count = 0;
-int mimeout_preserve_space = 0;
-#define itoh4(c)   (c>=10?c+'A'-10:c+'0')
-
-void open_mime(nkf_char mode)
-{
-    const unsigned char *p;
-    int i;
-    int j;
-    p  = mime_pattern[0];
-    for(i=0;mime_encode[i];i++) {
-	if (mode == mime_encode[i]) {
-	    p = mime_pattern[i];
-	    break;
-	}
-    }
-    mimeout_mode = mime_encode_method[i];
-    
-    i = 0;
-    if (base64_count>45) {
-	if (mimeout_buf_count>0 && nkf_isblank(mimeout_buf[i])){
-            (*o_mputc)(mimeout_buf[i]);
-	    i++;
-	}
-	(*o_mputc)(NL);
-	(*o_mputc)(SPACE);
-	base64_count = 1;
-	if (!mimeout_preserve_space && mimeout_buf_count>0
-	    && (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB
-	    	|| mimeout_buf[i]==CR || mimeout_buf[i]==NL )) {
-	    i++;
-	}
-    }
-    if (!mimeout_preserve_space) {
-	for (;i<mimeout_buf_count;i++) {
-	    if (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB
-		|| mimeout_buf[i]==CR || mimeout_buf[i]==NL ) {
-		(*o_mputc)(mimeout_buf[i]);
-		base64_count ++;
-	    } else {
-		break;
-	    }
-	}
-    }
-    mimeout_preserve_space = FALSE;
-    
-    while(*p) {
-        (*o_mputc)(*p++);
-        base64_count ++;
-    }
-    j = mimeout_buf_count;
-    mimeout_buf_count = 0;
-    for (;i<j;i++) {
-	mime_putc(mimeout_buf[i]);
-    }
-}
-
-void close_mime(void)
-{
-    (*o_mputc)('?');
-    (*o_mputc)('=');
-    base64_count += 2;
-    mimeout_mode = 0;
-}
-
-void eof_mime(void)
-{
-    switch(mimeout_mode) {
-    case 'Q':
-    case 'B':
-	break;
-    case 2:
-	(*o_mputc)(basis_64[((b64c & 0x3)<< 4)]);
-	(*o_mputc)('=');
-	(*o_mputc)('=');
-	base64_count += 3;
-	break;
-    case 1:
-	(*o_mputc)(basis_64[((b64c & 0xF) << 2)]);
-	(*o_mputc)('=');
-	base64_count += 2;
-	break;
-    }
-    if (mimeout_mode) {
-	if (mimeout_f!=FIXED_MIME) {
-	    close_mime(); 
-	} else if (mimeout_mode != 'Q')
-	    mimeout_mode = 'B';
-    }
-}
-
-void mimeout_addchar(nkf_char c)
-{
-    switch(mimeout_mode) {
-    case 'Q':
-	if (c==CR||c==NL) {
-	    (*o_mputc)(c);
-	    base64_count = 0;
-	} else if(!nkf_isalnum(c)) {
-	    (*o_mputc)('=');
-	    (*o_mputc)(itoh4(((c>>4)&0xf)));
-	    (*o_mputc)(itoh4((c&0xf)));
-	    base64_count += 3;
-	} else {
-	    (*o_mputc)(c);
-	    base64_count++;
-	}
-        break;
-    case 'B':
-        b64c=c;
-        (*o_mputc)(basis_64[c>>2]);
-        mimeout_mode=2;
-        base64_count ++;
-        break;
-    case 2:
-        (*o_mputc)(basis_64[((b64c & 0x3)<< 4) | ((c & 0xF0) >> 4)]);
-        b64c=c;
-        mimeout_mode=1;
-        base64_count ++;
-        break;
-    case 1:
-        (*o_mputc)(basis_64[((b64c & 0xF) << 2) | ((c & 0xC0) >>6)]);
-        (*o_mputc)(basis_64[c & 0x3F]);
-        mimeout_mode='B';
-        base64_count += 2;
-        break;
-    default:
-	(*o_mputc)(c);
-	base64_count++;
-        break;
-    }
-}
-
-nkf_char mime_lastchar2, mime_lastchar1;
-
-void mime_prechar(nkf_char c2, nkf_char c1)
-{
-    if (mimeout_mode){
-        if (c2){
-            if (base64_count + mimeout_buf_count/3*4> 66){
-                (*o_base64conv)(EOF,0);
-                (*o_base64conv)(0,NL);
-                (*o_base64conv)(0,SPACE);
-            }
-        }/*else if (mime_lastchar2){
-            if (c1 <=DEL && !nkf_isspace(c1)){
-                (*o_base64conv)(0,SPACE);
-            }
-        }*/
-    }/*else{
-        if (c2 && mime_lastchar2 == 0
-            && mime_lastchar1 && !nkf_isspace(mime_lastchar1)){
-            (*o_base64conv)(0,SPACE);
-        }
-    }*/
-    mime_lastchar2 = c2;
-    mime_lastchar1 = c1;
-}
-
-void mime_putc(nkf_char c)
-{
-    int i, j;
-    nkf_char lastchar;
-
-    if (mimeout_f == FIXED_MIME){
-        if (mimeout_mode == 'Q'){
-            if (base64_count > 71){
-                if (c!=CR && c!=NL) {
-                    (*o_mputc)('=');
-                    (*o_mputc)(NL);
-                }
-                base64_count = 0;
-            }
-        }else{
-            if (base64_count > 71){
-                eof_mime();
-                (*o_mputc)(NL);
-                base64_count = 0;
-            }
-            if (c == EOF) { /* c==EOF */
-                eof_mime();
-            }
-        }
-        if (c != EOF) { /* c==EOF */
-            mimeout_addchar(c);
-        }
-        return;
-    }
-    
-    /* mimeout_f != FIXED_MIME */
-
-    if (c == EOF) { /* c==EOF */
-	j = mimeout_buf_count;
-	mimeout_buf_count = 0;
-	i = 0;
-	if (mimeout_mode) {
-	    for (;i<j;i++) {
-		if (nkf_isspace(mimeout_buf[i]) && base64_count < 71){
-		    break;
-		}
-		mimeout_addchar(mimeout_buf[i]);
-	    }
-	    eof_mime();
-	    for (;i<j;i++) {
-		mimeout_addchar(mimeout_buf[i]);
-	    }
-	} else {
-	    for (;i<j;i++) {
-		mimeout_addchar(mimeout_buf[i]);
-	    }
-	}
-        return;
-    }
-
-    if (mimeout_mode=='Q') {
-        if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
-            if (c <= SPACE) {
-                close_mime();
-                (*o_mputc)(SPACE);
-                base64_count++;
-            }
-            (*o_mputc)(c);
-            base64_count++;
-        }
-        return;
-    }
-
-    if (mimeout_buf_count > 0){
-        lastchar = mimeout_buf[mimeout_buf_count - 1];
-    }else{
-        lastchar = -1;
-    }
-
-    if (!mimeout_mode) {
-        if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1)) {
-            if (nkf_isspace(c)) {
-                if (c==CR || c==NL) {
-                    base64_count=0;
-                }
-                for (i=0;i<mimeout_buf_count;i++) {
-                    (*o_mputc)(mimeout_buf[i]);
-                    if (mimeout_buf[i] == CR || mimeout_buf[i] == NL){
-                        base64_count = 0;
-                    }else{
-                        base64_count++;
-                    }
-                }
-                mimeout_buf[0] = (char)c;
-                mimeout_buf_count = 1;
-            }else{
-                if (base64_count > 1
-                    && base64_count + mimeout_buf_count > 76){
-                    (*o_mputc)(NL);
-                    base64_count = 0;
-                    if (!nkf_isspace(mimeout_buf[0])){
-                        (*o_mputc)(SPACE);
-                        base64_count++;
-                    }
-                }
-                mimeout_buf[mimeout_buf_count++] = (char)c;
-                if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
-                    open_mime(output_mode);
-                }
-            }
-            return;
-        }else{
-            if (lastchar==CR || lastchar == NL){
-                for (i=0;i<mimeout_buf_count;i++) {
-                    (*o_mputc)(mimeout_buf[i]);
-                }
-                base64_count = 0;
-                mimeout_buf_count = 0;
-            }
-            if (lastchar==SPACE) {
-                for (i=0;i<mimeout_buf_count-1;i++) {
-                    (*o_mputc)(mimeout_buf[i]);
-                    base64_count++;
-                }
-                mimeout_buf[0] = SPACE;
-                mimeout_buf_count = 1;
-            }
-            open_mime(output_mode);
-        }
-    }else{
-        /* mimeout_mode == 'B', 1, 2 */
-        if ( c<=DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
-            if (lastchar == CR || lastchar == NL){
-                if (nkf_isblank(c)) {
-                    for (i=0;i<mimeout_buf_count;i++) {
-                        mimeout_addchar(mimeout_buf[i]);
-                    }
-                    mimeout_buf_count = 0;
-                } else if (SPACE<c && c<DEL) {
-                    eof_mime();
-                    for (i=0;i<mimeout_buf_count;i++) {
-                        (*o_mputc)(mimeout_buf[i]);
-                    }
-                    base64_count = 0;
-                    mimeout_buf_count = 0;
-                }
-            }
-            if (c==SPACE || c==TAB || c==CR || c==NL) {
-                for (i=0;i<mimeout_buf_count;i++) {
-                    if (SPACE<mimeout_buf[i] && mimeout_buf[i]<DEL) {
-                        eof_mime();
-                        for (i=0;i<mimeout_buf_count;i++) {
-                            (*o_mputc)(mimeout_buf[i]);
-                            base64_count++;
-                        }
-                        mimeout_buf_count = 0;
-                    }
-                }
-                mimeout_buf[mimeout_buf_count++] = (char)c;
-                if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
-                    eof_mime();
-                    for (i=0;i<mimeout_buf_count;i++) {
-                        (*o_mputc)(mimeout_buf[i]);
-                        base64_count++;
-                    }
-                    mimeout_buf_count = 0;
-                }
-                return;
-            }
-            if (mimeout_buf_count>0 && SPACE<c && c!='=') {
-                mimeout_buf[mimeout_buf_count++] = (char)c;
-                if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
-                    j = mimeout_buf_count;
-                    mimeout_buf_count = 0;
-                    for (i=0;i<j;i++) {
-                        mimeout_addchar(mimeout_buf[i]);
-                    }
-                }
-                return;
-            }
-        }
-    }
-    if (mimeout_buf_count>0) {
-	j = mimeout_buf_count;
-	mimeout_buf_count = 0;
-	for (i=0;i<j;i++) {
-	    if (mimeout_buf[i]==CR || mimeout_buf[i]==NL)
-		break;
-	    mimeout_addchar(mimeout_buf[i]);
-	}
-	if (i<j) {
-	    eof_mime();
-	    base64_count=0;
-	    for (;i<j;i++) {
-		(*o_mputc)(mimeout_buf[i]);
-	    }
-	    open_mime(output_mode);
-	}
-    }
-    mimeout_addchar(c);
-}
-
-
-#if defined(PERL_XS) || defined(WIN32DLL)
-void reinit(void)
-{
-    {
-        struct input_code *p = input_code_list;
-        while (p->name){
-            status_reinit(p++);
-        }
-    }
-    unbuf_f = FALSE;
-    estab_f = FALSE;
-    nop_f = FALSE;
-    binmode_f = TRUE;
-    rot_f = FALSE;
-    hira_f = FALSE;
-    input_f = FALSE;
-    alpha_f = FALSE;
-    mime_f = STRICT_MIME;
-    mime_decode_f = FALSE;
-    mimebuf_f = FALSE;
-    broken_f = FALSE;
-    iso8859_f = FALSE;
-    mimeout_f = FALSE;
-#if defined(MSDOS) || defined(__OS2__)
-     x0201_f = TRUE;
-#else
-     x0201_f = NO_X0201;
-#endif
-    iso2022jp_f = FALSE;
-#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
-    ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-#ifdef UTF8_INPUT_ENABLE
-    no_cp932ext_f = FALSE;
-    ignore_zwnbsp_f = TRUE;
-    no_best_fit_chars_f = FALSE;
-    encode_fallback = NULL;
-    unicode_subchar  = '?';
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-    unicode_bom_f = 0;
-    w_oconv16_LE = 0;
-#endif
-#ifdef UNICODE_NORMALIZATION
-    nfc_f = FALSE;
-#endif
-#ifdef INPUT_OPTION
-    cap_f = FALSE;
-    url_f = FALSE;
-    numchar_f = FALSE;
-#endif
-#ifdef CHECK_OPTION
-    noout_f = FALSE;
-    debug_f = FALSE;
-#endif
-    guess_f = FALSE;
-    is_inputcode_mixed = FALSE;
-    is_inputcode_set   = FALSE;
-#ifdef EXEC_IO
-    exec_f = 0;
-#endif
-#ifdef SHIFTJIS_CP932
-    cp51932_f = TRUE;
-    cp932inv_f = TRUE;
-#endif
-#ifdef X0212_ENABLE
-    x0212_f = FALSE;
-    x0213_f = FALSE;
-#endif
-    {
-        int i;
-        for (i = 0; i < 256; i++){
-            prefix_table[i] = 0;
-        }
-    }
-#ifdef UTF8_INPUT_ENABLE
-    utf16_mode = UTF16BE_INPUT;
-#endif
-    mimeout_buf_count = 0;
-    mimeout_mode = 0;
-    base64_count = 0;
-    f_line = 0;
-    f_prev = 0;
-    fold_preserve_f = FALSE;
-    fold_f = FALSE;
-    fold_len = 0;
-    kanji_intro = DEFAULT_J;
-    ascii_intro = DEFAULT_R;
-    fold_margin  = FOLD_MARGIN;
-    output_conv = DEFAULT_CONV;
-    oconv = DEFAULT_CONV;
-    o_zconv = no_connection;
-    o_fconv = no_connection;
-    o_crconv = no_connection;
-    o_rot_conv = no_connection;
-    o_hira_conv = no_connection;
-    o_base64conv = no_connection;
-    o_iso2022jp_check_conv = no_connection;
-    o_putc = std_putc;
-    i_getc = std_getc;
-    i_ungetc = std_ungetc;
-    i_bgetc = std_getc;
-    i_bungetc = std_ungetc;
-    o_mputc = std_putc;
-    i_mgetc = std_getc;
-    i_mungetc  = std_ungetc;
-    i_mgetc_buf = std_getc;
-    i_mungetc_buf = std_ungetc;
-    output_mode = ASCII;
-    input_mode =  ASCII;
-    shift_mode =  FALSE;
-    mime_decode_mode = FALSE;
-    file_out_f = FALSE;
-    crmode_f = 0;
-    option_mode = 0;
-    broken_counter = 0;
-    broken_last = 0;
-    z_prev2=0,z_prev1=0;
-#ifdef CHECK_OPTION
-    iconv_for_check = 0;
-#endif
-    input_codename = "";
-#ifdef WIN32DLL
-    reinitdll();
-#endif /*WIN32DLL*/
-}
-#endif
-
-void no_connection(nkf_char c2, nkf_char c1)
-{
-    no_connection2(c2,c1,0);
-}
-
-nkf_char no_connection2(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    fprintf(stderr,"nkf internal module connection failure.\n");
-    exit(1);
-    return 0; /* LINT */
-}
-
-#ifndef PERL_XS
-#ifdef WIN32DLL
-#define fprintf dllprintf
-#endif
-void usage(void)
-{
-    fprintf(stderr,"USAGE:  nkf(nkf32,wnkf,nkf2) -[flags] [in file] .. [out file for -O flag]\n");
-    fprintf(stderr,"Flags:\n");
-    fprintf(stderr,"b,u      Output is buffered (DEFAULT),Output is unbuffered\n");
-#ifdef DEFAULT_CODE_SJIS
-    fprintf(stderr,"j,s,e,w  Outout code is JIS 7 bit, Shift_JIS (DEFAULT), EUC-JP, UTF-8N\n");
-#endif
-#ifdef DEFAULT_CODE_JIS
-    fprintf(stderr,"j,s,e,w  Outout code is JIS 7 bit (DEFAULT), Shift JIS, EUC-JP, UTF-8N\n");
-#endif
-#ifdef DEFAULT_CODE_EUC
-    fprintf(stderr,"j,s,e,w  Outout code is JIS 7 bit, Shift JIS, EUC-JP (DEFAULT), UTF-8N\n");
-#endif
-#ifdef DEFAULT_CODE_UTF8
-    fprintf(stderr,"j,s,e,w  Outout code is JIS 7 bit, Shift JIS, EUC-JP, UTF-8N (DEFAULT)\n");
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-    fprintf(stderr,"         After 'w' you can add more options. -w[ 8 [0], 16 [[BL] [0]] ]\n");
-#endif
-    fprintf(stderr,"J,S,E,W  Input assumption is JIS 7 bit , Shift JIS, EUC-JP, UTF-8\n");
-#ifdef UTF8_INPUT_ENABLE
-    fprintf(stderr,"         After 'W' you can add more options. -W[ 8, 16 [BL] ] \n");
-#endif
-    fprintf(stderr,"t        no conversion\n");
-    fprintf(stderr,"i[@B]    Specify the Esc Seq for JIS X 0208-1978/83 (DEFAULT B)\n");
-    fprintf(stderr,"o[BJH]   Specify the Esc Seq for ASCII/Roman        (DEFAULT B)\n");
-    fprintf(stderr,"r        {de/en}crypt ROT13/47\n");
-    fprintf(stderr,"h        1 katakana->hiragana, 2 hiragana->katakana, 3 both\n");
-    fprintf(stderr,"v        Show this usage. V: show version\n");
-    fprintf(stderr,"m[BQN0]  MIME decode [B:base64,Q:quoted,N:non-strict,0:no decode]\n");
-    fprintf(stderr,"M[BQ]    MIME encode [B:base64 Q:quoted]\n");
-    fprintf(stderr,"l        ISO8859-1 (Latin-1) support\n");
-    fprintf(stderr,"f/F      Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n");
-    fprintf(stderr,"Z[0-3]   Convert X0208 alphabet to ASCII\n");
-    fprintf(stderr,"         1: Kankaku to 1 space  2: to 2 spaces  3: Convert to HTML Entity\n");
-    fprintf(stderr,"X,x      Assume X0201 kana in MS-Kanji, -x preserves X0201\n");
-    fprintf(stderr,"B[0-2]   Broken input  0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n");
-#ifdef MSDOS
-    fprintf(stderr,"T        Text mode output\n");
-#endif
-    fprintf(stderr,"O        Output to File (DEFAULT 'nkf.out')\n");
-    fprintf(stderr,"I        Convert non ISO-2022-JP charactor to GETA\n");
-    fprintf(stderr,"d,c      Convert line breaks  -d: LF  -c: CRLF\n");
-    fprintf(stderr,"-L[uwm]  line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n");
-    fprintf(stderr,"\n");
-    fprintf(stderr,"Long name options\n");
-    fprintf(stderr," --ic=<input codeset>  --oc=<output codeset>\n");
-    fprintf(stderr,"                   Specify the input or output codeset\n");
-    fprintf(stderr," --fj  --unix --mac  --windows\n");
-    fprintf(stderr," --jis  --euc  --sjis  --utf8  --utf16  --mime  --base64\n");
-    fprintf(stderr,"                   Convert for the system or code\n");
-    fprintf(stderr," --hiragana  --katakana  --katakana-hiragana\n");
-    fprintf(stderr,"                   To Hiragana/Katakana Conversion\n");
-    fprintf(stderr," --prefix=         Insert escape before troublesome characters of Shift_JIS\n");
-#ifdef INPUT_OPTION
-    fprintf(stderr," --cap-input, --url-input  Convert hex after ':' or '%%'\n");
-#endif
-#ifdef NUMCHAR_OPTION
-    fprintf(stderr," --numchar-input   Convert Unicode Character Reference\n");
-#endif
-#ifdef UTF8_INPUT_ENABLE
-    fprintf(stderr," --fb-{skip, html, xml, perl, java, subchar}\n");
-    fprintf(stderr,"                   Specify how nkf handles unassigned characters\n");
-#endif
-#ifdef OVERWRITE
-    fprintf(stderr," --in-place[=SUFFIX]  --overwrite[=SUFFIX]\n");
-    fprintf(stderr,"                   Overwrite original listed files by filtered result\n");
-    fprintf(stderr,"                   --overwrite preserves timestamp of original files\n");
-#endif
-    fprintf(stderr," -g  --guess       Guess the input code\n");
-    fprintf(stderr," --help  --version Show this help/the version\n");
-    fprintf(stderr,"                   For more information, see also man nkf\n");
-    fprintf(stderr,"\n");
-    version();
-}
-
-void version(void)
-{
-    fprintf(stderr,"Network Kanji Filter Version %s (%s) "
-#if defined(MSDOS) && !defined(__WIN32__) && !defined(__WIN16__) && !defined(__OS2__)
-                  "for DOS"
-#endif
-#if defined(MSDOS) && defined(__WIN16__)
-                  "for Win16"
-#endif
-#if defined(MSDOS) && defined(__WIN32__)
-                  "for Win32"
-#endif
-#ifdef __OS2__
-                  "for OS/2"
-#endif
-                  ,NKF_VERSION,NKF_RELEASE_DATE);
-    fprintf(stderr,"\n%s\n",CopyRight);
-}
-#endif /*PERL_XS*/
-
-/**
- ** $B%Q%C%A@):n<T(B
- **  void@merope.pleiades.or.jp (Kusakabe Youichi)
- **  NIDE Naoyuki <nide@ics.nara-wu.ac.jp>
- **  ohta@src.ricoh.co.jp (Junn Ohta)
- **  inouet@strl.nhk.or.jp (Tomoyuki Inoue)
- **  kiri@pulser.win.or.jp (Tetsuaki Kiriyama)
- **  Kimihiko Sato <sato@sail.t.u-tokyo.ac.jp>
- **  a_kuroe@kuroe.aoba.yokohama.jp (Akihiko Kuroe)
- **  kono@ie.u-ryukyu.ac.jp (Shinji Kono)
- **  GHG00637@nifty-serve.or.jp (COW)
- **
- **/
-
-/* end */
diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
deleted file mode 100644
index 9e59956a0a..0000000000
--- a/ext/nkf/nkf-utf8/utf8tbl.c
+++ /dev/null
@@ -1,8500 +0,0 @@
-#include "config.h"
-
-#ifdef UTF8_OUTPUT_ENABLE
-const unsigned short euc_to_utf8_A1[] = {
-         0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A,
- 0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8,
- 0xFF3E, 0x203E, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003,
- 0x4EDD, 0x3005, 0x3006, 0x3007, 0x30FC, 0x2014, 0x2010, 0xFF0F,
- 0xFF3C, 0x301C, 0x2016, 0xFF5C, 0x2026, 0x2025, 0x2018, 0x2019,
- 0x201C, 0x201D, 0xFF08, 0xFF09, 0x3014, 0x3015, 0xFF3B, 0xFF3D,
- 0xFF5B, 0xFF5D, 0x3008, 0x3009, 0x300A, 0x300B, 0x300C, 0x300D,
- 0x300E, 0x300F, 0x3010, 0x3011, 0xFF0B, 0x2212, 0x00B1, 0x00D7,
- 0x00F7, 0xFF1D, 0x2260, 0xFF1C, 0xFF1E, 0x2266, 0x2267, 0x221E,
- 0x2234, 0x2642, 0x2640, 0x00B0, 0x2032, 0x2033, 0x2103, 0x00A5,
- 0xFF04, 0x00A2, 0x00A3, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20,
- 0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7,
-};
-
-/* Microsoft UCS Mapping Compatible */
-const unsigned short euc_to_utf8_A1_ms[] = {
-         0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A,
- 0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8,
- 0xFF3E, 0xFFE3, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003,
- 0x4EDD, 0x3005, 0x3006, 0x3007, 0x30FC, 0x2015, 0x2010, 0xFF0F,
- 0xFF3C, 0xFF5E, 0x2225, 0xFF5C, 0x2026, 0x2025, 0x2018, 0x2019,
- 0x201C, 0x201D, 0xFF08, 0xFF09, 0x3014, 0x3015, 0xFF3B, 0xFF3D,
- 0xFF5B, 0xFF5D, 0x3008, 0x3009, 0x300A, 0x300B, 0x300C, 0x300D,
- 0x300E, 0x300F, 0x3010, 0x3011, 0xFF0B, 0xFF0D, 0x00B1, 0x00D7,
- 0x00F7, 0xFF1D, 0x2260, 0xFF1C, 0xFF1E, 0x2266, 0x2267, 0x221E,
- 0x2234, 0x2642, 0x2640, 0x00B0, 0x2032, 0x2033, 0x2103, 0xFFE5,
- 0xFF04, 0xFFE0, 0xFFE1, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20,
- 0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7,
-};
-const unsigned short euc_to_utf8_A2[] = {
-         0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
- 0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283,
- 0x222A, 0x2229,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2227, 0x2228, 0x00AC, 0x21D2, 0x21D4, 0x2200,
- 0x2203,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2220, 0x22A5, 0x2312, 0x2202,
- 0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D,
- 0x2235, 0x222B, 0x222C,      0,      0,      0,      0,      0,
-      0,      0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
- 0x2021, 0x00B6,      0,      0,      0,      0, 0x25EF,
-};
-
-/* Microsoft UCS Mapping Compatible */
-const unsigned short euc_to_utf8_A2_ms[] = {
-         0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
- 0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283,
- 0x222A, 0x2229,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2227, 0x2228, 0xFFE2, 0x21D2, 0x21D4, 0x2200,
- 0x2203,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2220, 0x22A5, 0x2312, 0x2202,
- 0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D,
- 0x2235, 0x222B, 0x222C,      0,      0,      0,      0,      0,
-      0,      0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
- 0x2021, 0x00B6,      0,      0,      0,      0, 0x25EF,
-};
-const unsigned short euc_to_utf8_A3[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
- 0xFF18, 0xFF19,      0,      0,      0,      0,      0,      0,
-      0, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27,
- 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F,
- 0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37,
- 0xFF38, 0xFF39, 0xFF3A,      0,      0,      0,      0,      0,
-      0, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47,
- 0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F,
- 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
- 0xFF58, 0xFF59, 0xFF5A,      0,      0,      0,      0,
-};
-const unsigned short euc_to_utf8_A4[] = {
-         0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
- 0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
- 0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057,
- 0x3058, 0x3059, 0x305A, 0x305B, 0x305C, 0x305D, 0x305E, 0x305F,
- 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067,
- 0x3068, 0x3069, 0x306A, 0x306B, 0x306C, 0x306D, 0x306E, 0x306F,
- 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077,
- 0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F,
- 0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087,
- 0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F,
- 0x3090, 0x3091, 0x3092, 0x3093,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short euc_to_utf8_A5[] = {
-         0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7,
- 0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF,
- 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7,
- 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, 0x30BF,
- 0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7,
- 0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF,
- 0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7,
- 0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF,
- 0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7,
- 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 0x30EF,
- 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short euc_to_utf8_A6[] = {
-         0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
- 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
- 0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8,
- 0x03A9,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
- 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
- 0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
- 0x03C9,      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,
-};
-const unsigned short euc_to_utf8_A7[] = {
-         0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401,
- 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D,
- 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425,
- 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D,
- 0x042E, 0x042F,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451,
- 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D,
- 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445,
- 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D,
- 0x044E, 0x044F,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short euc_to_utf8_A8[] = {
-         0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C,
- 0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513,
- 0x251B, 0x2517, 0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520,
- 0x252F, 0x2528, 0x2537, 0x253F, 0x251D, 0x2530, 0x2525, 0x2538,
- 0x2542,      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,
-};
-const unsigned short euc_to_utf8_A9[] = {
-         0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
- 0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
- 0x246F, 0x2470, 0x2471, 0x2472, 0x2473,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x2474,
- 0x2475, 0x2476, 0x2477, 0x2478, 0x2479, 0x247A, 0x247B, 0x247C,
- 0x247D, 0x247E, 0x247F, 0x2480, 0x2481, 0x2482, 0x2483, 0x2484,
- 0x2485, 0x2486, 0x2487,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2776, 0x2777, 0x2778,
- 0x2779, 0x277A, 0x277B, 0x277C, 0x277D, 0x277E,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2488, 0x2489, 0x248A, 0x248B, 0x248C, 0x248D,
- 0x248E, 0x248F, 0x2490,      0,      0,      0,      0,
-};
-const unsigned short euc_to_utf8_AA[] = {
-         0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166,
- 0x2167, 0x2168, 0x2169, 0x216A, 0x216B,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2170, 0x2171, 0x2172,
- 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A,
- 0x217B,      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, 0x249C, 0x249D, 0x249E,
- 0x249F, 0x24A0, 0x24A1, 0x24A2, 0x24A3, 0x24A4, 0x24A5, 0x24A6,
- 0x24A7, 0x24A8, 0x24A9, 0x24AA, 0x24AB, 0x24AC, 0x24AD, 0x24AE,
- 0x24AF, 0x24B0, 0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short euc_to_utf8_AB[] = {
-         0x339C, 0x339F, 0x339D, 0x33A0, 0x33A4,      0, 0x33A1,
- 0x33A5, 0x339E, 0x33A2, 0x338E,      0, 0x338F, 0x33C4, 0x3396,
- 0x3397, 0x2113, 0x3398, 0x33B3, 0x33B2, 0x33B1, 0x33B0, 0x2109,
- 0x33D4, 0x33CB, 0x3390, 0x3385, 0x3386, 0x3387,      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, 0x2116, 0x33CD, 0x2121,      0,
-};
-const unsigned short euc_to_utf8_AC[] = {
-         0x2664, 0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665,
- 0x2666,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x3020, 0x260E, 0x3004,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x261E, 0x261C, 0x261D, 0x261F, 0x21C6, 0x21C4, 0x21C5,
-      0, 0x21E8, 0x21E6, 0x21E7, 0x21E9,      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,
-};
-const unsigned short euc_to_utf8_AD[] = {
-         0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
- 0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
- 0x246F, 0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162,
- 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169,      0,
- 0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336,
- 0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B,
- 0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x337B,
- 0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6,
- 0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E, 0x337D, 0x337C,
- 0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220,
- 0x221F, 0x22BF, 0x2235, 0x2229, 0x222A,      0, 0x3299,
-};
-const unsigned short euc_to_utf8_AE[] = {
-         0x3349, 0x3322, 0x334D, 0x3314, 0x3316, 0x3305, 0x3333,
- 0x334E, 0x3303, 0x3336, 0x3318, 0x3315, 0x3327, 0x3351, 0x334A,
- 0x3339, 0x3357, 0x330D, 0x3342, 0x3323, 0x3326, 0x333B, 0x332B,
-      0,      0,      0,      0,      0,      0,      0, 0x3300,
- 0x331E, 0x332A, 0x3331, 0x3347,      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, 0x337E,
- 0x337D, 0x337C, 0x337B,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x337F,      0,      0,
-};
-const unsigned short euc_to_utf8_AF[] = {
-         0x222E, 0x221F, 0x22BF,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x301D, 0x301F,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x3094,      0, 0x30F7, 0x30F8, 0x30F9, 0x30FA,      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,
-};
-const unsigned short euc_to_utf8_B0[] = {
-         0x4E9C, 0x5516, 0x5A03, 0x963F, 0x54C0, 0x611B, 0x6328,
- 0x59F6, 0x9022, 0x8475, 0x831C, 0x7A50, 0x60AA, 0x63E1, 0x6E25,
- 0x65ED, 0x8466, 0x82A6, 0x9BF5, 0x6893, 0x5727, 0x65A1, 0x6271,
- 0x5B9B, 0x59D0, 0x867B, 0x98F4, 0x7D62, 0x7DBE, 0x9B8E, 0x6216,
- 0x7C9F, 0x88B7, 0x5B89, 0x5EB5, 0x6309, 0x6697, 0x6848, 0x95C7,
- 0x978D, 0x674F, 0x4EE5, 0x4F0A, 0x4F4D, 0x4F9D, 0x5049, 0x56F2,
- 0x5937, 0x59D4, 0x5A01, 0x5C09, 0x60DF, 0x610F, 0x6170, 0x6613,
- 0x6905, 0x70BA, 0x754F, 0x7570, 0x79FB, 0x7DAD, 0x7DEF, 0x80C3,
- 0x840E, 0x8863, 0x8B02, 0x9055, 0x907A, 0x533B, 0x4E95, 0x4EA5,
- 0x57DF, 0x80B2, 0x90C1, 0x78EF, 0x4E00, 0x58F1, 0x6EA2, 0x9038,
- 0x7A32, 0x8328, 0x828B, 0x9C2F, 0x5141, 0x5370, 0x54BD, 0x54E1,
- 0x56E0, 0x59FB, 0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D,
-};
-const unsigned short euc_to_utf8_B1[] = {
-         0x9662, 0x9670, 0x96A0, 0x97FB, 0x540B, 0x53F3, 0x5B87,
- 0x70CF, 0x7FBD, 0x8FC2, 0x96E8, 0x536F, 0x9D5C, 0x7ABA, 0x4E11,
- 0x7893, 0x81FC, 0x6E26, 0x5618, 0x5504, 0x6B1D, 0x851A, 0x9C3B,
- 0x59E5, 0x53A9, 0x6D66, 0x74DC, 0x958F, 0x5642, 0x4E91, 0x904B,
- 0x96F2, 0x834F, 0x990C, 0x53E1, 0x55B6, 0x5B30, 0x5F71, 0x6620,
- 0x66F3, 0x6804, 0x6C38, 0x6CF3, 0x6D29, 0x745B, 0x76C8, 0x7A4E,
- 0x9834, 0x82F1, 0x885B, 0x8A60, 0x92ED, 0x6DB2, 0x75AB, 0x76CA,
- 0x99C5, 0x60A6, 0x8B01, 0x8D8A, 0x95B2, 0x698E, 0x53AD, 0x5186,
- 0x5712, 0x5830, 0x5944, 0x5BB4, 0x5EF6, 0x6028, 0x63A9, 0x63F4,
- 0x6CBF, 0x6F14, 0x708E, 0x7114, 0x7159, 0x71D5, 0x733F, 0x7E01,
- 0x8276, 0x82D1, 0x8597, 0x9060, 0x925B, 0x9D1B, 0x5869, 0x65BC,
- 0x6C5A, 0x7525, 0x51F9, 0x592E, 0x5965, 0x5F80, 0x5FDC,
-};
-const unsigned short euc_to_utf8_B2[] = {
-         0x62BC, 0x65FA, 0x6A2A, 0x6B27, 0x6BB4, 0x738B, 0x7FC1,
- 0x8956, 0x9D2C, 0x9D0E, 0x9EC4, 0x5CA1, 0x6C96, 0x837B, 0x5104,
- 0x5C4B, 0x61B6, 0x81C6, 0x6876, 0x7261, 0x4E59, 0x4FFA, 0x5378,
- 0x6069, 0x6E29, 0x7A4F, 0x97F3, 0x4E0B, 0x5316, 0x4EEE, 0x4F55,
- 0x4F3D, 0x4FA1, 0x4F73, 0x52A0, 0x53EF, 0x5609, 0x590F, 0x5AC1,
- 0x5BB6, 0x5BE1, 0x79D1, 0x6687, 0x679C, 0x67B6, 0x6B4C, 0x6CB3,
- 0x706B, 0x73C2, 0x798D, 0x79BE, 0x7A3C, 0x7B87, 0x82B1, 0x82DB,
- 0x8304, 0x8377, 0x83EF, 0x83D3, 0x8766, 0x8AB2, 0x5629, 0x8CA8,
- 0x8FE6, 0x904E, 0x971E, 0x868A, 0x4FC4, 0x5CE8, 0x6211, 0x7259,
- 0x753B, 0x81E5, 0x82BD, 0x86FE, 0x8CC0, 0x96C5, 0x9913, 0x99D5,
- 0x4ECB, 0x4F1A, 0x89E3, 0x56DE, 0x584A, 0x58CA, 0x5EFB, 0x5FEB,
- 0x602A, 0x6094, 0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539,
-};
-const unsigned short euc_to_utf8_B3[] = {
-         0x9B41, 0x6666, 0x68B0, 0x6D77, 0x7070, 0x754C, 0x7686,
- 0x7D75, 0x82A5, 0x87F9, 0x958B, 0x968E, 0x8C9D, 0x51F1, 0x52BE,
- 0x5916, 0x54B3, 0x5BB3, 0x5D16, 0x6168, 0x6982, 0x6DAF, 0x788D,
- 0x84CB, 0x8857, 0x8A72, 0x93A7, 0x9AB8, 0x6D6C, 0x99A8, 0x86D9,
- 0x57A3, 0x67FF, 0x86CE, 0x920E, 0x5283, 0x5687, 0x5404, 0x5ED3,
- 0x62E1, 0x64B9, 0x683C, 0x6838, 0x6BBB, 0x7372, 0x78BA, 0x7A6B,
- 0x899A, 0x89D2, 0x8D6B, 0x8F03, 0x90ED, 0x95A3, 0x9694, 0x9769,
- 0x5B66, 0x5CB3, 0x697D, 0x984D, 0x984E, 0x639B, 0x7B20, 0x6A2B,
- 0x6A7F, 0x68B6, 0x9C0D, 0x6F5F, 0x5272, 0x559D, 0x6070, 0x62EC,
- 0x6D3B, 0x6E07, 0x6ED1, 0x845B, 0x8910, 0x8F44, 0x4E14, 0x9C39,
- 0x53F6, 0x691B, 0x6A3A, 0x9784, 0x682A, 0x515C, 0x7AC3, 0x84B2,
- 0x91DC, 0x938C, 0x565B, 0x9D28, 0x6822, 0x8305, 0x8431,
-};
-const unsigned short euc_to_utf8_B4[] = {
-         0x7CA5, 0x5208, 0x82C5, 0x74E6, 0x4E7E, 0x4F83, 0x51A0,
- 0x5BD2, 0x520A, 0x52D8, 0x52E7, 0x5DFB, 0x559A, 0x582A, 0x59E6,
- 0x5B8C, 0x5B98, 0x5BDB, 0x5E72, 0x5E79, 0x60A3, 0x611F, 0x6163,
- 0x61BE, 0x63DB, 0x6562, 0x67D1, 0x6853, 0x68FA, 0x6B3E, 0x6B53,
- 0x6C57, 0x6F22, 0x6F97, 0x6F45, 0x74B0, 0x7518, 0x76E3, 0x770B,
- 0x7AFF, 0x7BA1, 0x7C21, 0x7DE9, 0x7F36, 0x7FF0, 0x809D, 0x8266,
- 0x839E, 0x89B3, 0x8ACC, 0x8CAB, 0x9084, 0x9451, 0x9593, 0x9591,
- 0x95A2, 0x9665, 0x97D3, 0x9928, 0x8218, 0x4E38, 0x542B, 0x5CB8,
- 0x5DCC, 0x73A9, 0x764C, 0x773C, 0x5CA9, 0x7FEB, 0x8D0B, 0x96C1,
- 0x9811, 0x9854, 0x9858, 0x4F01, 0x4F0E, 0x5371, 0x559C, 0x5668,
- 0x57FA, 0x5947, 0x5B09, 0x5BC4, 0x5C90, 0x5E0C, 0x5E7E, 0x5FCC,
- 0x63EE, 0x673A, 0x65D7, 0x65E2, 0x671F, 0x68CB, 0x68C4,
-};
-const unsigned short euc_to_utf8_B5[] = {
-         0x6A5F, 0x5E30, 0x6BC5, 0x6C17, 0x6C7D, 0x757F, 0x7948,
- 0x5B63, 0x7A00, 0x7D00, 0x5FBD, 0x898F, 0x8A18, 0x8CB4, 0x8D77,
- 0x8ECC, 0x8F1D, 0x98E2, 0x9A0E, 0x9B3C, 0x4E80, 0x507D, 0x5100,
- 0x5993, 0x5B9C, 0x622F, 0x6280, 0x64EC, 0x6B3A, 0x72A0, 0x7591,
- 0x7947, 0x7FA9, 0x87FB, 0x8ABC, 0x8B70, 0x63AC, 0x83CA, 0x97A0,
- 0x5409, 0x5403, 0x55AB, 0x6854, 0x6A58, 0x8A70, 0x7827, 0x6775,
- 0x9ECD, 0x5374, 0x5BA2, 0x811A, 0x8650, 0x9006, 0x4E18, 0x4E45,
- 0x4EC7, 0x4F11, 0x53CA, 0x5438, 0x5BAE, 0x5F13, 0x6025, 0x6551,
- 0x673D, 0x6C42, 0x6C72, 0x6CE3, 0x7078, 0x7403, 0x7A76, 0x7AAE,
- 0x7B08, 0x7D1A, 0x7CFE, 0x7D66, 0x65E7, 0x725B, 0x53BB, 0x5C45,
- 0x5DE8, 0x62D2, 0x62E0, 0x6319, 0x6E20, 0x865A, 0x8A31, 0x8DDD,
- 0x92F8, 0x6F01, 0x79A6, 0x9B5A, 0x4EA8, 0x4EAB, 0x4EAC,
-};
-const unsigned short euc_to_utf8_B6[] = {
-         0x4F9B, 0x4FA0, 0x50D1, 0x5147, 0x7AF6, 0x5171, 0x51F6,
- 0x5354, 0x5321, 0x537F, 0x53EB, 0x55AC, 0x5883, 0x5CE1, 0x5F37,
- 0x5F4A, 0x602F, 0x6050, 0x606D, 0x631F, 0x6559, 0x6A4B, 0x6CC1,
- 0x72C2, 0x72ED, 0x77EF, 0x80F8, 0x8105, 0x8208, 0x854E, 0x90F7,
- 0x93E1, 0x97FF, 0x9957, 0x9A5A, 0x4EF0, 0x51DD, 0x5C2D, 0x6681,
- 0x696D, 0x5C40, 0x66F2, 0x6975, 0x7389, 0x6850, 0x7C81, 0x50C5,
- 0x52E4, 0x5747, 0x5DFE, 0x9326, 0x65A4, 0x6B23, 0x6B3D, 0x7434,
- 0x7981, 0x79BD, 0x7B4B, 0x7DCA, 0x82B9, 0x83CC, 0x887F, 0x895F,
- 0x8B39, 0x8FD1, 0x91D1, 0x541F, 0x9280, 0x4E5D, 0x5036, 0x53E5,
- 0x533A, 0x72D7, 0x7396, 0x77E9, 0x82E6, 0x8EAF, 0x99C6, 0x99C8,
- 0x99D2, 0x5177, 0x611A, 0x865E, 0x55B0, 0x7A7A, 0x5076, 0x5BD3,
- 0x9047, 0x9685, 0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48,
-};
-const unsigned short euc_to_utf8_B7[] = {
-         0x6398, 0x7A9F, 0x6C93, 0x9774, 0x8F61, 0x7AAA, 0x718A,
- 0x9688, 0x7C82, 0x6817, 0x7E70, 0x6851, 0x936C, 0x52F2, 0x541B,
- 0x85AB, 0x8A13, 0x7FA4, 0x8ECD, 0x90E1, 0x5366, 0x8888, 0x7941,
- 0x4FC2, 0x50BE, 0x5211, 0x5144, 0x5553, 0x572D, 0x73EA, 0x578B,
- 0x5951, 0x5F62, 0x5F84, 0x6075, 0x6176, 0x6167, 0x61A9, 0x63B2,
- 0x643A, 0x656C, 0x666F, 0x6842, 0x6E13, 0x7566, 0x7A3D, 0x7CFB,
- 0x7D4C, 0x7D99, 0x7E4B, 0x7F6B, 0x830E, 0x834A, 0x86CD, 0x8A08,
- 0x8A63, 0x8B66, 0x8EFD, 0x981A, 0x9D8F, 0x82B8, 0x8FCE, 0x9BE8,
- 0x5287, 0x621F, 0x6483, 0x6FC0, 0x9699, 0x6841, 0x5091, 0x6B20,
- 0x6C7A, 0x6F54, 0x7A74, 0x7D50, 0x8840, 0x8A23, 0x6708, 0x4EF6,
- 0x5039, 0x5026, 0x5065, 0x517C, 0x5238, 0x5263, 0x55A7, 0x570F,
- 0x5805, 0x5ACC, 0x5EFA, 0x61B2, 0x61F8, 0x62F3, 0x6372,
-};
-const unsigned short euc_to_utf8_B8[] = {
-         0x691C, 0x6A29, 0x727D, 0x72AC, 0x732E, 0x7814, 0x786F,
- 0x7D79, 0x770C, 0x80A9, 0x898B, 0x8B19, 0x8CE2, 0x8ED2, 0x9063,
- 0x9375, 0x967A, 0x9855, 0x9A13, 0x9E78, 0x5143, 0x539F, 0x53B3,
- 0x5E7B, 0x5F26, 0x6E1B, 0x6E90, 0x7384, 0x73FE, 0x7D43, 0x8237,
- 0x8A00, 0x8AFA, 0x9650, 0x4E4E, 0x500B, 0x53E4, 0x547C, 0x56FA,
- 0x59D1, 0x5B64, 0x5DF1, 0x5EAB, 0x5F27, 0x6238, 0x6545, 0x67AF,
- 0x6E56, 0x72D0, 0x7CCA, 0x88B4, 0x80A1, 0x80E1, 0x83F0, 0x864E,
- 0x8A87, 0x8DE8, 0x9237, 0x96C7, 0x9867, 0x9F13, 0x4E94, 0x4E92,
- 0x4F0D, 0x5348, 0x5449, 0x543E, 0x5A2F, 0x5F8C, 0x5FA1, 0x609F,
- 0x68A7, 0x6A8E, 0x745A, 0x7881, 0x8A9E, 0x8AA4, 0x8B77, 0x9190,
- 0x4E5E, 0x9BC9, 0x4EA4, 0x4F7C, 0x4FAF, 0x5019, 0x5016, 0x5149,
- 0x516C, 0x529F, 0x52B9, 0x52FE, 0x539A, 0x53E3, 0x5411,
-};
-const unsigned short euc_to_utf8_B9[] = {
-         0x540E, 0x5589, 0x5751, 0x57A2, 0x597D, 0x5B54, 0x5B5D,
- 0x5B8F, 0x5DE5, 0x5DE7, 0x5DF7, 0x5E78, 0x5E83, 0x5E9A, 0x5EB7,
- 0x5F18, 0x6052, 0x614C, 0x6297, 0x62D8, 0x63A7, 0x653B, 0x6602,
- 0x6643, 0x66F4, 0x676D, 0x6821, 0x6897, 0x69CB, 0x6C5F, 0x6D2A,
- 0x6D69, 0x6E2F, 0x6E9D, 0x7532, 0x7687, 0x786C, 0x7A3F, 0x7CE0,
- 0x7D05, 0x7D18, 0x7D5E, 0x7DB1, 0x8015, 0x8003, 0x80AF, 0x80B1,
- 0x8154, 0x818F, 0x822A, 0x8352, 0x884C, 0x8861, 0x8B1B, 0x8CA2,
- 0x8CFC, 0x90CA, 0x9175, 0x9271, 0x783F, 0x92FC, 0x95A4, 0x964D,
- 0x9805, 0x9999, 0x9AD8, 0x9D3B, 0x525B, 0x52AB, 0x53F7, 0x5408,
- 0x58D5, 0x62F7, 0x6FE0, 0x8C6A, 0x8F5F, 0x9EB9, 0x514B, 0x523B,
- 0x544A, 0x56FD, 0x7A40, 0x9177, 0x9D60, 0x9ED2, 0x7344, 0x6F09,
- 0x8170, 0x7511, 0x5FFD, 0x60DA, 0x9AA8, 0x72DB, 0x8FBC,
-};
-const unsigned short euc_to_utf8_BA[] = {
-         0x6B64, 0x9803, 0x4ECA, 0x56F0, 0x5764, 0x58BE, 0x5A5A,
- 0x6068, 0x61C7, 0x660F, 0x6606, 0x6839, 0x68B1, 0x6DF7, 0x75D5,
- 0x7D3A, 0x826E, 0x9B42, 0x4E9B, 0x4F50, 0x53C9, 0x5506, 0x5D6F,
- 0x5DE6, 0x5DEE, 0x67FB, 0x6C99, 0x7473, 0x7802, 0x8A50, 0x9396,
- 0x88DF, 0x5750, 0x5EA7, 0x632B, 0x50B5, 0x50AC, 0x518D, 0x6700,
- 0x54C9, 0x585E, 0x59BB, 0x5BB0, 0x5F69, 0x624D, 0x63A1, 0x683D,
- 0x6B73, 0x6E08, 0x707D, 0x91C7, 0x7280, 0x7815, 0x7826, 0x796D,
- 0x658E, 0x7D30, 0x83DC, 0x88C1, 0x8F09, 0x969B, 0x5264, 0x5728,
- 0x6750, 0x7F6A, 0x8CA1, 0x51B4, 0x5742, 0x962A, 0x583A, 0x698A,
- 0x80B4, 0x54B2, 0x5D0E, 0x57FC, 0x7895, 0x9DFA, 0x4F5C, 0x524A,
- 0x548B, 0x643E, 0x6628, 0x6714, 0x67F5, 0x7A84, 0x7B56, 0x7D22,
- 0x932F, 0x685C, 0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237,
-};
-const unsigned short euc_to_utf8_BB[] = {
-         0x5BDF, 0x62F6, 0x64AE, 0x64E6, 0x672D, 0x6BBA, 0x85A9,
- 0x96D1, 0x7690, 0x9BD6, 0x634C, 0x9306, 0x9BAB, 0x76BF, 0x6652,
- 0x4E09, 0x5098, 0x53C2, 0x5C71, 0x60E8, 0x6492, 0x6563, 0x685F,
- 0x71E6, 0x73CA, 0x7523, 0x7B97, 0x7E82, 0x8695, 0x8B83, 0x8CDB,
- 0x9178, 0x9910, 0x65AC, 0x66AB, 0x6B8B, 0x4ED5, 0x4ED4, 0x4F3A,
- 0x4F7F, 0x523A, 0x53F8, 0x53F2, 0x55E3, 0x56DB, 0x58EB, 0x59CB,
- 0x59C9, 0x59FF, 0x5B50, 0x5C4D, 0x5E02, 0x5E2B, 0x5FD7, 0x601D,
- 0x6307, 0x652F, 0x5B5C, 0x65AF, 0x65BD, 0x65E8, 0x679D, 0x6B62,
- 0x6B7B, 0x6C0F, 0x7345, 0x7949, 0x79C1, 0x7CF8, 0x7D19, 0x7D2B,
- 0x80A2, 0x8102, 0x81F3, 0x8996, 0x8A5E, 0x8A69, 0x8A66, 0x8A8C,
- 0x8AEE, 0x8CC7, 0x8CDC, 0x96CC, 0x98FC, 0x6B6F, 0x4E8B, 0x4F3C,
- 0x4F8D, 0x5150, 0x5B57, 0x5BFA, 0x6148, 0x6301, 0x6642,
-};
-const unsigned short euc_to_utf8_BC[] = {
-         0x6B21, 0x6ECB, 0x6CBB, 0x723E, 0x74BD, 0x75D4, 0x78C1,
- 0x793A, 0x800C, 0x8033, 0x81EA, 0x8494, 0x8F9E, 0x6C50, 0x9E7F,
- 0x5F0F, 0x8B58, 0x9D2B, 0x7AFA, 0x8EF8, 0x5B8D, 0x96EB, 0x4E03,
- 0x53F1, 0x57F7, 0x5931, 0x5AC9, 0x5BA4, 0x6089, 0x6E7F, 0x6F06,
- 0x75BE, 0x8CEA, 0x5B9F, 0x8500, 0x7BE0, 0x5072, 0x67F4, 0x829D,
- 0x5C61, 0x854A, 0x7E1E, 0x820E, 0x5199, 0x5C04, 0x6368, 0x8D66,
- 0x659C, 0x716E, 0x793E, 0x7D17, 0x8005, 0x8B1D, 0x8ECA, 0x906E,
- 0x86C7, 0x90AA, 0x501F, 0x52FA, 0x5C3A, 0x6753, 0x707C, 0x7235,
- 0x914C, 0x91C8, 0x932B, 0x82E5, 0x5BC2, 0x5F31, 0x60F9, 0x4E3B,
- 0x53D6, 0x5B88, 0x624B, 0x6731, 0x6B8A, 0x72E9, 0x73E0, 0x7A2E,
- 0x816B, 0x8DA3, 0x9152, 0x9996, 0x5112, 0x53D7, 0x546A, 0x5BFF,
- 0x6388, 0x6A39, 0x7DAC, 0x9700, 0x56DA, 0x53CE, 0x5468,
-};
-const unsigned short euc_to_utf8_BD[] = {
-         0x5B97, 0x5C31, 0x5DDE, 0x4FEE, 0x6101, 0x62FE, 0x6D32,
- 0x79C0, 0x79CB, 0x7D42, 0x7E4D, 0x7FD2, 0x81ED, 0x821F, 0x8490,
- 0x8846, 0x8972, 0x8B90, 0x8E74, 0x8F2F, 0x9031, 0x914B, 0x916C,
- 0x96C6, 0x919C, 0x4EC0, 0x4F4F, 0x5145, 0x5341, 0x5F93, 0x620E,
- 0x67D4, 0x6C41, 0x6E0B, 0x7363, 0x7E26, 0x91CD, 0x9283, 0x53D4,
- 0x5919, 0x5BBF, 0x6DD1, 0x795D, 0x7E2E, 0x7C9B, 0x587E, 0x719F,
- 0x51FA, 0x8853, 0x8FF0, 0x4FCA, 0x5CFB, 0x6625, 0x77AC, 0x7AE3,
- 0x821C, 0x99FF, 0x51C6, 0x5FAA, 0x65EC, 0x696F, 0x6B89, 0x6DF3,
- 0x6E96, 0x6F64, 0x76FE, 0x7D14, 0x5DE1, 0x9075, 0x9187, 0x9806,
- 0x51E6, 0x521D, 0x6240, 0x6691, 0x66D9, 0x6E1A, 0x5EB6, 0x7DD2,
- 0x7F72, 0x66F8, 0x85AF, 0x85F7, 0x8AF8, 0x52A9, 0x53D9, 0x5973,
- 0x5E8F, 0x5F90, 0x6055, 0x92E4, 0x9664, 0x50B7, 0x511F,
-};
-const unsigned short euc_to_utf8_BE[] = {
-         0x52DD, 0x5320, 0x5347, 0x53EC, 0x54E8, 0x5546, 0x5531,
- 0x5617, 0x5968, 0x59BE, 0x5A3C, 0x5BB5, 0x5C06, 0x5C0F, 0x5C11,
- 0x5C1A, 0x5E84, 0x5E8A, 0x5EE0, 0x5F70, 0x627F, 0x6284, 0x62DB,
- 0x638C, 0x6377, 0x6607, 0x660C, 0x662D, 0x6676, 0x677E, 0x68A2,
- 0x6A1F, 0x6A35, 0x6CBC, 0x6D88, 0x6E09, 0x6E58, 0x713C, 0x7126,
- 0x7167, 0x75C7, 0x7701, 0x785D, 0x7901, 0x7965, 0x79F0, 0x7AE0,
- 0x7B11, 0x7CA7, 0x7D39, 0x8096, 0x83D6, 0x848B, 0x8549, 0x885D,
- 0x88F3, 0x8A1F, 0x8A3C, 0x8A54, 0x8A73, 0x8C61, 0x8CDE, 0x91A4,
- 0x9266, 0x937E, 0x9418, 0x969C, 0x9798, 0x4E0A, 0x4E08, 0x4E1E,
- 0x4E57, 0x5197, 0x5270, 0x57CE, 0x5834, 0x58CC, 0x5B22, 0x5E38,
- 0x60C5, 0x64FE, 0x6761, 0x6756, 0x6D44, 0x72B6, 0x7573, 0x7A63,
- 0x84B8, 0x8B72, 0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE,
-};
-const unsigned short euc_to_utf8_BF[] = {
-         0x62ED, 0x690D, 0x6B96, 0x71ED, 0x7E54, 0x8077, 0x8272,
- 0x89E6, 0x98DF, 0x8755, 0x8FB1, 0x5C3B, 0x4F38, 0x4FE1, 0x4FB5,
- 0x5507, 0x5A20, 0x5BDD, 0x5BE9, 0x5FC3, 0x614E, 0x632F, 0x65B0,
- 0x664B, 0x68EE, 0x699B, 0x6D78, 0x6DF1, 0x7533, 0x75B9, 0x771F,
- 0x795E, 0x79E6, 0x7D33, 0x81E3, 0x82AF, 0x85AA, 0x89AA, 0x8A3A,
- 0x8EAB, 0x8F9B, 0x9032, 0x91DD, 0x9707, 0x4EBA, 0x4EC1, 0x5203,
- 0x5875, 0x58EC, 0x5C0B, 0x751A, 0x5C3D, 0x814E, 0x8A0A, 0x8FC5,
- 0x9663, 0x976D, 0x7B25, 0x8ACF, 0x9808, 0x9162, 0x56F3, 0x53A8,
- 0x9017, 0x5439, 0x5782, 0x5E25, 0x63A8, 0x6C34, 0x708A, 0x7761,
- 0x7C8B, 0x7FE0, 0x8870, 0x9042, 0x9154, 0x9310, 0x9318, 0x968F,
- 0x745E, 0x9AC4, 0x5D07, 0x5D69, 0x6570, 0x67A2, 0x8DA8, 0x96DB,
- 0x636E, 0x6749, 0x6919, 0x83C5, 0x9817, 0x96C0, 0x88FE,
-};
-const unsigned short euc_to_utf8_C0[] = {
-         0x6F84, 0x647A, 0x5BF8, 0x4E16, 0x702C, 0x755D, 0x662F,
- 0x51C4, 0x5236, 0x52E2, 0x59D3, 0x5F81, 0x6027, 0x6210, 0x653F,
- 0x6574, 0x661F, 0x6674, 0x68F2, 0x6816, 0x6B63, 0x6E05, 0x7272,
- 0x751F, 0x76DB, 0x7CBE, 0x8056, 0x58F0, 0x88FD, 0x897F, 0x8AA0,
- 0x8A93, 0x8ACB, 0x901D, 0x9192, 0x9752, 0x9759, 0x6589, 0x7A0E,
- 0x8106, 0x96BB, 0x5E2D, 0x60DC, 0x621A, 0x65A5, 0x6614, 0x6790,
- 0x77F3, 0x7A4D, 0x7C4D, 0x7E3E, 0x810A, 0x8CAC, 0x8D64, 0x8DE1,
- 0x8E5F, 0x78A9, 0x5207, 0x62D9, 0x63A5, 0x6442, 0x6298, 0x8A2D,
- 0x7A83, 0x7BC0, 0x8AAC, 0x96EA, 0x7D76, 0x820C, 0x8749, 0x4ED9,
- 0x5148, 0x5343, 0x5360, 0x5BA3, 0x5C02, 0x5C16, 0x5DDD, 0x6226,
- 0x6247, 0x64B0, 0x6813, 0x6834, 0x6CC9, 0x6D45, 0x6D17, 0x67D3,
- 0x6F5C, 0x714E, 0x717D, 0x65CB, 0x7A7F, 0x7BAD, 0x7DDA,
-};
-const unsigned short euc_to_utf8_C1[] = {
-         0x7E4A, 0x7FA8, 0x817A, 0x821B, 0x8239, 0x85A6, 0x8A6E,
- 0x8CCE, 0x8DF5, 0x9078, 0x9077, 0x92AD, 0x9291, 0x9583, 0x9BAE,
- 0x524D, 0x5584, 0x6F38, 0x7136, 0x5168, 0x7985, 0x7E55, 0x81B3,
- 0x7CCE, 0x564C, 0x5851, 0x5CA8, 0x63AA, 0x66FE, 0x66FD, 0x695A,
- 0x72D9, 0x758F, 0x758E, 0x790E, 0x7956, 0x79DF, 0x7C97, 0x7D20,
- 0x7D44, 0x8607, 0x8A34, 0x963B, 0x9061, 0x9F20, 0x50E7, 0x5275,
- 0x53CC, 0x53E2, 0x5009, 0x55AA, 0x58EE, 0x594F, 0x723D, 0x5B8B,
- 0x5C64, 0x531D, 0x60E3, 0x60F3, 0x635C, 0x6383, 0x633F, 0x63BB,
- 0x64CD, 0x65E9, 0x66F9, 0x5DE3, 0x69CD, 0x69FD, 0x6F15, 0x71E5,
- 0x4E89, 0x75E9, 0x76F8, 0x7A93, 0x7CDF, 0x7DCF, 0x7D9C, 0x8061,
- 0x8349, 0x8358, 0x846C, 0x84BC, 0x85FB, 0x88C5, 0x8D70, 0x9001,
- 0x906D, 0x9397, 0x971C, 0x9A12, 0x50CF, 0x5897, 0x618E,
-};
-const unsigned short euc_to_utf8_C2[] = {
-         0x81D3, 0x8535, 0x8D08, 0x9020, 0x4FC3, 0x5074, 0x5247,
- 0x5373, 0x606F, 0x6349, 0x675F, 0x6E2C, 0x8DB3, 0x901F, 0x4FD7,
- 0x5C5E, 0x8CCA, 0x65CF, 0x7D9A, 0x5352, 0x8896, 0x5176, 0x63C3,
- 0x5B58, 0x5B6B, 0x5C0A, 0x640D, 0x6751, 0x905C, 0x4ED6, 0x591A,
- 0x592A, 0x6C70, 0x8A51, 0x553E, 0x5815, 0x59A5, 0x60F0, 0x6253,
- 0x67C1, 0x8235, 0x6955, 0x9640, 0x99C4, 0x9A28, 0x4F53, 0x5806,
- 0x5BFE, 0x8010, 0x5CB1, 0x5E2F, 0x5F85, 0x6020, 0x614B, 0x6234,
- 0x66FF, 0x6CF0, 0x6EDE, 0x80CE, 0x817F, 0x82D4, 0x888B, 0x8CB8,
- 0x9000, 0x902E, 0x968A, 0x9EDB, 0x9BDB, 0x4EE3, 0x53F0, 0x5927,
- 0x7B2C, 0x918D, 0x984C, 0x9DF9, 0x6EDD, 0x7027, 0x5353, 0x5544,
- 0x5B85, 0x6258, 0x629E, 0x62D3, 0x6CA2, 0x6FEF, 0x7422, 0x8A17,
- 0x9438, 0x6FC1, 0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA,
-};
-const unsigned short euc_to_utf8_C3[] = {
-         0x53E9, 0x4F46, 0x9054, 0x8FB0, 0x596A, 0x8131, 0x5DFD,
- 0x7AEA, 0x8FBF, 0x68DA, 0x8C37, 0x72F8, 0x9C48, 0x6A3D, 0x8AB0,
- 0x4E39, 0x5358, 0x5606, 0x5766, 0x62C5, 0x63A2, 0x65E6, 0x6B4E,
- 0x6DE1, 0x6E5B, 0x70AD, 0x77ED, 0x7AEF, 0x7BAA, 0x7DBB, 0x803D,
- 0x80C6, 0x86CB, 0x8A95, 0x935B, 0x56E3, 0x58C7, 0x5F3E, 0x65AD,
- 0x6696, 0x6A80, 0x6BB5, 0x7537, 0x8AC7, 0x5024, 0x77E5, 0x5730,
- 0x5F1B, 0x6065, 0x667A, 0x6C60, 0x75F4, 0x7A1A, 0x7F6E, 0x81F4,
- 0x8718, 0x9045, 0x99B3, 0x7BC9, 0x755C, 0x7AF9, 0x7B51, 0x84C4,
- 0x9010, 0x79E9, 0x7A92, 0x8336, 0x5AE1, 0x7740, 0x4E2D, 0x4EF2,
- 0x5B99, 0x5FE0, 0x62BD, 0x663C, 0x67F1, 0x6CE8, 0x866B, 0x8877,
- 0x8A3B, 0x914E, 0x92F3, 0x99D0, 0x6A17, 0x7026, 0x732A, 0x82E7,
- 0x8457, 0x8CAF, 0x4E01, 0x5146, 0x51CB, 0x558B, 0x5BF5,
-};
-const unsigned short euc_to_utf8_C4[] = {
-         0x5E16, 0x5E33, 0x5E81, 0x5F14, 0x5F35, 0x5F6B, 0x5FB4,
- 0x61F2, 0x6311, 0x66A2, 0x671D, 0x6F6E, 0x7252, 0x753A, 0x773A,
- 0x8074, 0x8139, 0x8178, 0x8776, 0x8ABF, 0x8ADC, 0x8D85, 0x8DF3,
- 0x929A, 0x9577, 0x9802, 0x9CE5, 0x52C5, 0x6357, 0x76F4, 0x6715,
- 0x6C88, 0x73CD, 0x8CC3, 0x93AE, 0x9673, 0x6D25, 0x589C, 0x690E,
- 0x69CC, 0x8FFD, 0x939A, 0x75DB, 0x901A, 0x585A, 0x6802, 0x63B4,
- 0x69FB, 0x4F43, 0x6F2C, 0x67D8, 0x8FBB, 0x8526, 0x7DB4, 0x9354,
- 0x693F, 0x6F70, 0x576A, 0x58F7, 0x5B2C, 0x7D2C, 0x722A, 0x540A,
- 0x91E3, 0x9DB4, 0x4EAD, 0x4F4E, 0x505C, 0x5075, 0x5243, 0x8C9E,
- 0x5448, 0x5824, 0x5B9A, 0x5E1D, 0x5E95, 0x5EAD, 0x5EF7, 0x5F1F,
- 0x608C, 0x62B5, 0x633A, 0x63D0, 0x68AF, 0x6C40, 0x7887, 0x798E,
- 0x7A0B, 0x7DE0, 0x8247, 0x8A02, 0x8AE6, 0x8E44, 0x9013,
-};
-const unsigned short euc_to_utf8_C5[] = {
-         0x90B8, 0x912D, 0x91D8, 0x9F0E, 0x6CE5, 0x6458, 0x64E2,
- 0x6575, 0x6EF4, 0x7684, 0x7B1B, 0x9069, 0x93D1, 0x6EBA, 0x54F2,
- 0x5FB9, 0x64A4, 0x8F4D, 0x8FED, 0x9244, 0x5178, 0x586B, 0x5929,
- 0x5C55, 0x5E97, 0x6DFB, 0x7E8F, 0x751C, 0x8CBC, 0x8EE2, 0x985B,
- 0x70B9, 0x4F1D, 0x6BBF, 0x6FB1, 0x7530, 0x96FB, 0x514E, 0x5410,
- 0x5835, 0x5857, 0x59AC, 0x5C60, 0x5F92, 0x6597, 0x675C, 0x6E21,
- 0x767B, 0x83DF, 0x8CED, 0x9014, 0x90FD, 0x934D, 0x7825, 0x783A,
- 0x52AA, 0x5EA6, 0x571F, 0x5974, 0x6012, 0x5012, 0x515A, 0x51AC,
- 0x51CD, 0x5200, 0x5510, 0x5854, 0x5858, 0x5957, 0x5B95, 0x5CF6,
- 0x5D8B, 0x60BC, 0x6295, 0x642D, 0x6771, 0x6843, 0x68BC, 0x68DF,
- 0x76D7, 0x6DD8, 0x6E6F, 0x6D9B, 0x706F, 0x71C8, 0x5F53, 0x75D8,
- 0x7977, 0x7B49, 0x7B54, 0x7B52, 0x7CD6, 0x7D71, 0x5230,
-};
-const unsigned short euc_to_utf8_C6[] = {
-         0x8463, 0x8569, 0x85E4, 0x8A0E, 0x8B04, 0x8C46, 0x8E0F,
- 0x9003, 0x900F, 0x9419, 0x9676, 0x982D, 0x9A30, 0x95D8, 0x50CD,
- 0x52D5, 0x540C, 0x5802, 0x5C0E, 0x61A7, 0x649E, 0x6D1E, 0x77B3,
- 0x7AE5, 0x80F4, 0x8404, 0x9053, 0x9285, 0x5CE0, 0x9D07, 0x533F,
- 0x5F97, 0x5FB3, 0x6D9C, 0x7279, 0x7763, 0x79BF, 0x7BE4, 0x6BD2,
- 0x72EC, 0x8AAD, 0x6803, 0x6A61, 0x51F8, 0x7A81, 0x6934, 0x5C4A,
- 0x9CF6, 0x82EB, 0x5BC5, 0x9149, 0x701E, 0x5678, 0x5C6F, 0x60C7,
- 0x6566, 0x6C8C, 0x8C5A, 0x9041, 0x9813, 0x5451, 0x66C7, 0x920D,
- 0x5948, 0x90A3, 0x5185, 0x4E4D, 0x51EA, 0x8599, 0x8B0E, 0x7058,
- 0x637A, 0x934B, 0x6962, 0x99B4, 0x7E04, 0x7577, 0x5357, 0x6960,
- 0x8EDF, 0x96E3, 0x6C5D, 0x4E8C, 0x5C3C, 0x5F10, 0x8FE9, 0x5302,
- 0x8CD1, 0x8089, 0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165,
-};
-const unsigned short euc_to_utf8_C7[] = {
-         0x5982, 0x5C3F, 0x97EE, 0x4EFB, 0x598A, 0x5FCD, 0x8A8D,
- 0x6FE1, 0x79B0, 0x7962, 0x5BE7, 0x8471, 0x732B, 0x71B1, 0x5E74,
- 0x5FF5, 0x637B, 0x649A, 0x71C3, 0x7C98, 0x4E43, 0x5EFC, 0x4E4B,
- 0x57DC, 0x56A2, 0x60A9, 0x6FC3, 0x7D0D, 0x80FD, 0x8133, 0x81BF,
- 0x8FB2, 0x8997, 0x86A4, 0x5DF4, 0x628A, 0x64AD, 0x8987, 0x6777,
- 0x6CE2, 0x6D3E, 0x7436, 0x7834, 0x5A46, 0x7F75, 0x82AD, 0x99AC,
- 0x4FF3, 0x5EC3, 0x62DD, 0x6392, 0x6557, 0x676F, 0x76C3, 0x724C,
- 0x80CC, 0x80BA, 0x8F29, 0x914D, 0x500D, 0x57F9, 0x5A92, 0x6885,
- 0x6973, 0x7164, 0x72FD, 0x8CB7, 0x58F2, 0x8CE0, 0x966A, 0x9019,
- 0x877F, 0x79E4, 0x77E7, 0x8429, 0x4F2F, 0x5265, 0x535A, 0x62CD,
- 0x67CF, 0x6CCA, 0x767D, 0x7B94, 0x7C95, 0x8236, 0x8584, 0x8FEB,
- 0x66DD, 0x6F20, 0x7206, 0x7E1B, 0x83AB, 0x99C1, 0x9EA6,
-};
-const unsigned short euc_to_utf8_C8[] = {
-         0x51FD, 0x7BB1, 0x7872, 0x7BB8, 0x8087, 0x7B48, 0x6AE8,
- 0x5E61, 0x808C, 0x7551, 0x7560, 0x516B, 0x9262, 0x6E8C, 0x767A,
- 0x9197, 0x9AEA, 0x4F10, 0x7F70, 0x629C, 0x7B4F, 0x95A5, 0x9CE9,
- 0x567A, 0x5859, 0x86E4, 0x96BC, 0x4F34, 0x5224, 0x534A, 0x53CD,
- 0x53DB, 0x5E06, 0x642C, 0x6591, 0x677F, 0x6C3E, 0x6C4E, 0x7248,
- 0x72AF, 0x73ED, 0x7554, 0x7E41, 0x822C, 0x85E9, 0x8CA9, 0x7BC4,
- 0x91C6, 0x7169, 0x9812, 0x98EF, 0x633D, 0x6669, 0x756A, 0x76E4,
- 0x78D0, 0x8543, 0x86EE, 0x532A, 0x5351, 0x5426, 0x5983, 0x5E87,
- 0x5F7C, 0x60B2, 0x6249, 0x6279, 0x62AB, 0x6590, 0x6BD4, 0x6CCC,
- 0x75B2, 0x76AE, 0x7891, 0x79D8, 0x7DCB, 0x7F77, 0x80A5, 0x88AB,
- 0x8AB9, 0x8CBB, 0x907F, 0x975E, 0x98DB, 0x6A0B, 0x7C38, 0x5099,
- 0x5C3E, 0x5FAE, 0x6787, 0x6BD8, 0x7435, 0x7709, 0x7F8E,
-};
-const unsigned short euc_to_utf8_C9[] = {
-         0x9F3B, 0x67CA, 0x7A17, 0x5339, 0x758B, 0x9AED, 0x5F66,
- 0x819D, 0x83F1, 0x8098, 0x5F3C, 0x5FC5, 0x7562, 0x7B46, 0x903C,
- 0x6867, 0x59EB, 0x5A9B, 0x7D10, 0x767E, 0x8B2C, 0x4FF5, 0x5F6A,
- 0x6A19, 0x6C37, 0x6F02, 0x74E2, 0x7968, 0x8868, 0x8A55, 0x8C79,
- 0x5EDF, 0x63CF, 0x75C5, 0x79D2, 0x82D7, 0x9328, 0x92F2, 0x849C,
- 0x86ED, 0x9C2D, 0x54C1, 0x5F6C, 0x658C, 0x6D5C, 0x7015, 0x8CA7,
- 0x8CD3, 0x983B, 0x654F, 0x74F6, 0x4E0D, 0x4ED8, 0x57E0, 0x592B,
- 0x5A66, 0x5BCC, 0x51A8, 0x5E03, 0x5E9C, 0x6016, 0x6276, 0x6577,
- 0x65A7, 0x666E, 0x6D6E, 0x7236, 0x7B26, 0x8150, 0x819A, 0x8299,
- 0x8B5C, 0x8CA0, 0x8CE6, 0x8D74, 0x961C, 0x9644, 0x4FAE, 0x64AB,
- 0x6B66, 0x821E, 0x8461, 0x856A, 0x90E8, 0x5C01, 0x6953, 0x98A8,
- 0x847A, 0x8557, 0x4F0F, 0x526F, 0x5FA9, 0x5E45, 0x670D,
-};
-const unsigned short euc_to_utf8_CA[] = {
-         0x798F, 0x8179, 0x8907, 0x8986, 0x6DF5, 0x5F17, 0x6255,
- 0x6CB8, 0x4ECF, 0x7269, 0x9B92, 0x5206, 0x543B, 0x5674, 0x58B3,
- 0x61A4, 0x626E, 0x711A, 0x596E, 0x7C89, 0x7CDE, 0x7D1B, 0x96F0,
- 0x6587, 0x805E, 0x4E19, 0x4F75, 0x5175, 0x5840, 0x5E63, 0x5E73,
- 0x5F0A, 0x67C4, 0x4E26, 0x853D, 0x9589, 0x965B, 0x7C73, 0x9801,
- 0x50FB, 0x58C1, 0x7656, 0x78A7, 0x5225, 0x77A5, 0x8511, 0x7B86,
- 0x504F, 0x5909, 0x7247, 0x7BC7, 0x7DE8, 0x8FBA, 0x8FD4, 0x904D,
- 0x4FBF, 0x52C9, 0x5A29, 0x5F01, 0x97AD, 0x4FDD, 0x8217, 0x92EA,
- 0x5703, 0x6355, 0x6B69, 0x752B, 0x88DC, 0x8F14, 0x7A42, 0x52DF,
- 0x5893, 0x6155, 0x620A, 0x66AE, 0x6BCD, 0x7C3F, 0x83E9, 0x5023,
- 0x4FF8, 0x5305, 0x5446, 0x5831, 0x5949, 0x5B9D, 0x5CF0, 0x5CEF,
- 0x5D29, 0x5E96, 0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B,
-};
-const unsigned short euc_to_utf8_CB[] = {
-         0x6CD5, 0x6CE1, 0x70F9, 0x7832, 0x7E2B, 0x80DE, 0x82B3,
- 0x840C, 0x84EC, 0x8702, 0x8912, 0x8A2A, 0x8C4A, 0x90A6, 0x92D2,
- 0x98FD, 0x9CF3, 0x9D6C, 0x4E4F, 0x4EA1, 0x508D, 0x5256, 0x574A,
- 0x59A8, 0x5E3D, 0x5FD8, 0x5FD9, 0x623F, 0x66B4, 0x671B, 0x67D0,
- 0x68D2, 0x5192, 0x7D21, 0x80AA, 0x81A8, 0x8B00, 0x8C8C, 0x8CBF,
- 0x927E, 0x9632, 0x5420, 0x982C, 0x5317, 0x50D5, 0x535C, 0x58A8,
- 0x64B2, 0x6734, 0x7267, 0x7766, 0x7A46, 0x91E6, 0x52C3, 0x6CA1,
- 0x6B86, 0x5800, 0x5E4C, 0x5954, 0x672C, 0x7FFB, 0x51E1, 0x76C6,
- 0x6469, 0x78E8, 0x9B54, 0x9EBB, 0x57CB, 0x59B9, 0x6627, 0x679A,
- 0x6BCE, 0x54E9, 0x69D9, 0x5E55, 0x819C, 0x6795, 0x9BAA, 0x67FE,
- 0x9C52, 0x685D, 0x4EA6, 0x4FE3, 0x53C8, 0x62B9, 0x672B, 0x6CAB,
- 0x8FC4, 0x4FAD, 0x7E6D, 0x9EBF, 0x4E07, 0x6162, 0x6E80,
-};
-const unsigned short euc_to_utf8_CC[] = {
-         0x6F2B, 0x8513, 0x5473, 0x672A, 0x9B45, 0x5DF3, 0x7B95,
- 0x5CAC, 0x5BC6, 0x871C, 0x6E4A, 0x84D1, 0x7A14, 0x8108, 0x5999,
- 0x7C8D, 0x6C11, 0x7720, 0x52D9, 0x5922, 0x7121, 0x725F, 0x77DB,
- 0x9727, 0x9D61, 0x690B, 0x5A7F, 0x5A18, 0x51A5, 0x540D, 0x547D,
- 0x660E, 0x76DF, 0x8FF7, 0x9298, 0x9CF4, 0x59EA, 0x725D, 0x6EC5,
- 0x514D, 0x68C9, 0x7DBF, 0x7DEC, 0x9762, 0x9EBA, 0x6478, 0x6A21,
- 0x8302, 0x5984, 0x5B5F, 0x6BDB, 0x731B, 0x76F2, 0x7DB2, 0x8017,
- 0x8499, 0x5132, 0x6728, 0x9ED9, 0x76EE, 0x6762, 0x52FF, 0x9905,
- 0x5C24, 0x623B, 0x7C7E, 0x8CB0, 0x554F, 0x60B6, 0x7D0B, 0x9580,
- 0x5301, 0x4E5F, 0x51B6, 0x591C, 0x723A, 0x8036, 0x91CE, 0x5F25,
- 0x77E2, 0x5384, 0x5F79, 0x7D04, 0x85AC, 0x8A33, 0x8E8D, 0x9756,
- 0x67F3, 0x85AE, 0x9453, 0x6109, 0x6108, 0x6CB9, 0x7652,
-};
-const unsigned short euc_to_utf8_CD[] = {
-         0x8AED, 0x8F38, 0x552F, 0x4F51, 0x512A, 0x52C7, 0x53CB,
- 0x5BA5, 0x5E7D, 0x60A0, 0x6182, 0x63D6, 0x6709, 0x67DA, 0x6E67,
- 0x6D8C, 0x7336, 0x7337, 0x7531, 0x7950, 0x88D5, 0x8A98, 0x904A,
- 0x9091, 0x90F5, 0x96C4, 0x878D, 0x5915, 0x4E88, 0x4F59, 0x4E0E,
- 0x8A89, 0x8F3F, 0x9810, 0x50AD, 0x5E7C, 0x5996, 0x5BB9, 0x5EB8,
- 0x63DA, 0x63FA, 0x64C1, 0x66DC, 0x694A, 0x69D8, 0x6D0B, 0x6EB6,
- 0x7194, 0x7528, 0x7AAF, 0x7F8A, 0x8000, 0x8449, 0x84C9, 0x8981,
- 0x8B21, 0x8E0A, 0x9065, 0x967D, 0x990A, 0x617E, 0x6291, 0x6B32,
- 0x6C83, 0x6D74, 0x7FCC, 0x7FFC, 0x6DC0, 0x7F85, 0x87BA, 0x88F8,
- 0x6765, 0x83B1, 0x983C, 0x96F7, 0x6D1B, 0x7D61, 0x843D, 0x916A,
- 0x4E71, 0x5375, 0x5D50, 0x6B04, 0x6FEB, 0x85CD, 0x862D, 0x89A7,
- 0x5229, 0x540F, 0x5C65, 0x674E, 0x68A8, 0x7406, 0x7483,
-};
-const unsigned short euc_to_utf8_CE[] = {
-         0x75E2, 0x88CF, 0x88E1, 0x91CC, 0x96E2, 0x9678, 0x5F8B,
- 0x7387, 0x7ACB, 0x844E, 0x63A0, 0x7565, 0x5289, 0x6D41, 0x6E9C,
- 0x7409, 0x7559, 0x786B, 0x7C92, 0x9686, 0x7ADC, 0x9F8D, 0x4FB6,
- 0x616E, 0x65C5, 0x865C, 0x4E86, 0x4EAE, 0x50DA, 0x4E21, 0x51CC,
- 0x5BEE, 0x6599, 0x6881, 0x6DBC, 0x731F, 0x7642, 0x77AD, 0x7A1C,
- 0x7CE7, 0x826F, 0x8AD2, 0x907C, 0x91CF, 0x9675, 0x9818, 0x529B,
- 0x7DD1, 0x502B, 0x5398, 0x6797, 0x6DCB, 0x71D0, 0x7433, 0x81E8,
- 0x8F2A, 0x96A3, 0x9C57, 0x9E9F, 0x7460, 0x5841, 0x6D99, 0x7D2F,
- 0x985E, 0x4EE4, 0x4F36, 0x4F8B, 0x51B7, 0x52B1, 0x5DBA, 0x601C,
- 0x73B2, 0x793C, 0x82D3, 0x9234, 0x96B7, 0x96F6, 0x970A, 0x9E97,
- 0x9F62, 0x66A6, 0x6B74, 0x5217, 0x52A3, 0x70C8, 0x88C2, 0x5EC9,
- 0x604B, 0x6190, 0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F,
-};
-const unsigned short euc_to_utf8_CF[] = {
-         0x84EE, 0x9023, 0x932C, 0x5442, 0x9B6F, 0x6AD3, 0x7089,
- 0x8CC2, 0x8DEF, 0x9732, 0x52B4, 0x5A41, 0x5ECA, 0x5F04, 0x6717,
- 0x697C, 0x6994, 0x6D6A, 0x6F0F, 0x7262, 0x72FC, 0x7BED, 0x8001,
- 0x807E, 0x874B, 0x90CE, 0x516D, 0x9E93, 0x7984, 0x808B, 0x9332,
- 0x8AD6, 0x502D, 0x548C, 0x8A71, 0x6B6A, 0x8CC4, 0x8107, 0x60D1,
- 0x67A0, 0x9DF2, 0x4E99, 0x4E98, 0x9C10, 0x8A6B, 0x85C1, 0x8568,
- 0x6900, 0x6E7E, 0x7897, 0x8155,      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,
-};
-const unsigned short euc_to_utf8_D0[] = {
-         0x5F0C, 0x4E10, 0x4E15, 0x4E2A, 0x4E31, 0x4E36, 0x4E3C,
- 0x4E3F, 0x4E42, 0x4E56, 0x4E58, 0x4E82, 0x4E85, 0x8C6B, 0x4E8A,
- 0x8212, 0x5F0D, 0x4E8E, 0x4E9E, 0x4E9F, 0x4EA0, 0x4EA2, 0x4EB0,
- 0x4EB3, 0x4EB6, 0x4ECE, 0x4ECD, 0x4EC4, 0x4EC6, 0x4EC2, 0x4ED7,
- 0x4EDE, 0x4EED, 0x4EDF, 0x4EF7, 0x4F09, 0x4F5A, 0x4F30, 0x4F5B,
- 0x4F5D, 0x4F57, 0x4F47, 0x4F76, 0x4F88, 0x4F8F, 0x4F98, 0x4F7B,
- 0x4F69, 0x4F70, 0x4F91, 0x4F6F, 0x4F86, 0x4F96, 0x5118, 0x4FD4,
- 0x4FDF, 0x4FCE, 0x4FD8, 0x4FDB, 0x4FD1, 0x4FDA, 0x4FD0, 0x4FE4,
- 0x4FE5, 0x501A, 0x5028, 0x5014, 0x502A, 0x5025, 0x5005, 0x4F1C,
- 0x4FF6, 0x5021, 0x5029, 0x502C, 0x4FFE, 0x4FEF, 0x5011, 0x5006,
- 0x5043, 0x5047, 0x6703, 0x5055, 0x5050, 0x5048, 0x505A, 0x5056,
- 0x506C, 0x5078, 0x5080, 0x509A, 0x5085, 0x50B4, 0x50B2,
-};
-const unsigned short euc_to_utf8_D1[] = {
-         0x50C9, 0x50CA, 0x50B3, 0x50C2, 0x50D6, 0x50DE, 0x50E5,
- 0x50ED, 0x50E3, 0x50EE, 0x50F9, 0x50F5, 0x5109, 0x5101, 0x5102,
- 0x5116, 0x5115, 0x5114, 0x511A, 0x5121, 0x513A, 0x5137, 0x513C,
- 0x513B, 0x513F, 0x5140, 0x5152, 0x514C, 0x5154, 0x5162, 0x7AF8,
- 0x5169, 0x516A, 0x516E, 0x5180, 0x5182, 0x56D8, 0x518C, 0x5189,
- 0x518F, 0x5191, 0x5193, 0x5195, 0x5196, 0x51A4, 0x51A6, 0x51A2,
- 0x51A9, 0x51AA, 0x51AB, 0x51B3, 0x51B1, 0x51B2, 0x51B0, 0x51B5,
- 0x51BD, 0x51C5, 0x51C9, 0x51DB, 0x51E0, 0x8655, 0x51E9, 0x51ED,
- 0x51F0, 0x51F5, 0x51FE, 0x5204, 0x520B, 0x5214, 0x520E, 0x5227,
- 0x522A, 0x522E, 0x5233, 0x5239, 0x524F, 0x5244, 0x524B, 0x524C,
- 0x525E, 0x5254, 0x526A, 0x5274, 0x5269, 0x5273, 0x527F, 0x527D,
- 0x528D, 0x5294, 0x5292, 0x5271, 0x5288, 0x5291, 0x8FA8,
-};
-const unsigned short euc_to_utf8_D2[] = {
-         0x8FA7, 0x52AC, 0x52AD, 0x52BC, 0x52B5, 0x52C1, 0x52CD,
- 0x52D7, 0x52DE, 0x52E3, 0x52E6, 0x98ED, 0x52E0, 0x52F3, 0x52F5,
- 0x52F8, 0x52F9, 0x5306, 0x5308, 0x7538, 0x530D, 0x5310, 0x530F,
- 0x5315, 0x531A, 0x5323, 0x532F, 0x5331, 0x5333, 0x5338, 0x5340,
- 0x5346, 0x5345, 0x4E17, 0x5349, 0x534D, 0x51D6, 0x535E, 0x5369,
- 0x536E, 0x5918, 0x537B, 0x5377, 0x5382, 0x5396, 0x53A0, 0x53A6,
- 0x53A5, 0x53AE, 0x53B0, 0x53B6, 0x53C3, 0x7C12, 0x96D9, 0x53DF,
- 0x66FC, 0x71EE, 0x53EE, 0x53E8, 0x53ED, 0x53FA, 0x5401, 0x543D,
- 0x5440, 0x542C, 0x542D, 0x543C, 0x542E, 0x5436, 0x5429, 0x541D,
- 0x544E, 0x548F, 0x5475, 0x548E, 0x545F, 0x5471, 0x5477, 0x5470,
- 0x5492, 0x547B, 0x5480, 0x5476, 0x5484, 0x5490, 0x5486, 0x54C7,
- 0x54A2, 0x54B8, 0x54A5, 0x54AC, 0x54C4, 0x54C8, 0x54A8,
-};
-const unsigned short euc_to_utf8_D3[] = {
-         0x54AB, 0x54C2, 0x54A4, 0x54BE, 0x54BC, 0x54D8, 0x54E5,
- 0x54E6, 0x550F, 0x5514, 0x54FD, 0x54EE, 0x54ED, 0x54FA, 0x54E2,
- 0x5539, 0x5540, 0x5563, 0x554C, 0x552E, 0x555C, 0x5545, 0x5556,
- 0x5557, 0x5538, 0x5533, 0x555D, 0x5599, 0x5580, 0x54AF, 0x558A,
- 0x559F, 0x557B, 0x557E, 0x5598, 0x559E, 0x55AE, 0x557C, 0x5583,
- 0x55A9, 0x5587, 0x55A8, 0x55DA, 0x55C5, 0x55DF, 0x55C4, 0x55DC,
- 0x55E4, 0x55D4, 0x5614, 0x55F7, 0x5616, 0x55FE, 0x55FD, 0x561B,
- 0x55F9, 0x564E, 0x5650, 0x71DF, 0x5634, 0x5636, 0x5632, 0x5638,
- 0x566B, 0x5664, 0x562F, 0x566C, 0x566A, 0x5686, 0x5680, 0x568A,
- 0x56A0, 0x5694, 0x568F, 0x56A5, 0x56AE, 0x56B6, 0x56B4, 0x56C2,
- 0x56BC, 0x56C1, 0x56C3, 0x56C0, 0x56C8, 0x56CE, 0x56D1, 0x56D3,
- 0x56D7, 0x56EE, 0x56F9, 0x5700, 0x56FF, 0x5704, 0x5709,
-};
-const unsigned short euc_to_utf8_D4[] = {
-         0x5708, 0x570B, 0x570D, 0x5713, 0x5718, 0x5716, 0x55C7,
- 0x571C, 0x5726, 0x5737, 0x5738, 0x574E, 0x573B, 0x5740, 0x574F,
- 0x5769, 0x57C0, 0x5788, 0x5761, 0x577F, 0x5789, 0x5793, 0x57A0,
- 0x57B3, 0x57A4, 0x57AA, 0x57B0, 0x57C3, 0x57C6, 0x57D4, 0x57D2,
- 0x57D3, 0x580A, 0x57D6, 0x57E3, 0x580B, 0x5819, 0x581D, 0x5872,
- 0x5821, 0x5862, 0x584B, 0x5870, 0x6BC0, 0x5852, 0x583D, 0x5879,
- 0x5885, 0x58B9, 0x589F, 0x58AB, 0x58BA, 0x58DE, 0x58BB, 0x58B8,
- 0x58AE, 0x58C5, 0x58D3, 0x58D1, 0x58D7, 0x58D9, 0x58D8, 0x58E5,
- 0x58DC, 0x58E4, 0x58DF, 0x58EF, 0x58FA, 0x58F9, 0x58FB, 0x58FC,
- 0x58FD, 0x5902, 0x590A, 0x5910, 0x591B, 0x68A6, 0x5925, 0x592C,
- 0x592D, 0x5932, 0x5938, 0x593E, 0x7AD2, 0x5955, 0x5950, 0x594E,
- 0x595A, 0x5958, 0x5962, 0x5960, 0x5967, 0x596C, 0x5969,
-};
-const unsigned short euc_to_utf8_D5[] = {
-         0x5978, 0x5981, 0x599D, 0x4F5E, 0x4FAB, 0x59A3, 0x59B2,
- 0x59C6, 0x59E8, 0x59DC, 0x598D, 0x59D9, 0x59DA, 0x5A25, 0x5A1F,
- 0x5A11, 0x5A1C, 0x5A09, 0x5A1A, 0x5A40, 0x5A6C, 0x5A49, 0x5A35,
- 0x5A36, 0x5A62, 0x5A6A, 0x5A9A, 0x5ABC, 0x5ABE, 0x5ACB, 0x5AC2,
- 0x5ABD, 0x5AE3, 0x5AD7, 0x5AE6, 0x5AE9, 0x5AD6, 0x5AFA, 0x5AFB,
- 0x5B0C, 0x5B0B, 0x5B16, 0x5B32, 0x5AD0, 0x5B2A, 0x5B36, 0x5B3E,
- 0x5B43, 0x5B45, 0x5B40, 0x5B51, 0x5B55, 0x5B5A, 0x5B5B, 0x5B65,
- 0x5B69, 0x5B70, 0x5B73, 0x5B75, 0x5B78, 0x6588, 0x5B7A, 0x5B80,
- 0x5B83, 0x5BA6, 0x5BB8, 0x5BC3, 0x5BC7, 0x5BC9, 0x5BD4, 0x5BD0,
- 0x5BE4, 0x5BE6, 0x5BE2, 0x5BDE, 0x5BE5, 0x5BEB, 0x5BF0, 0x5BF6,
- 0x5BF3, 0x5C05, 0x5C07, 0x5C08, 0x5C0D, 0x5C13, 0x5C20, 0x5C22,
- 0x5C28, 0x5C38, 0x5C39, 0x5C41, 0x5C46, 0x5C4E, 0x5C53,
-};
-const unsigned short euc_to_utf8_D6[] = {
-         0x5C50, 0x5C4F, 0x5B71, 0x5C6C, 0x5C6E, 0x4E62, 0x5C76,
- 0x5C79, 0x5C8C, 0x5C91, 0x5C94, 0x599B, 0x5CAB, 0x5CBB, 0x5CB6,
- 0x5CBC, 0x5CB7, 0x5CC5, 0x5CBE, 0x5CC7, 0x5CD9, 0x5CE9, 0x5CFD,
- 0x5CFA, 0x5CED, 0x5D8C, 0x5CEA, 0x5D0B, 0x5D15, 0x5D17, 0x5D5C,
- 0x5D1F, 0x5D1B, 0x5D11, 0x5D14, 0x5D22, 0x5D1A, 0x5D19, 0x5D18,
- 0x5D4C, 0x5D52, 0x5D4E, 0x5D4B, 0x5D6C, 0x5D73, 0x5D76, 0x5D87,
- 0x5D84, 0x5D82, 0x5DA2, 0x5D9D, 0x5DAC, 0x5DAE, 0x5DBD, 0x5D90,
- 0x5DB7, 0x5DBC, 0x5DC9, 0x5DCD, 0x5DD3, 0x5DD2, 0x5DD6, 0x5DDB,
- 0x5DEB, 0x5DF2, 0x5DF5, 0x5E0B, 0x5E1A, 0x5E19, 0x5E11, 0x5E1B,
- 0x5E36, 0x5E37, 0x5E44, 0x5E43, 0x5E40, 0x5E4E, 0x5E57, 0x5E54,
- 0x5E5F, 0x5E62, 0x5E64, 0x5E47, 0x5E75, 0x5E76, 0x5E7A, 0x9EBC,
- 0x5E7F, 0x5EA0, 0x5EC1, 0x5EC2, 0x5EC8, 0x5ED0, 0x5ECF,
-};
-const unsigned short euc_to_utf8_D7[] = {
-         0x5ED6, 0x5EE3, 0x5EDD, 0x5EDA, 0x5EDB, 0x5EE2, 0x5EE1,
- 0x5EE8, 0x5EE9, 0x5EEC, 0x5EF1, 0x5EF3, 0x5EF0, 0x5EF4, 0x5EF8,
- 0x5EFE, 0x5F03, 0x5F09, 0x5F5D, 0x5F5C, 0x5F0B, 0x5F11, 0x5F16,
- 0x5F29, 0x5F2D, 0x5F38, 0x5F41, 0x5F48, 0x5F4C, 0x5F4E, 0x5F2F,
- 0x5F51, 0x5F56, 0x5F57, 0x5F59, 0x5F61, 0x5F6D, 0x5F73, 0x5F77,
- 0x5F83, 0x5F82, 0x5F7F, 0x5F8A, 0x5F88, 0x5F91, 0x5F87, 0x5F9E,
- 0x5F99, 0x5F98, 0x5FA0, 0x5FA8, 0x5FAD, 0x5FBC, 0x5FD6, 0x5FFB,
- 0x5FE4, 0x5FF8, 0x5FF1, 0x5FDD, 0x60B3, 0x5FFF, 0x6021, 0x6060,
- 0x6019, 0x6010, 0x6029, 0x600E, 0x6031, 0x601B, 0x6015, 0x602B,
- 0x6026, 0x600F, 0x603A, 0x605A, 0x6041, 0x606A, 0x6077, 0x605F,
- 0x604A, 0x6046, 0x604D, 0x6063, 0x6043, 0x6064, 0x6042, 0x606C,
- 0x606B, 0x6059, 0x6081, 0x608D, 0x60E7, 0x6083, 0x609A,
-};
-const unsigned short euc_to_utf8_D8[] = {
-         0x6084, 0x609B, 0x6096, 0x6097, 0x6092, 0x60A7, 0x608B,
- 0x60E1, 0x60B8, 0x60E0, 0x60D3, 0x60B4, 0x5FF0, 0x60BD, 0x60C6,
- 0x60B5, 0x60D8, 0x614D, 0x6115, 0x6106, 0x60F6, 0x60F7, 0x6100,
- 0x60F4, 0x60FA, 0x6103, 0x6121, 0x60FB, 0x60F1, 0x610D, 0x610E,
- 0x6147, 0x613E, 0x6128, 0x6127, 0x614A, 0x613F, 0x613C, 0x612C,
- 0x6134, 0x613D, 0x6142, 0x6144, 0x6173, 0x6177, 0x6158, 0x6159,
- 0x615A, 0x616B, 0x6174, 0x616F, 0x6165, 0x6171, 0x615F, 0x615D,
- 0x6153, 0x6175, 0x6199, 0x6196, 0x6187, 0x61AC, 0x6194, 0x619A,
- 0x618A, 0x6191, 0x61AB, 0x61AE, 0x61CC, 0x61CA, 0x61C9, 0x61F7,
- 0x61C8, 0x61C3, 0x61C6, 0x61BA, 0x61CB, 0x7F79, 0x61CD, 0x61E6,
- 0x61E3, 0x61F6, 0x61FA, 0x61F4, 0x61FF, 0x61FD, 0x61FC, 0x61FE,
- 0x6200, 0x6208, 0x6209, 0x620D, 0x620C, 0x6214, 0x621B,
-};
-const unsigned short euc_to_utf8_D9[] = {
-         0x621E, 0x6221, 0x622A, 0x622E, 0x6230, 0x6232, 0x6233,
- 0x6241, 0x624E, 0x625E, 0x6263, 0x625B, 0x6260, 0x6268, 0x627C,
- 0x6282, 0x6289, 0x627E, 0x6292, 0x6293, 0x6296, 0x62D4, 0x6283,
- 0x6294, 0x62D7, 0x62D1, 0x62BB, 0x62CF, 0x62FF, 0x62C6, 0x64D4,
- 0x62C8, 0x62DC, 0x62CC, 0x62CA, 0x62C2, 0x62C7, 0x629B, 0x62C9,
- 0x630C, 0x62EE, 0x62F1, 0x6327, 0x6302, 0x6308, 0x62EF, 0x62F5,
- 0x6350, 0x633E, 0x634D, 0x641C, 0x634F, 0x6396, 0x638E, 0x6380,
- 0x63AB, 0x6376, 0x63A3, 0x638F, 0x6389, 0x639F, 0x63B5, 0x636B,
- 0x6369, 0x63BE, 0x63E9, 0x63C0, 0x63C6, 0x63E3, 0x63C9, 0x63D2,
- 0x63F6, 0x63C4, 0x6416, 0x6434, 0x6406, 0x6413, 0x6426, 0x6436,
- 0x651D, 0x6417, 0x6428, 0x640F, 0x6467, 0x646F, 0x6476, 0x644E,
- 0x652A, 0x6495, 0x6493, 0x64A5, 0x64A9, 0x6488, 0x64BC,
-};
-const unsigned short euc_to_utf8_DA[] = {
-         0x64DA, 0x64D2, 0x64C5, 0x64C7, 0x64BB, 0x64D8, 0x64C2,
- 0x64F1, 0x64E7, 0x8209, 0x64E0, 0x64E1, 0x62AC, 0x64E3, 0x64EF,
- 0x652C, 0x64F6, 0x64F4, 0x64F2, 0x64FA, 0x6500, 0x64FD, 0x6518,
- 0x651C, 0x6505, 0x6524, 0x6523, 0x652B, 0x6534, 0x6535, 0x6537,
- 0x6536, 0x6538, 0x754B, 0x6548, 0x6556, 0x6555, 0x654D, 0x6558,
- 0x655E, 0x655D, 0x6572, 0x6578, 0x6582, 0x6583, 0x8B8A, 0x659B,
- 0x659F, 0x65AB, 0x65B7, 0x65C3, 0x65C6, 0x65C1, 0x65C4, 0x65CC,
- 0x65D2, 0x65DB, 0x65D9, 0x65E0, 0x65E1, 0x65F1, 0x6772, 0x660A,
- 0x6603, 0x65FB, 0x6773, 0x6635, 0x6636, 0x6634, 0x661C, 0x664F,
- 0x6644, 0x6649, 0x6641, 0x665E, 0x665D, 0x6664, 0x6667, 0x6668,
- 0x665F, 0x6662, 0x6670, 0x6683, 0x6688, 0x668E, 0x6689, 0x6684,
- 0x6698, 0x669D, 0x66C1, 0x66B9, 0x66C9, 0x66BE, 0x66BC,
-};
-const unsigned short euc_to_utf8_DB[] = {
-         0x66C4, 0x66B8, 0x66D6, 0x66DA, 0x66E0, 0x663F, 0x66E6,
- 0x66E9, 0x66F0, 0x66F5, 0x66F7, 0x670F, 0x6716, 0x671E, 0x6726,
- 0x6727, 0x9738, 0x672E, 0x673F, 0x6736, 0x6741, 0x6738, 0x6737,
- 0x6746, 0x675E, 0x6760, 0x6759, 0x6763, 0x6764, 0x6789, 0x6770,
- 0x67A9, 0x677C, 0x676A, 0x678C, 0x678B, 0x67A6, 0x67A1, 0x6785,
- 0x67B7, 0x67EF, 0x67B4, 0x67EC, 0x67B3, 0x67E9, 0x67B8, 0x67E4,
- 0x67DE, 0x67DD, 0x67E2, 0x67EE, 0x67B9, 0x67CE, 0x67C6, 0x67E7,
- 0x6A9C, 0x681E, 0x6846, 0x6829, 0x6840, 0x684D, 0x6832, 0x684E,
- 0x68B3, 0x682B, 0x6859, 0x6863, 0x6877, 0x687F, 0x689F, 0x688F,
- 0x68AD, 0x6894, 0x689D, 0x689B, 0x6883, 0x6AAE, 0x68B9, 0x6874,
- 0x68B5, 0x68A0, 0x68BA, 0x690F, 0x688D, 0x687E, 0x6901, 0x68CA,
- 0x6908, 0x68D8, 0x6922, 0x6926, 0x68E1, 0x690C, 0x68CD,
-};
-const unsigned short euc_to_utf8_DC[] = {
-         0x68D4, 0x68E7, 0x68D5, 0x6936, 0x6912, 0x6904, 0x68D7,
- 0x68E3, 0x6925, 0x68F9, 0x68E0, 0x68EF, 0x6928, 0x692A, 0x691A,
- 0x6923, 0x6921, 0x68C6, 0x6979, 0x6977, 0x695C, 0x6978, 0x696B,
- 0x6954, 0x697E, 0x696E, 0x6939, 0x6974, 0x693D, 0x6959, 0x6930,
- 0x6961, 0x695E, 0x695D, 0x6981, 0x696A, 0x69B2, 0x69AE, 0x69D0,
- 0x69BF, 0x69C1, 0x69D3, 0x69BE, 0x69CE, 0x5BE8, 0x69CA, 0x69DD,
- 0x69BB, 0x69C3, 0x69A7, 0x6A2E, 0x6991, 0x69A0, 0x699C, 0x6995,
- 0x69B4, 0x69DE, 0x69E8, 0x6A02, 0x6A1B, 0x69FF, 0x6B0A, 0x69F9,
- 0x69F2, 0x69E7, 0x6A05, 0x69B1, 0x6A1E, 0x69ED, 0x6A14, 0x69EB,
- 0x6A0A, 0x6A12, 0x6AC1, 0x6A23, 0x6A13, 0x6A44, 0x6A0C, 0x6A72,
- 0x6A36, 0x6A78, 0x6A47, 0x6A62, 0x6A59, 0x6A66, 0x6A48, 0x6A38,
- 0x6A22, 0x6A90, 0x6A8D, 0x6AA0, 0x6A84, 0x6AA2, 0x6AA3,
-};
-const unsigned short euc_to_utf8_DD[] = {
-         0x6A97, 0x8617, 0x6ABB, 0x6AC3, 0x6AC2, 0x6AB8, 0x6AB3,
- 0x6AAC, 0x6ADE, 0x6AD1, 0x6ADF, 0x6AAA, 0x6ADA, 0x6AEA, 0x6AFB,
- 0x6B05, 0x8616, 0x6AFA, 0x6B12, 0x6B16, 0x9B31, 0x6B1F, 0x6B38,
- 0x6B37, 0x76DC, 0x6B39, 0x98EE, 0x6B47, 0x6B43, 0x6B49, 0x6B50,
- 0x6B59, 0x6B54, 0x6B5B, 0x6B5F, 0x6B61, 0x6B78, 0x6B79, 0x6B7F,
- 0x6B80, 0x6B84, 0x6B83, 0x6B8D, 0x6B98, 0x6B95, 0x6B9E, 0x6BA4,
- 0x6BAA, 0x6BAB, 0x6BAF, 0x6BB2, 0x6BB1, 0x6BB3, 0x6BB7, 0x6BBC,
- 0x6BC6, 0x6BCB, 0x6BD3, 0x6BDF, 0x6BEC, 0x6BEB, 0x6BF3, 0x6BEF,
- 0x9EBE, 0x6C08, 0x6C13, 0x6C14, 0x6C1B, 0x6C24, 0x6C23, 0x6C5E,
- 0x6C55, 0x6C62, 0x6C6A, 0x6C82, 0x6C8D, 0x6C9A, 0x6C81, 0x6C9B,
- 0x6C7E, 0x6C68, 0x6C73, 0x6C92, 0x6C90, 0x6CC4, 0x6CF1, 0x6CD3,
- 0x6CBD, 0x6CD7, 0x6CC5, 0x6CDD, 0x6CAE, 0x6CB1, 0x6CBE,
-};
-const unsigned short euc_to_utf8_DE[] = {
-         0x6CBA, 0x6CDB, 0x6CEF, 0x6CD9, 0x6CEA, 0x6D1F, 0x884D,
- 0x6D36, 0x6D2B, 0x6D3D, 0x6D38, 0x6D19, 0x6D35, 0x6D33, 0x6D12,
- 0x6D0C, 0x6D63, 0x6D93, 0x6D64, 0x6D5A, 0x6D79, 0x6D59, 0x6D8E,
- 0x6D95, 0x6FE4, 0x6D85, 0x6DF9, 0x6E15, 0x6E0A, 0x6DB5, 0x6DC7,
- 0x6DE6, 0x6DB8, 0x6DC6, 0x6DEC, 0x6DDE, 0x6DCC, 0x6DE8, 0x6DD2,
- 0x6DC5, 0x6DFA, 0x6DD9, 0x6DE4, 0x6DD5, 0x6DEA, 0x6DEE, 0x6E2D,
- 0x6E6E, 0x6E2E, 0x6E19, 0x6E72, 0x6E5F, 0x6E3E, 0x6E23, 0x6E6B,
- 0x6E2B, 0x6E76, 0x6E4D, 0x6E1F, 0x6E43, 0x6E3A, 0x6E4E, 0x6E24,
- 0x6EFF, 0x6E1D, 0x6E38, 0x6E82, 0x6EAA, 0x6E98, 0x6EC9, 0x6EB7,
- 0x6ED3, 0x6EBD, 0x6EAF, 0x6EC4, 0x6EB2, 0x6ED4, 0x6ED5, 0x6E8F,
- 0x6EA5, 0x6EC2, 0x6E9F, 0x6F41, 0x6F11, 0x704C, 0x6EEC, 0x6EF8,
- 0x6EFE, 0x6F3F, 0x6EF2, 0x6F31, 0x6EEF, 0x6F32, 0x6ECC,
-};
-const unsigned short euc_to_utf8_DF[] = {
-         0x6F3E, 0x6F13, 0x6EF7, 0x6F86, 0x6F7A, 0x6F78, 0x6F81,
- 0x6F80, 0x6F6F, 0x6F5B, 0x6FF3, 0x6F6D, 0x6F82, 0x6F7C, 0x6F58,
- 0x6F8E, 0x6F91, 0x6FC2, 0x6F66, 0x6FB3, 0x6FA3, 0x6FA1, 0x6FA4,
- 0x6FB9, 0x6FC6, 0x6FAA, 0x6FDF, 0x6FD5, 0x6FEC, 0x6FD4, 0x6FD8,
- 0x6FF1, 0x6FEE, 0x6FDB, 0x7009, 0x700B, 0x6FFA, 0x7011, 0x7001,
- 0x700F, 0x6FFE, 0x701B, 0x701A, 0x6F74, 0x701D, 0x7018, 0x701F,
- 0x7030, 0x703E, 0x7032, 0x7051, 0x7063, 0x7099, 0x7092, 0x70AF,
- 0x70F1, 0x70AC, 0x70B8, 0x70B3, 0x70AE, 0x70DF, 0x70CB, 0x70DD,
- 0x70D9, 0x7109, 0x70FD, 0x711C, 0x7119, 0x7165, 0x7155, 0x7188,
- 0x7166, 0x7162, 0x714C, 0x7156, 0x716C, 0x718F, 0x71FB, 0x7184,
- 0x7195, 0x71A8, 0x71AC, 0x71D7, 0x71B9, 0x71BE, 0x71D2, 0x71C9,
- 0x71D4, 0x71CE, 0x71E0, 0x71EC, 0x71E7, 0x71F5, 0x71FC,
-};
-const unsigned short euc_to_utf8_E0[] = {
-         0x71F9, 0x71FF, 0x720D, 0x7210, 0x721B, 0x7228, 0x722D,
- 0x722C, 0x7230, 0x7232, 0x723B, 0x723C, 0x723F, 0x7240, 0x7246,
- 0x724B, 0x7258, 0x7274, 0x727E, 0x7282, 0x7281, 0x7287, 0x7292,
- 0x7296, 0x72A2, 0x72A7, 0x72B9, 0x72B2, 0x72C3, 0x72C6, 0x72C4,
- 0x72CE, 0x72D2, 0x72E2, 0x72E0, 0x72E1, 0x72F9, 0x72F7, 0x500F,
- 0x7317, 0x730A, 0x731C, 0x7316, 0x731D, 0x7334, 0x732F, 0x7329,
- 0x7325, 0x733E, 0x734E, 0x734F, 0x9ED8, 0x7357, 0x736A, 0x7368,
- 0x7370, 0x7378, 0x7375, 0x737B, 0x737A, 0x73C8, 0x73B3, 0x73CE,
- 0x73BB, 0x73C0, 0x73E5, 0x73EE, 0x73DE, 0x74A2, 0x7405, 0x746F,
- 0x7425, 0x73F8, 0x7432, 0x743A, 0x7455, 0x743F, 0x745F, 0x7459,
- 0x7441, 0x745C, 0x7469, 0x7470, 0x7463, 0x746A, 0x7476, 0x747E,
- 0x748B, 0x749E, 0x74A7, 0x74CA, 0x74CF, 0x74D4, 0x73F1,
-};
-const unsigned short euc_to_utf8_E1[] = {
-         0x74E0, 0x74E3, 0x74E7, 0x74E9, 0x74EE, 0x74F2, 0x74F0,
- 0x74F1, 0x74F8, 0x74F7, 0x7504, 0x7503, 0x7505, 0x750C, 0x750E,
- 0x750D, 0x7515, 0x7513, 0x751E, 0x7526, 0x752C, 0x753C, 0x7544,
- 0x754D, 0x754A, 0x7549, 0x755B, 0x7546, 0x755A, 0x7569, 0x7564,
- 0x7567, 0x756B, 0x756D, 0x7578, 0x7576, 0x7586, 0x7587, 0x7574,
- 0x758A, 0x7589, 0x7582, 0x7594, 0x759A, 0x759D, 0x75A5, 0x75A3,
- 0x75C2, 0x75B3, 0x75C3, 0x75B5, 0x75BD, 0x75B8, 0x75BC, 0x75B1,
- 0x75CD, 0x75CA, 0x75D2, 0x75D9, 0x75E3, 0x75DE, 0x75FE, 0x75FF,
- 0x75FC, 0x7601, 0x75F0, 0x75FA, 0x75F2, 0x75F3, 0x760B, 0x760D,
- 0x7609, 0x761F, 0x7627, 0x7620, 0x7621, 0x7622, 0x7624, 0x7634,
- 0x7630, 0x763B, 0x7647, 0x7648, 0x7646, 0x765C, 0x7658, 0x7661,
- 0x7662, 0x7668, 0x7669, 0x766A, 0x7667, 0x766C, 0x7670,
-};
-const unsigned short euc_to_utf8_E2[] = {
-         0x7672, 0x7676, 0x7678, 0x767C, 0x7680, 0x7683, 0x7688,
- 0x768B, 0x768E, 0x7696, 0x7693, 0x7699, 0x769A, 0x76B0, 0x76B4,
- 0x76B8, 0x76B9, 0x76BA, 0x76C2, 0x76CD, 0x76D6, 0x76D2, 0x76DE,
- 0x76E1, 0x76E5, 0x76E7, 0x76EA, 0x862F, 0x76FB, 0x7708, 0x7707,
- 0x7704, 0x7729, 0x7724, 0x771E, 0x7725, 0x7726, 0x771B, 0x7737,
- 0x7738, 0x7747, 0x775A, 0x7768, 0x776B, 0x775B, 0x7765, 0x777F,
- 0x777E, 0x7779, 0x778E, 0x778B, 0x7791, 0x77A0, 0x779E, 0x77B0,
- 0x77B6, 0x77B9, 0x77BF, 0x77BC, 0x77BD, 0x77BB, 0x77C7, 0x77CD,
- 0x77D7, 0x77DA, 0x77DC, 0x77E3, 0x77EE, 0x77FC, 0x780C, 0x7812,
- 0x7926, 0x7820, 0x792A, 0x7845, 0x788E, 0x7874, 0x7886, 0x787C,
- 0x789A, 0x788C, 0x78A3, 0x78B5, 0x78AA, 0x78AF, 0x78D1, 0x78C6,
- 0x78CB, 0x78D4, 0x78BE, 0x78BC, 0x78C5, 0x78CA, 0x78EC,
-};
-const unsigned short euc_to_utf8_E3[] = {
-         0x78E7, 0x78DA, 0x78FD, 0x78F4, 0x7907, 0x7912, 0x7911,
- 0x7919, 0x792C, 0x792B, 0x7940, 0x7960, 0x7957, 0x795F, 0x795A,
- 0x7955, 0x7953, 0x797A, 0x797F, 0x798A, 0x799D, 0x79A7, 0x9F4B,
- 0x79AA, 0x79AE, 0x79B3, 0x79B9, 0x79BA, 0x79C9, 0x79D5, 0x79E7,
- 0x79EC, 0x79E1, 0x79E3, 0x7A08, 0x7A0D, 0x7A18, 0x7A19, 0x7A20,
- 0x7A1F, 0x7980, 0x7A31, 0x7A3B, 0x7A3E, 0x7A37, 0x7A43, 0x7A57,
- 0x7A49, 0x7A61, 0x7A62, 0x7A69, 0x9F9D, 0x7A70, 0x7A79, 0x7A7D,
- 0x7A88, 0x7A97, 0x7A95, 0x7A98, 0x7A96, 0x7AA9, 0x7AC8, 0x7AB0,
- 0x7AB6, 0x7AC5, 0x7AC4, 0x7ABF, 0x9083, 0x7AC7, 0x7ACA, 0x7ACD,
- 0x7ACF, 0x7AD5, 0x7AD3, 0x7AD9, 0x7ADA, 0x7ADD, 0x7AE1, 0x7AE2,
- 0x7AE6, 0x7AED, 0x7AF0, 0x7B02, 0x7B0F, 0x7B0A, 0x7B06, 0x7B33,
- 0x7B18, 0x7B19, 0x7B1E, 0x7B35, 0x7B28, 0x7B36, 0x7B50,
-};
-const unsigned short euc_to_utf8_E4[] = {
-         0x7B7A, 0x7B04, 0x7B4D, 0x7B0B, 0x7B4C, 0x7B45, 0x7B75,
- 0x7B65, 0x7B74, 0x7B67, 0x7B70, 0x7B71, 0x7B6C, 0x7B6E, 0x7B9D,
- 0x7B98, 0x7B9F, 0x7B8D, 0x7B9C, 0x7B9A, 0x7B8B, 0x7B92, 0x7B8F,
- 0x7B5D, 0x7B99, 0x7BCB, 0x7BC1, 0x7BCC, 0x7BCF, 0x7BB4, 0x7BC6,
- 0x7BDD, 0x7BE9, 0x7C11, 0x7C14, 0x7BE6, 0x7BE5, 0x7C60, 0x7C00,
- 0x7C07, 0x7C13, 0x7BF3, 0x7BF7, 0x7C17, 0x7C0D, 0x7BF6, 0x7C23,
- 0x7C27, 0x7C2A, 0x7C1F, 0x7C37, 0x7C2B, 0x7C3D, 0x7C4C, 0x7C43,
- 0x7C54, 0x7C4F, 0x7C40, 0x7C50, 0x7C58, 0x7C5F, 0x7C64, 0x7C56,
- 0x7C65, 0x7C6C, 0x7C75, 0x7C83, 0x7C90, 0x7CA4, 0x7CAD, 0x7CA2,
- 0x7CAB, 0x7CA1, 0x7CA8, 0x7CB3, 0x7CB2, 0x7CB1, 0x7CAE, 0x7CB9,
- 0x7CBD, 0x7CC0, 0x7CC5, 0x7CC2, 0x7CD8, 0x7CD2, 0x7CDC, 0x7CE2,
- 0x9B3B, 0x7CEF, 0x7CF2, 0x7CF4, 0x7CF6, 0x7CFA, 0x7D06,
-};
-const unsigned short euc_to_utf8_E5[] = {
-         0x7D02, 0x7D1C, 0x7D15, 0x7D0A, 0x7D45, 0x7D4B, 0x7D2E,
- 0x7D32, 0x7D3F, 0x7D35, 0x7D46, 0x7D73, 0x7D56, 0x7D4E, 0x7D72,
- 0x7D68, 0x7D6E, 0x7D4F, 0x7D63, 0x7D93, 0x7D89, 0x7D5B, 0x7D8F,
- 0x7D7D, 0x7D9B, 0x7DBA, 0x7DAE, 0x7DA3, 0x7DB5, 0x7DC7, 0x7DBD,
- 0x7DAB, 0x7E3D, 0x7DA2, 0x7DAF, 0x7DDC, 0x7DB8, 0x7D9F, 0x7DB0,
- 0x7DD8, 0x7DDD, 0x7DE4, 0x7DDE, 0x7DFB, 0x7DF2, 0x7DE1, 0x7E05,
- 0x7E0A, 0x7E23, 0x7E21, 0x7E12, 0x7E31, 0x7E1F, 0x7E09, 0x7E0B,
- 0x7E22, 0x7E46, 0x7E66, 0x7E3B, 0x7E35, 0x7E39, 0x7E43, 0x7E37,
- 0x7E32, 0x7E3A, 0x7E67, 0x7E5D, 0x7E56, 0x7E5E, 0x7E59, 0x7E5A,
- 0x7E79, 0x7E6A, 0x7E69, 0x7E7C, 0x7E7B, 0x7E83, 0x7DD5, 0x7E7D,
- 0x8FAE, 0x7E7F, 0x7E88, 0x7E89, 0x7E8C, 0x7E92, 0x7E90, 0x7E93,
- 0x7E94, 0x7E96, 0x7E8E, 0x7E9B, 0x7E9C, 0x7F38, 0x7F3A,
-};
-const unsigned short euc_to_utf8_E6[] = {
-         0x7F45, 0x7F4C, 0x7F4D, 0x7F4E, 0x7F50, 0x7F51, 0x7F55,
- 0x7F54, 0x7F58, 0x7F5F, 0x7F60, 0x7F68, 0x7F69, 0x7F67, 0x7F78,
- 0x7F82, 0x7F86, 0x7F83, 0x7F88, 0x7F87, 0x7F8C, 0x7F94, 0x7F9E,
- 0x7F9D, 0x7F9A, 0x7FA3, 0x7FAF, 0x7FB2, 0x7FB9, 0x7FAE, 0x7FB6,
- 0x7FB8, 0x8B71, 0x7FC5, 0x7FC6, 0x7FCA, 0x7FD5, 0x7FD4, 0x7FE1,
- 0x7FE6, 0x7FE9, 0x7FF3, 0x7FF9, 0x98DC, 0x8006, 0x8004, 0x800B,
- 0x8012, 0x8018, 0x8019, 0x801C, 0x8021, 0x8028, 0x803F, 0x803B,
- 0x804A, 0x8046, 0x8052, 0x8058, 0x805A, 0x805F, 0x8062, 0x8068,
- 0x8073, 0x8072, 0x8070, 0x8076, 0x8079, 0x807D, 0x807F, 0x8084,
- 0x8086, 0x8085, 0x809B, 0x8093, 0x809A, 0x80AD, 0x5190, 0x80AC,
- 0x80DB, 0x80E5, 0x80D9, 0x80DD, 0x80C4, 0x80DA, 0x80D6, 0x8109,
- 0x80EF, 0x80F1, 0x811B, 0x8129, 0x8123, 0x812F, 0x814B,
-};
-const unsigned short euc_to_utf8_E7[] = {
-         0x968B, 0x8146, 0x813E, 0x8153, 0x8151, 0x80FC, 0x8171,
- 0x816E, 0x8165, 0x8166, 0x8174, 0x8183, 0x8188, 0x818A, 0x8180,
- 0x8182, 0x81A0, 0x8195, 0x81A4, 0x81A3, 0x815F, 0x8193, 0x81A9,
- 0x81B0, 0x81B5, 0x81BE, 0x81B8, 0x81BD, 0x81C0, 0x81C2, 0x81BA,
- 0x81C9, 0x81CD, 0x81D1, 0x81D9, 0x81D8, 0x81C8, 0x81DA, 0x81DF,
- 0x81E0, 0x81E7, 0x81FA, 0x81FB, 0x81FE, 0x8201, 0x8202, 0x8205,
- 0x8207, 0x820A, 0x820D, 0x8210, 0x8216, 0x8229, 0x822B, 0x8238,
- 0x8233, 0x8240, 0x8259, 0x8258, 0x825D, 0x825A, 0x825F, 0x8264,
- 0x8262, 0x8268, 0x826A, 0x826B, 0x822E, 0x8271, 0x8277, 0x8278,
- 0x827E, 0x828D, 0x8292, 0x82AB, 0x829F, 0x82BB, 0x82AC, 0x82E1,
- 0x82E3, 0x82DF, 0x82D2, 0x82F4, 0x82F3, 0x82FA, 0x8393, 0x8303,
- 0x82FB, 0x82F9, 0x82DE, 0x8306, 0x82DC, 0x8309, 0x82D9,
-};
-const unsigned short euc_to_utf8_E8[] = {
-         0x8335, 0x8334, 0x8316, 0x8332, 0x8331, 0x8340, 0x8339,
- 0x8350, 0x8345, 0x832F, 0x832B, 0x8317, 0x8318, 0x8385, 0x839A,
- 0x83AA, 0x839F, 0x83A2, 0x8396, 0x8323, 0x838E, 0x8387, 0x838A,
- 0x837C, 0x83B5, 0x8373, 0x8375, 0x83A0, 0x8389, 0x83A8, 0x83F4,
- 0x8413, 0x83EB, 0x83CE, 0x83FD, 0x8403, 0x83D8, 0x840B, 0x83C1,
- 0x83F7, 0x8407, 0x83E0, 0x83F2, 0x840D, 0x8422, 0x8420, 0x83BD,
- 0x8438, 0x8506, 0x83FB, 0x846D, 0x842A, 0x843C, 0x855A, 0x8484,
- 0x8477, 0x846B, 0x84AD, 0x846E, 0x8482, 0x8469, 0x8446, 0x842C,
- 0x846F, 0x8479, 0x8435, 0x84CA, 0x8462, 0x84B9, 0x84BF, 0x849F,
- 0x84D9, 0x84CD, 0x84BB, 0x84DA, 0x84D0, 0x84C1, 0x84C6, 0x84D6,
- 0x84A1, 0x8521, 0x84FF, 0x84F4, 0x8517, 0x8518, 0x852C, 0x851F,
- 0x8515, 0x8514, 0x84FC, 0x8540, 0x8563, 0x8558, 0x8548,
-};
-const unsigned short euc_to_utf8_E9[] = {
-         0x8541, 0x8602, 0x854B, 0x8555, 0x8580, 0x85A4, 0x8588,
- 0x8591, 0x858A, 0x85A8, 0x856D, 0x8594, 0x859B, 0x85EA, 0x8587,
- 0x859C, 0x8577, 0x857E, 0x8590, 0x85C9, 0x85BA, 0x85CF, 0x85B9,
- 0x85D0, 0x85D5, 0x85DD, 0x85E5, 0x85DC, 0x85F9, 0x860A, 0x8613,
- 0x860B, 0x85FE, 0x85FA, 0x8606, 0x8622, 0x861A, 0x8630, 0x863F,
- 0x864D, 0x4E55, 0x8654, 0x865F, 0x8667, 0x8671, 0x8693, 0x86A3,
- 0x86A9, 0x86AA, 0x868B, 0x868C, 0x86B6, 0x86AF, 0x86C4, 0x86C6,
- 0x86B0, 0x86C9, 0x8823, 0x86AB, 0x86D4, 0x86DE, 0x86E9, 0x86EC,
- 0x86DF, 0x86DB, 0x86EF, 0x8712, 0x8706, 0x8708, 0x8700, 0x8703,
- 0x86FB, 0x8711, 0x8709, 0x870D, 0x86F9, 0x870A, 0x8734, 0x873F,
- 0x8737, 0x873B, 0x8725, 0x8729, 0x871A, 0x8760, 0x875F, 0x8778,
- 0x874C, 0x874E, 0x8774, 0x8757, 0x8768, 0x876E, 0x8759,
-};
-const unsigned short euc_to_utf8_EA[] = {
-         0x8753, 0x8763, 0x876A, 0x8805, 0x87A2, 0x879F, 0x8782,
- 0x87AF, 0x87CB, 0x87BD, 0x87C0, 0x87D0, 0x96D6, 0x87AB, 0x87C4,
- 0x87B3, 0x87C7, 0x87C6, 0x87BB, 0x87EF, 0x87F2, 0x87E0, 0x880F,
- 0x880D, 0x87FE, 0x87F6, 0x87F7, 0x880E, 0x87D2, 0x8811, 0x8816,
- 0x8815, 0x8822, 0x8821, 0x8831, 0x8836, 0x8839, 0x8827, 0x883B,
- 0x8844, 0x8842, 0x8852, 0x8859, 0x885E, 0x8862, 0x886B, 0x8881,
- 0x887E, 0x889E, 0x8875, 0x887D, 0x88B5, 0x8872, 0x8882, 0x8897,
- 0x8892, 0x88AE, 0x8899, 0x88A2, 0x888D, 0x88A4, 0x88B0, 0x88BF,
- 0x88B1, 0x88C3, 0x88C4, 0x88D4, 0x88D8, 0x88D9, 0x88DD, 0x88F9,
- 0x8902, 0x88FC, 0x88F4, 0x88E8, 0x88F2, 0x8904, 0x890C, 0x890A,
- 0x8913, 0x8943, 0x891E, 0x8925, 0x892A, 0x892B, 0x8941, 0x8944,
- 0x893B, 0x8936, 0x8938, 0x894C, 0x891D, 0x8960, 0x895E,
-};
-const unsigned short euc_to_utf8_EB[] = {
-         0x8966, 0x8964, 0x896D, 0x896A, 0x896F, 0x8974, 0x8977,
- 0x897E, 0x8983, 0x8988, 0x898A, 0x8993, 0x8998, 0x89A1, 0x89A9,
- 0x89A6, 0x89AC, 0x89AF, 0x89B2, 0x89BA, 0x89BD, 0x89BF, 0x89C0,
- 0x89DA, 0x89DC, 0x89DD, 0x89E7, 0x89F4, 0x89F8, 0x8A03, 0x8A16,
- 0x8A10, 0x8A0C, 0x8A1B, 0x8A1D, 0x8A25, 0x8A36, 0x8A41, 0x8A5B,
- 0x8A52, 0x8A46, 0x8A48, 0x8A7C, 0x8A6D, 0x8A6C, 0x8A62, 0x8A85,
- 0x8A82, 0x8A84, 0x8AA8, 0x8AA1, 0x8A91, 0x8AA5, 0x8AA6, 0x8A9A,
- 0x8AA3, 0x8AC4, 0x8ACD, 0x8AC2, 0x8ADA, 0x8AEB, 0x8AF3, 0x8AE7,
- 0x8AE4, 0x8AF1, 0x8B14, 0x8AE0, 0x8AE2, 0x8AF7, 0x8ADE, 0x8ADB,
- 0x8B0C, 0x8B07, 0x8B1A, 0x8AE1, 0x8B16, 0x8B10, 0x8B17, 0x8B20,
- 0x8B33, 0x97AB, 0x8B26, 0x8B2B, 0x8B3E, 0x8B28, 0x8B41, 0x8B4C,
- 0x8B4F, 0x8B4E, 0x8B49, 0x8B56, 0x8B5B, 0x8B5A, 0x8B6B,
-};
-const unsigned short euc_to_utf8_EC[] = {
-         0x8B5F, 0x8B6C, 0x8B6F, 0x8B74, 0x8B7D, 0x8B80, 0x8B8C,
- 0x8B8E, 0x8B92, 0x8B93, 0x8B96, 0x8B99, 0x8B9A, 0x8C3A, 0x8C41,
- 0x8C3F, 0x8C48, 0x8C4C, 0x8C4E, 0x8C50, 0x8C55, 0x8C62, 0x8C6C,
- 0x8C78, 0x8C7A, 0x8C82, 0x8C89, 0x8C85, 0x8C8A, 0x8C8D, 0x8C8E,
- 0x8C94, 0x8C7C, 0x8C98, 0x621D, 0x8CAD, 0x8CAA, 0x8CBD, 0x8CB2,
- 0x8CB3, 0x8CAE, 0x8CB6, 0x8CC8, 0x8CC1, 0x8CE4, 0x8CE3, 0x8CDA,
- 0x8CFD, 0x8CFA, 0x8CFB, 0x8D04, 0x8D05, 0x8D0A, 0x8D07, 0x8D0F,
- 0x8D0D, 0x8D10, 0x9F4E, 0x8D13, 0x8CCD, 0x8D14, 0x8D16, 0x8D67,
- 0x8D6D, 0x8D71, 0x8D73, 0x8D81, 0x8D99, 0x8DC2, 0x8DBE, 0x8DBA,
- 0x8DCF, 0x8DDA, 0x8DD6, 0x8DCC, 0x8DDB, 0x8DCB, 0x8DEA, 0x8DEB,
- 0x8DDF, 0x8DE3, 0x8DFC, 0x8E08, 0x8E09, 0x8DFF, 0x8E1D, 0x8E1E,
- 0x8E10, 0x8E1F, 0x8E42, 0x8E35, 0x8E30, 0x8E34, 0x8E4A,
-};
-const unsigned short euc_to_utf8_ED[] = {
-         0x8E47, 0x8E49, 0x8E4C, 0x8E50, 0x8E48, 0x8E59, 0x8E64,
- 0x8E60, 0x8E2A, 0x8E63, 0x8E55, 0x8E76, 0x8E72, 0x8E7C, 0x8E81,
- 0x8E87, 0x8E85, 0x8E84, 0x8E8B, 0x8E8A, 0x8E93, 0x8E91, 0x8E94,
- 0x8E99, 0x8EAA, 0x8EA1, 0x8EAC, 0x8EB0, 0x8EC6, 0x8EB1, 0x8EBE,
- 0x8EC5, 0x8EC8, 0x8ECB, 0x8EDB, 0x8EE3, 0x8EFC, 0x8EFB, 0x8EEB,
- 0x8EFE, 0x8F0A, 0x8F05, 0x8F15, 0x8F12, 0x8F19, 0x8F13, 0x8F1C,
- 0x8F1F, 0x8F1B, 0x8F0C, 0x8F26, 0x8F33, 0x8F3B, 0x8F39, 0x8F45,
- 0x8F42, 0x8F3E, 0x8F4C, 0x8F49, 0x8F46, 0x8F4E, 0x8F57, 0x8F5C,
- 0x8F62, 0x8F63, 0x8F64, 0x8F9C, 0x8F9F, 0x8FA3, 0x8FAD, 0x8FAF,
- 0x8FB7, 0x8FDA, 0x8FE5, 0x8FE2, 0x8FEA, 0x8FEF, 0x9087, 0x8FF4,
- 0x9005, 0x8FF9, 0x8FFA, 0x9011, 0x9015, 0x9021, 0x900D, 0x901E,
- 0x9016, 0x900B, 0x9027, 0x9036, 0x9035, 0x9039, 0x8FF8,
-};
-const unsigned short euc_to_utf8_EE[] = {
-         0x904F, 0x9050, 0x9051, 0x9052, 0x900E, 0x9049, 0x903E,
- 0x9056, 0x9058, 0x905E, 0x9068, 0x906F, 0x9076, 0x96A8, 0x9072,
- 0x9082, 0x907D, 0x9081, 0x9080, 0x908A, 0x9089, 0x908F, 0x90A8,
- 0x90AF, 0x90B1, 0x90B5, 0x90E2, 0x90E4, 0x6248, 0x90DB, 0x9102,
- 0x9112, 0x9119, 0x9132, 0x9130, 0x914A, 0x9156, 0x9158, 0x9163,
- 0x9165, 0x9169, 0x9173, 0x9172, 0x918B, 0x9189, 0x9182, 0x91A2,
- 0x91AB, 0x91AF, 0x91AA, 0x91B5, 0x91B4, 0x91BA, 0x91C0, 0x91C1,
- 0x91C9, 0x91CB, 0x91D0, 0x91D6, 0x91DF, 0x91E1, 0x91DB, 0x91FC,
- 0x91F5, 0x91F6, 0x921E, 0x91FF, 0x9214, 0x922C, 0x9215, 0x9211,
- 0x925E, 0x9257, 0x9245, 0x9249, 0x9264, 0x9248, 0x9295, 0x923F,
- 0x924B, 0x9250, 0x929C, 0x9296, 0x9293, 0x929B, 0x925A, 0x92CF,
- 0x92B9, 0x92B7, 0x92E9, 0x930F, 0x92FA, 0x9344, 0x932E,
-};
-const unsigned short euc_to_utf8_EF[] = {
-         0x9319, 0x9322, 0x931A, 0x9323, 0x933A, 0x9335, 0x933B,
- 0x935C, 0x9360, 0x937C, 0x936E, 0x9356, 0x93B0, 0x93AC, 0x93AD,
- 0x9394, 0x93B9, 0x93D6, 0x93D7, 0x93E8, 0x93E5, 0x93D8, 0x93C3,
- 0x93DD, 0x93D0, 0x93C8, 0x93E4, 0x941A, 0x9414, 0x9413, 0x9403,
- 0x9407, 0x9410, 0x9436, 0x942B, 0x9435, 0x9421, 0x943A, 0x9441,
- 0x9452, 0x9444, 0x945B, 0x9460, 0x9462, 0x945E, 0x946A, 0x9229,
- 0x9470, 0x9475, 0x9477, 0x947D, 0x945A, 0x947C, 0x947E, 0x9481,
- 0x947F, 0x9582, 0x9587, 0x958A, 0x9594, 0x9596, 0x9598, 0x9599,
- 0x95A0, 0x95A8, 0x95A7, 0x95AD, 0x95BC, 0x95BB, 0x95B9, 0x95BE,
- 0x95CA, 0x6FF6, 0x95C3, 0x95CD, 0x95CC, 0x95D5, 0x95D4, 0x95D6,
- 0x95DC, 0x95E1, 0x95E5, 0x95E2, 0x9621, 0x9628, 0x962E, 0x962F,
- 0x9642, 0x964C, 0x964F, 0x964B, 0x9677, 0x965C, 0x965E,
-};
-const unsigned short euc_to_utf8_F0[] = {
-         0x965D, 0x965F, 0x9666, 0x9672, 0x966C, 0x968D, 0x9698,
- 0x9695, 0x9697, 0x96AA, 0x96A7, 0x96B1, 0x96B2, 0x96B0, 0x96B4,
- 0x96B6, 0x96B8, 0x96B9, 0x96CE, 0x96CB, 0x96C9, 0x96CD, 0x894D,
- 0x96DC, 0x970D, 0x96D5, 0x96F9, 0x9704, 0x9706, 0x9708, 0x9713,
- 0x970E, 0x9711, 0x970F, 0x9716, 0x9719, 0x9724, 0x972A, 0x9730,
- 0x9739, 0x973D, 0x973E, 0x9744, 0x9746, 0x9748, 0x9742, 0x9749,
- 0x975C, 0x9760, 0x9764, 0x9766, 0x9768, 0x52D2, 0x976B, 0x9771,
- 0x9779, 0x9785, 0x977C, 0x9781, 0x977A, 0x9786, 0x978B, 0x978F,
- 0x9790, 0x979C, 0x97A8, 0x97A6, 0x97A3, 0x97B3, 0x97B4, 0x97C3,
- 0x97C6, 0x97C8, 0x97CB, 0x97DC, 0x97ED, 0x9F4F, 0x97F2, 0x7ADF,
- 0x97F6, 0x97F5, 0x980F, 0x980C, 0x9838, 0x9824, 0x9821, 0x9837,
- 0x983D, 0x9846, 0x984F, 0x984B, 0x986B, 0x986F, 0x9870,
-};
-const unsigned short euc_to_utf8_F1[] = {
-         0x9871, 0x9874, 0x9873, 0x98AA, 0x98AF, 0x98B1, 0x98B6,
- 0x98C4, 0x98C3, 0x98C6, 0x98E9, 0x98EB, 0x9903, 0x9909, 0x9912,
- 0x9914, 0x9918, 0x9921, 0x991D, 0x991E, 0x9924, 0x9920, 0x992C,
- 0x992E, 0x993D, 0x993E, 0x9942, 0x9949, 0x9945, 0x9950, 0x994B,
- 0x9951, 0x9952, 0x994C, 0x9955, 0x9997, 0x9998, 0x99A5, 0x99AD,
- 0x99AE, 0x99BC, 0x99DF, 0x99DB, 0x99DD, 0x99D8, 0x99D1, 0x99ED,
- 0x99EE, 0x99F1, 0x99F2, 0x99FB, 0x99F8, 0x9A01, 0x9A0F, 0x9A05,
- 0x99E2, 0x9A19, 0x9A2B, 0x9A37, 0x9A45, 0x9A42, 0x9A40, 0x9A43,
- 0x9A3E, 0x9A55, 0x9A4D, 0x9A5B, 0x9A57, 0x9A5F, 0x9A62, 0x9A65,
- 0x9A64, 0x9A69, 0x9A6B, 0x9A6A, 0x9AAD, 0x9AB0, 0x9ABC, 0x9AC0,
- 0x9ACF, 0x9AD1, 0x9AD3, 0x9AD4, 0x9ADE, 0x9ADF, 0x9AE2, 0x9AE3,
- 0x9AE6, 0x9AEF, 0x9AEB, 0x9AEE, 0x9AF4, 0x9AF1, 0x9AF7,
-};
-const unsigned short euc_to_utf8_F2[] = {
-         0x9AFB, 0x9B06, 0x9B18, 0x9B1A, 0x9B1F, 0x9B22, 0x9B23,
- 0x9B25, 0x9B27, 0x9B28, 0x9B29, 0x9B2A, 0x9B2E, 0x9B2F, 0x9B32,
- 0x9B44, 0x9B43, 0x9B4F, 0x9B4D, 0x9B4E, 0x9B51, 0x9B58, 0x9B74,
- 0x9B93, 0x9B83, 0x9B91, 0x9B96, 0x9B97, 0x9B9F, 0x9BA0, 0x9BA8,
- 0x9BB4, 0x9BC0, 0x9BCA, 0x9BB9, 0x9BC6, 0x9BCF, 0x9BD1, 0x9BD2,
- 0x9BE3, 0x9BE2, 0x9BE4, 0x9BD4, 0x9BE1, 0x9C3A, 0x9BF2, 0x9BF1,
- 0x9BF0, 0x9C15, 0x9C14, 0x9C09, 0x9C13, 0x9C0C, 0x9C06, 0x9C08,
- 0x9C12, 0x9C0A, 0x9C04, 0x9C2E, 0x9C1B, 0x9C25, 0x9C24, 0x9C21,
- 0x9C30, 0x9C47, 0x9C32, 0x9C46, 0x9C3E, 0x9C5A, 0x9C60, 0x9C67,
- 0x9C76, 0x9C78, 0x9CE7, 0x9CEC, 0x9CF0, 0x9D09, 0x9D08, 0x9CEB,
- 0x9D03, 0x9D06, 0x9D2A, 0x9D26, 0x9DAF, 0x9D23, 0x9D1F, 0x9D44,
- 0x9D15, 0x9D12, 0x9D41, 0x9D3F, 0x9D3E, 0x9D46, 0x9D48,
-};
-const unsigned short euc_to_utf8_F3[] = {
-         0x9D5D, 0x9D5E, 0x9D64, 0x9D51, 0x9D50, 0x9D59, 0x9D72,
- 0x9D89, 0x9D87, 0x9DAB, 0x9D6F, 0x9D7A, 0x9D9A, 0x9DA4, 0x9DA9,
- 0x9DB2, 0x9DC4, 0x9DC1, 0x9DBB, 0x9DB8, 0x9DBA, 0x9DC6, 0x9DCF,
- 0x9DC2, 0x9DD9, 0x9DD3, 0x9DF8, 0x9DE6, 0x9DED, 0x9DEF, 0x9DFD,
- 0x9E1A, 0x9E1B, 0x9E1E, 0x9E75, 0x9E79, 0x9E7D, 0x9E81, 0x9E88,
- 0x9E8B, 0x9E8C, 0x9E92, 0x9E95, 0x9E91, 0x9E9D, 0x9EA5, 0x9EA9,
- 0x9EB8, 0x9EAA, 0x9EAD, 0x9761, 0x9ECC, 0x9ECE, 0x9ECF, 0x9ED0,
- 0x9ED4, 0x9EDC, 0x9EDE, 0x9EDD, 0x9EE0, 0x9EE5, 0x9EE8, 0x9EEF,
- 0x9EF4, 0x9EF6, 0x9EF7, 0x9EF9, 0x9EFB, 0x9EFC, 0x9EFD, 0x9F07,
- 0x9F08, 0x76B7, 0x9F15, 0x9F21, 0x9F2C, 0x9F3E, 0x9F4A, 0x9F52,
- 0x9F54, 0x9F63, 0x9F5F, 0x9F60, 0x9F61, 0x9F66, 0x9F67, 0x9F6C,
- 0x9F6A, 0x9F77, 0x9F72, 0x9F76, 0x9F95, 0x9F9C, 0x9FA0,
-};
-const unsigned short euc_to_utf8_F4[] = {
-         0x582F, 0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199,      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,      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,
-};
-const unsigned short euc_to_utf8_F5[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFE33,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFE31,      0,      0,
-      0,      0,      0,      0,      0, 0xFE30,      0,      0,
-      0,      0, 0xFE35, 0xFE36, 0xFE39, 0xFE3A,      0,      0,
- 0xFE37, 0xFE38, 0xFE3F, 0xFE40, 0xFE3D, 0xFE3E, 0xFE41, 0xFE42,
- 0xFE43, 0xFE44, 0xFE3B, 0xFE3C,      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,
-};
-const unsigned short euc_to_utf8_F9[] = {
-         0x7E8A, 0x891C, 0x9348, 0x9288, 0x84DC, 0x4FC9, 0x70BB,
- 0x6631, 0x68C8, 0x92F9, 0x66FB, 0x5F45, 0x4E28, 0x4EE1, 0x4EFC,
- 0x4F00, 0x4F03, 0x4F39, 0x4F56, 0x4F92, 0x4F8A, 0x4F9A, 0x4F94,
- 0x4FCD, 0x5040, 0x5022, 0x4FFF, 0x501E, 0x5046, 0x5070, 0x5042,
- 0x5094, 0x50F4, 0x50D8, 0x514A, 0x5164, 0x519D, 0x51BE, 0x51EC,
- 0x5215, 0x529C, 0x52A6, 0x52C0, 0x52DB, 0x5300, 0x5307, 0x5324,
- 0x5372, 0x5393, 0x53B2, 0x53DD, 0xFA0E, 0x549C, 0x548A, 0x54A9,
- 0x54FF, 0x5586, 0x5759, 0x5765, 0x57AC, 0x57C8, 0x57C7, 0xFA0F,
- 0xFA10, 0x589E, 0x58B2, 0x590B, 0x5953, 0x595B, 0x595D, 0x5963,
- 0x59A4, 0x59BA, 0x5B56, 0x5BC0, 0x752F, 0x5BD8, 0x5BEC, 0x5C1E,
- 0x5CA6, 0x5CBA, 0x5CF5, 0x5D27, 0x5D53, 0xFA11, 0x5D42, 0x5D6D,
- 0x5DB8, 0x5DB9, 0x5DD0, 0x5F21, 0x5F34, 0x5F67, 0x5FB7,
-};
-const unsigned short euc_to_utf8_FA[] = {
-         0x5FDE, 0x605D, 0x6085, 0x608A, 0x60DE, 0x60D5, 0x6120,
- 0x60F2, 0x6111, 0x6137, 0x6130, 0x6198, 0x6213, 0x62A6, 0x63F5,
- 0x6460, 0x649D, 0x64CE, 0x654E, 0x6600, 0x6615, 0x663B, 0x6609,
- 0x662E, 0x661E, 0x6624, 0x6665, 0x6657, 0x6659, 0xFA12, 0x6673,
- 0x6699, 0x66A0, 0x66B2, 0x66BF, 0x66FA, 0x670E, 0xF929, 0x6766,
- 0x67BB, 0x6852, 0x67C0, 0x6801, 0x6844, 0x68CF, 0xFA13, 0x6968,
- 0xFA14, 0x6998, 0x69E2, 0x6A30, 0x6A6B, 0x6A46, 0x6A73, 0x6A7E,
- 0x6AE2, 0x6AE4, 0x6BD6, 0x6C3F, 0x6C5C, 0x6C86, 0x6C6F, 0x6CDA,
- 0x6D04, 0x6D87, 0x6D6F, 0x6D96, 0x6DAC, 0x6DCF, 0x6DF8, 0x6DF2,
- 0x6DFC, 0x6E39, 0x6E5C, 0x6E27, 0x6E3C, 0x6EBF, 0x6F88, 0x6FB5,
- 0x6FF5, 0x7005, 0x7007, 0x7028, 0x7085, 0x70AB, 0x710F, 0x7104,
- 0x715C, 0x7146, 0x7147, 0xFA15, 0x71C1, 0x71FE, 0x72B1,
-};
-const unsigned short euc_to_utf8_FB[] = {
-         0x72BE, 0x7324, 0xFA16, 0x7377, 0x73BD, 0x73C9, 0x73D6,
- 0x73E3, 0x73D2, 0x7407, 0x73F5, 0x7426, 0x742A, 0x7429, 0x742E,
- 0x7462, 0x7489, 0x749F, 0x7501, 0x756F, 0x7682, 0x769C, 0x769E,
- 0x769B, 0x76A6, 0xFA17, 0x7746, 0x52AF, 0x7821, 0x784E, 0x7864,
- 0x787A, 0x7930, 0xFA18, 0xFA19, 0xFA1A, 0x7994, 0xFA1B, 0x799B,
- 0x7AD1, 0x7AE7, 0xFA1C, 0x7AEB, 0x7B9E, 0xFA1D, 0x7D48, 0x7D5C,
- 0x7DB7, 0x7DA0, 0x7DD6, 0x7E52, 0x7F47, 0x7FA1, 0xFA1E, 0x8301,
- 0x8362, 0x837F, 0x83C7, 0x83F6, 0x8448, 0x84B4, 0x8553, 0x8559,
- 0x856B, 0xFA1F, 0x85B0, 0xFA20, 0xFA21, 0x8807, 0x88F5, 0x8A12,
- 0x8A37, 0x8A79, 0x8AA7, 0x8ABE, 0x8ADF, 0xFA22, 0x8AF6, 0x8B53,
- 0x8B7F, 0x8CF0, 0x8CF4, 0x8D12, 0x8D76, 0xFA23, 0x8ECF, 0xFA24,
- 0xFA25, 0x9067, 0x90DE, 0xFA26, 0x9115, 0x9127, 0x91DA,
-};
-const unsigned short euc_to_utf8_FC[] = {
-         0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
- 0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
- 0x9239, 0x9267, 0x92A7, 0x9277, 0x9278, 0x92E7, 0x92D7, 0x92D9,
- 0x92D0, 0xFA27, 0x92D5, 0x92E0, 0x92D3, 0x9325, 0x9321, 0x92FB,
- 0xFA28, 0x931E, 0x92FF, 0x931D, 0x9302, 0x9370, 0x9357, 0x93A4,
- 0x93C6, 0x93DE, 0x93F8, 0x9431, 0x9445, 0x9448, 0x9592, 0xF9DC,
- 0xFA29, 0x969D, 0x96AF, 0x9733, 0x973B, 0x9743, 0x974D, 0x974F,
- 0x9751, 0x9755, 0x9857, 0x9865, 0xFA2A, 0xFA2B, 0x9927, 0xFA2C,
- 0x999E, 0x9A4E, 0x9AD9, 0x9ADC, 0x9B75, 0x9B72, 0x9B8F, 0x9BB1,
- 0x9BBB, 0x9C00, 0x9D70, 0x9D6B, 0xFA2D, 0x9E19, 0x9ED1,      0,
-      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176,
- 0x2177, 0x2178, 0x2179, 0xFFE2, 0x00A6, 0xFF07, 0xFF02,
-};
-
-/* Microsoft UCS Mapping Compatible */
-const unsigned short euc_to_utf8_FC_ms[] = {
-         0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
- 0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
- 0x9239, 0x9267, 0x92A7, 0x9277, 0x9278, 0x92E7, 0x92D7, 0x92D9,
- 0x92D0, 0xFA27, 0x92D5, 0x92E0, 0x92D3, 0x9325, 0x9321, 0x92FB,
- 0xFA28, 0x931E, 0x92FF, 0x931D, 0x9302, 0x9370, 0x9357, 0x93A4,
- 0x93C6, 0x93DE, 0x93F8, 0x9431, 0x9445, 0x9448, 0x9592, 0xF9DC,
- 0xFA29, 0x969D, 0x96AF, 0x9733, 0x973B, 0x9743, 0x974D, 0x974F,
- 0x9751, 0x9755, 0x9857, 0x9865, 0xFA2A, 0xFA2B, 0x9927, 0xFA2C,
- 0x999E, 0x9A4E, 0x9AD9, 0x9ADC, 0x9B75, 0x9B72, 0x9B8F, 0x9BB1,
- 0x9BBB, 0x9C00, 0x9D70, 0x9D6B, 0xFA2D, 0x9E19, 0x9ED1,      0,
-      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176,
- 0x2177, 0x2178, 0x2179, 0xFFE2, 0xFFE4, 0xFF07, 0xFF02,
-};
-
-#ifdef X0212_ENABLE
-const unsigned short euc_to_utf8_8FA2[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0x02D8,
- 0x02C7, 0x00B8, 0x02D9, 0x02DD, 0x00AF, 0x02DB, 0x02DA, 0xFF5E,
- 0x0384, 0x0385,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x00A1, 0xFFE4, 0x00BF,      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, 0x00BA, 0x00AA, 0x00A9, 0x00AE, 0x2122,
- 0x00A4, 0x2116,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short euc_to_utf8_8FA6[] = {
-              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,
-      0, 0x0386, 0x0388, 0x0389, 0x038A, 0x03AA,      0, 0x038C,
-      0, 0x038E, 0x03AB,      0, 0x038F,      0,      0,      0,
-      0, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03CA, 0x0390, 0x03CC,
- 0x03C2, 0x03CD, 0x03CB, 0x03B0, 0x03CE,      0,      0,
-};
-const unsigned short euc_to_utf8_8FA7[] = {
-              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, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407,
- 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x040E, 0x040F,      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, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
- 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x045E, 0x045F,
-};
-const unsigned short euc_to_utf8_8FA9[] = {
-         0x00C6, 0x0110,      0, 0x0126,      0, 0x0132,      0,
- 0x0141, 0x013F,      0, 0x014A, 0x00D8, 0x0152,      0, 0x0166,
- 0x00DE,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x00E6, 0x0111, 0x00F0, 0x0127, 0x0131, 0x0133, 0x0138,
- 0x0142, 0x0140, 0x0149, 0x014B, 0x00F8, 0x0153, 0x00DF, 0x0167,
- 0x00FE,      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,
-};
-const unsigned short euc_to_utf8_8FAA[] = {
-         0x00C1, 0x00C0, 0x00C4, 0x00C2, 0x0102, 0x01CD, 0x0100,
- 0x0104, 0x00C5, 0x00C3, 0x0106, 0x0108, 0x010C, 0x00C7, 0x010A,
- 0x010E, 0x00C9, 0x00C8, 0x00CB, 0x00CA, 0x011A, 0x0116, 0x0112,
- 0x0118,      0, 0x011C, 0x011E, 0x0122, 0x0120, 0x0124, 0x00CD,
- 0x00CC, 0x00CF, 0x00CE, 0x01CF, 0x0130, 0x012A, 0x012E, 0x0128,
- 0x0134, 0x0136, 0x0139, 0x013D, 0x013B, 0x0143, 0x0147, 0x0145,
- 0x00D1, 0x00D3, 0x00D2, 0x00D6, 0x00D4, 0x01D1, 0x0150, 0x014C,
- 0x00D5, 0x0154, 0x0158, 0x0156, 0x015A, 0x015C, 0x0160, 0x015E,
- 0x0164, 0x0162, 0x00DA, 0x00D9, 0x00DC, 0x00DB, 0x016C, 0x01D3,
- 0x0170, 0x016A, 0x0172, 0x016E, 0x0168, 0x01D7, 0x01DB, 0x01D9,
- 0x01D5, 0x0174, 0x00DD, 0x0178, 0x0176, 0x0179, 0x017D, 0x017B,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short euc_to_utf8_8FAB[] = {
-         0x00E1, 0x00E0, 0x00E4, 0x00E2, 0x0103, 0x01CE, 0x0101,
- 0x0105, 0x00E5, 0x00E3, 0x0107, 0x0109, 0x010D, 0x00E7, 0x010B,
- 0x010F, 0x00E9, 0x00E8, 0x00EB, 0x00EA, 0x011B, 0x0117, 0x0113,
- 0x0119, 0x01F5, 0x011D, 0x011F,      0, 0x0121, 0x0125, 0x00ED,
- 0x00EC, 0x00EF, 0x00EE, 0x01D0,      0, 0x012B, 0x012F, 0x0129,
- 0x0135, 0x0137, 0x013A, 0x013E, 0x013C, 0x0144, 0x0148, 0x0146,
- 0x00F1, 0x00F3, 0x00F2, 0x00F6, 0x00F4, 0x01D2, 0x0151, 0x014D,
- 0x00F5, 0x0155, 0x0159, 0x0157, 0x015B, 0x015D, 0x0161, 0x015F,
- 0x0165, 0x0163, 0x00FA, 0x00F9, 0x00FC, 0x00FB, 0x016D, 0x01D4,
- 0x0171, 0x016B, 0x0173, 0x016F, 0x0169, 0x01D8, 0x01DC, 0x01DA,
- 0x01D6, 0x0175, 0x00FD, 0x00FF, 0x0177, 0x017A, 0x017E, 0x017C,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short euc_to_utf8_8FB0[] = {
-         0x4E02, 0x4E04, 0x4E05, 0x4E0C, 0x4E12, 0x4E1F, 0x4E23,
- 0x4E24, 0x4E28, 0x4E2B, 0x4E2E, 0x4E2F, 0x4E30, 0x4E35, 0x4E40,
- 0x4E41, 0x4E44, 0x4E47, 0x4E51, 0x4E5A, 0x4E5C, 0x4E63, 0x4E68,
- 0x4E69, 0x4E74, 0x4E75, 0x4E79, 0x4E7F, 0x4E8D, 0x4E96, 0x4E97,
- 0x4E9D, 0x4EAF, 0x4EB9, 0x4EC3, 0x4ED0, 0x4EDA, 0x4EDB, 0x4EE0,
- 0x4EE1, 0x4EE2, 0x4EE8, 0x4EEF, 0x4EF1, 0x4EF3, 0x4EF5, 0x4EFD,
- 0x4EFE, 0x4EFF, 0x4F00, 0x4F02, 0x4F03, 0x4F08, 0x4F0B, 0x4F0C,
- 0x4F12, 0x4F15, 0x4F16, 0x4F17, 0x4F19, 0x4F2E, 0x4F31, 0x4F60,
- 0x4F33, 0x4F35, 0x4F37, 0x4F39, 0x4F3B, 0x4F3E, 0x4F40, 0x4F42,
- 0x4F48, 0x4F49, 0x4F4B, 0x4F4C, 0x4F52, 0x4F54, 0x4F56, 0x4F58,
- 0x4F5F, 0x4F63, 0x4F6A, 0x4F6C, 0x4F6E, 0x4F71, 0x4F77, 0x4F78,
- 0x4F79, 0x4F7A, 0x4F7D, 0x4F7E, 0x4F81, 0x4F82, 0x4F84,
-};
-const unsigned short euc_to_utf8_8FB1[] = {
-         0x4F85, 0x4F89, 0x4F8A, 0x4F8C, 0x4F8E, 0x4F90, 0x4F92,
- 0x4F93, 0x4F94, 0x4F97, 0x4F99, 0x4F9A, 0x4F9E, 0x4F9F, 0x4FB2,
- 0x4FB7, 0x4FB9, 0x4FBB, 0x4FBC, 0x4FBD, 0x4FBE, 0x4FC0, 0x4FC1,
- 0x4FC5, 0x4FC6, 0x4FC8, 0x4FC9, 0x4FCB, 0x4FCC, 0x4FCD, 0x4FCF,
- 0x4FD2, 0x4FDC, 0x4FE0, 0x4FE2, 0x4FF0, 0x4FF2, 0x4FFC, 0x4FFD,
- 0x4FFF, 0x5000, 0x5001, 0x5004, 0x5007, 0x500A, 0x500C, 0x500E,
- 0x5010, 0x5013, 0x5017, 0x5018, 0x501B, 0x501C, 0x501D, 0x501E,
- 0x5022, 0x5027, 0x502E, 0x5030, 0x5032, 0x5033, 0x5035, 0x5040,
- 0x5041, 0x5042, 0x5045, 0x5046, 0x504A, 0x504C, 0x504E, 0x5051,
- 0x5052, 0x5053, 0x5057, 0x5059, 0x505F, 0x5060, 0x5062, 0x5063,
- 0x5066, 0x5067, 0x506A, 0x506D, 0x5070, 0x5071, 0x503B, 0x5081,
- 0x5083, 0x5084, 0x5086, 0x508A, 0x508E, 0x508F, 0x5090,
-};
-const unsigned short euc_to_utf8_8FB2[] = {
-         0x5092, 0x5093, 0x5094, 0x5096, 0x509B, 0x509C, 0x509E,
- 0x509F, 0x50A0, 0x50A1, 0x50A2, 0x50AA, 0x50AF, 0x50B0, 0x50B9,
- 0x50BA, 0x50BD, 0x50C0, 0x50C3, 0x50C4, 0x50C7, 0x50CC, 0x50CE,
- 0x50D0, 0x50D3, 0x50D4, 0x50D8, 0x50DC, 0x50DD, 0x50DF, 0x50E2,
- 0x50E4, 0x50E6, 0x50E8, 0x50E9, 0x50EF, 0x50F1, 0x50F6, 0x50FA,
- 0x50FE, 0x5103, 0x5106, 0x5107, 0x5108, 0x510B, 0x510C, 0x510D,
- 0x510E, 0x50F2, 0x5110, 0x5117, 0x5119, 0x511B, 0x511C, 0x511D,
- 0x511E, 0x5123, 0x5127, 0x5128, 0x512C, 0x512D, 0x512F, 0x5131,
- 0x5133, 0x5134, 0x5135, 0x5138, 0x5139, 0x5142, 0x514A, 0x514F,
- 0x5153, 0x5155, 0x5157, 0x5158, 0x515F, 0x5164, 0x5166, 0x517E,
- 0x5183, 0x5184, 0x518B, 0x518E, 0x5198, 0x519D, 0x51A1, 0x51A3,
- 0x51AD, 0x51B8, 0x51BA, 0x51BC, 0x51BE, 0x51BF, 0x51C2,
-};
-const unsigned short euc_to_utf8_8FB3[] = {
-         0x51C8, 0x51CF, 0x51D1, 0x51D2, 0x51D3, 0x51D5, 0x51D8,
- 0x51DE, 0x51E2, 0x51E5, 0x51EE, 0x51F2, 0x51F3, 0x51F4, 0x51F7,
- 0x5201, 0x5202, 0x5205, 0x5212, 0x5213, 0x5215, 0x5216, 0x5218,
- 0x5222, 0x5228, 0x5231, 0x5232, 0x5235, 0x523C, 0x5245, 0x5249,
- 0x5255, 0x5257, 0x5258, 0x525A, 0x525C, 0x525F, 0x5260, 0x5261,
- 0x5266, 0x526E, 0x5277, 0x5278, 0x5279, 0x5280, 0x5282, 0x5285,
- 0x528A, 0x528C, 0x5293, 0x5295, 0x5296, 0x5297, 0x5298, 0x529A,
- 0x529C, 0x52A4, 0x52A5, 0x52A6, 0x52A7, 0x52AF, 0x52B0, 0x52B6,
- 0x52B7, 0x52B8, 0x52BA, 0x52BB, 0x52BD, 0x52C0, 0x52C4, 0x52C6,
- 0x52C8, 0x52CC, 0x52CF, 0x52D1, 0x52D4, 0x52D6, 0x52DB, 0x52DC,
- 0x52E1, 0x52E5, 0x52E8, 0x52E9, 0x52EA, 0x52EC, 0x52F0, 0x52F1,
- 0x52F4, 0x52F6, 0x52F7, 0x5300, 0x5303, 0x530A, 0x530B,
-};
-const unsigned short euc_to_utf8_8FB4[] = {
-         0x530C, 0x5311, 0x5313, 0x5318, 0x531B, 0x531C, 0x531E,
- 0x531F, 0x5325, 0x5327, 0x5328, 0x5329, 0x532B, 0x532C, 0x532D,
- 0x5330, 0x5332, 0x5335, 0x533C, 0x533D, 0x533E, 0x5342, 0x534C,
- 0x534B, 0x5359, 0x535B, 0x5361, 0x5363, 0x5365, 0x536C, 0x536D,
- 0x5372, 0x5379, 0x537E, 0x5383, 0x5387, 0x5388, 0x538E, 0x5393,
- 0x5394, 0x5399, 0x539D, 0x53A1, 0x53A4, 0x53AA, 0x53AB, 0x53AF,
- 0x53B2, 0x53B4, 0x53B5, 0x53B7, 0x53B8, 0x53BA, 0x53BD, 0x53C0,
- 0x53C5, 0x53CF, 0x53D2, 0x53D3, 0x53D5, 0x53DA, 0x53DD, 0x53DE,
- 0x53E0, 0x53E6, 0x53E7, 0x53F5, 0x5402, 0x5413, 0x541A, 0x5421,
- 0x5427, 0x5428, 0x542A, 0x542F, 0x5431, 0x5434, 0x5435, 0x5443,
- 0x5444, 0x5447, 0x544D, 0x544F, 0x545E, 0x5462, 0x5464, 0x5466,
- 0x5467, 0x5469, 0x546B, 0x546D, 0x546E, 0x5474, 0x547F,
-};
-const unsigned short euc_to_utf8_8FB5[] = {
-         0x5481, 0x5483, 0x5485, 0x5488, 0x5489, 0x548D, 0x5491,
- 0x5495, 0x5496, 0x549C, 0x549F, 0x54A1, 0x54A6, 0x54A7, 0x54A9,
- 0x54AA, 0x54AD, 0x54AE, 0x54B1, 0x54B7, 0x54B9, 0x54BA, 0x54BB,
- 0x54BF, 0x54C6, 0x54CA, 0x54CD, 0x54CE, 0x54E0, 0x54EA, 0x54EC,
- 0x54EF, 0x54F6, 0x54FC, 0x54FE, 0x54FF, 0x5500, 0x5501, 0x5505,
- 0x5508, 0x5509, 0x550C, 0x550D, 0x550E, 0x5515, 0x552A, 0x552B,
- 0x5532, 0x5535, 0x5536, 0x553B, 0x553C, 0x553D, 0x5541, 0x5547,
- 0x5549, 0x554A, 0x554D, 0x5550, 0x5551, 0x5558, 0x555A, 0x555B,
- 0x555E, 0x5560, 0x5561, 0x5564, 0x5566, 0x557F, 0x5581, 0x5582,
- 0x5586, 0x5588, 0x558E, 0x558F, 0x5591, 0x5592, 0x5593, 0x5594,
- 0x5597, 0x55A3, 0x55A4, 0x55AD, 0x55B2, 0x55BF, 0x55C1, 0x55C3,
- 0x55C6, 0x55C9, 0x55CB, 0x55CC, 0x55CE, 0x55D1, 0x55D2,
-};
-const unsigned short euc_to_utf8_8FB6[] = {
-         0x55D3, 0x55D7, 0x55D8, 0x55DB, 0x55DE, 0x55E2, 0x55E9,
- 0x55F6, 0x55FF, 0x5605, 0x5608, 0x560A, 0x560D, 0x560E, 0x560F,
- 0x5610, 0x5611, 0x5612, 0x5619, 0x562C, 0x5630, 0x5633, 0x5635,
- 0x5637, 0x5639, 0x563B, 0x563C, 0x563D, 0x563F, 0x5640, 0x5641,
- 0x5643, 0x5644, 0x5646, 0x5649, 0x564B, 0x564D, 0x564F, 0x5654,
- 0x565E, 0x5660, 0x5661, 0x5662, 0x5663, 0x5666, 0x5669, 0x566D,
- 0x566F, 0x5671, 0x5672, 0x5675, 0x5684, 0x5685, 0x5688, 0x568B,
- 0x568C, 0x5695, 0x5699, 0x569A, 0x569D, 0x569E, 0x569F, 0x56A6,
- 0x56A7, 0x56A8, 0x56A9, 0x56AB, 0x56AC, 0x56AD, 0x56B1, 0x56B3,
- 0x56B7, 0x56BE, 0x56C5, 0x56C9, 0x56CA, 0x56CB, 0x56CF, 0x56D0,
- 0x56CC, 0x56CD, 0x56D9, 0x56DC, 0x56DD, 0x56DF, 0x56E1, 0x56E4,
- 0x56E5, 0x56E6, 0x56E7, 0x56E8, 0x56F1, 0x56EB, 0x56ED,
-};
-const unsigned short euc_to_utf8_8FB7[] = {
-         0x56F6, 0x56F7, 0x5701, 0x5702, 0x5707, 0x570A, 0x570C,
- 0x5711, 0x5715, 0x571A, 0x571B, 0x571D, 0x5720, 0x5722, 0x5723,
- 0x5724, 0x5725, 0x5729, 0x572A, 0x572C, 0x572E, 0x572F, 0x5733,
- 0x5734, 0x573D, 0x573E, 0x573F, 0x5745, 0x5746, 0x574C, 0x574D,
- 0x5752, 0x5762, 0x5765, 0x5767, 0x5768, 0x576B, 0x576D, 0x576E,
- 0x576F, 0x5770, 0x5771, 0x5773, 0x5774, 0x5775, 0x5777, 0x5779,
- 0x577A, 0x577B, 0x577C, 0x577E, 0x5781, 0x5783, 0x578C, 0x5794,
- 0x5797, 0x5799, 0x579A, 0x579C, 0x579D, 0x579E, 0x579F, 0x57A1,
- 0x5795, 0x57A7, 0x57A8, 0x57A9, 0x57AC, 0x57B8, 0x57BD, 0x57C7,
- 0x57C8, 0x57CC, 0x57CF, 0x57D5, 0x57DD, 0x57DE, 0x57E4, 0x57E6,
- 0x57E7, 0x57E9, 0x57ED, 0x57F0, 0x57F5, 0x57F6, 0x57F8, 0x57FD,
- 0x57FE, 0x57FF, 0x5803, 0x5804, 0x5808, 0x5809, 0x57E1,
-};
-const unsigned short euc_to_utf8_8FB8[] = {
-         0x580C, 0x580D, 0x581B, 0x581E, 0x581F, 0x5820, 0x5826,
- 0x5827, 0x582D, 0x5832, 0x5839, 0x583F, 0x5849, 0x584C, 0x584D,
- 0x584F, 0x5850, 0x5855, 0x585F, 0x5861, 0x5864, 0x5867, 0x5868,
- 0x5878, 0x587C, 0x587F, 0x5880, 0x5881, 0x5887, 0x5888, 0x5889,
- 0x588A, 0x588C, 0x588D, 0x588F, 0x5890, 0x5894, 0x5896, 0x589D,
- 0x58A0, 0x58A1, 0x58A2, 0x58A6, 0x58A9, 0x58B1, 0x58B2, 0x58C4,
- 0x58BC, 0x58C2, 0x58C8, 0x58CD, 0x58CE, 0x58D0, 0x58D2, 0x58D4,
- 0x58D6, 0x58DA, 0x58DD, 0x58E1, 0x58E2, 0x58E9, 0x58F3, 0x5905,
- 0x5906, 0x590B, 0x590C, 0x5912, 0x5913, 0x5914, 0x8641, 0x591D,
- 0x5921, 0x5923, 0x5924, 0x5928, 0x592F, 0x5930, 0x5933, 0x5935,
- 0x5936, 0x593F, 0x5943, 0x5946, 0x5952, 0x5953, 0x5959, 0x595B,
- 0x595D, 0x595E, 0x595F, 0x5961, 0x5963, 0x596B, 0x596D,
-};
-const unsigned short euc_to_utf8_8FB9[] = {
-         0x596F, 0x5972, 0x5975, 0x5976, 0x5979, 0x597B, 0x597C,
- 0x598B, 0x598C, 0x598E, 0x5992, 0x5995, 0x5997, 0x599F, 0x59A4,
- 0x59A7, 0x59AD, 0x59AE, 0x59AF, 0x59B0, 0x59B3, 0x59B7, 0x59BA,
- 0x59BC, 0x59C1, 0x59C3, 0x59C4, 0x59C8, 0x59CA, 0x59CD, 0x59D2,
- 0x59DD, 0x59DE, 0x59DF, 0x59E3, 0x59E4, 0x59E7, 0x59EE, 0x59EF,
- 0x59F1, 0x59F2, 0x59F4, 0x59F7, 0x5A00, 0x5A04, 0x5A0C, 0x5A0D,
- 0x5A0E, 0x5A12, 0x5A13, 0x5A1E, 0x5A23, 0x5A24, 0x5A27, 0x5A28,
- 0x5A2A, 0x5A2D, 0x5A30, 0x5A44, 0x5A45, 0x5A47, 0x5A48, 0x5A4C,
- 0x5A50, 0x5A55, 0x5A5E, 0x5A63, 0x5A65, 0x5A67, 0x5A6D, 0x5A77,
- 0x5A7A, 0x5A7B, 0x5A7E, 0x5A8B, 0x5A90, 0x5A93, 0x5A96, 0x5A99,
- 0x5A9C, 0x5A9E, 0x5A9F, 0x5AA0, 0x5AA2, 0x5AA7, 0x5AAC, 0x5AB1,
- 0x5AB2, 0x5AB3, 0x5AB5, 0x5AB8, 0x5ABA, 0x5ABB, 0x5ABF,
-};
-const unsigned short euc_to_utf8_8FBA[] = {
-         0x5AC4, 0x5AC6, 0x5AC8, 0x5ACF, 0x5ADA, 0x5ADC, 0x5AE0,
- 0x5AE5, 0x5AEA, 0x5AEE, 0x5AF5, 0x5AF6, 0x5AFD, 0x5B00, 0x5B01,
- 0x5B08, 0x5B17, 0x5B34, 0x5B19, 0x5B1B, 0x5B1D, 0x5B21, 0x5B25,
- 0x5B2D, 0x5B38, 0x5B41, 0x5B4B, 0x5B4C, 0x5B52, 0x5B56, 0x5B5E,
- 0x5B68, 0x5B6E, 0x5B6F, 0x5B7C, 0x5B7D, 0x5B7E, 0x5B7F, 0x5B81,
- 0x5B84, 0x5B86, 0x5B8A, 0x5B8E, 0x5B90, 0x5B91, 0x5B93, 0x5B94,
- 0x5B96, 0x5BA8, 0x5BA9, 0x5BAC, 0x5BAD, 0x5BAF, 0x5BB1, 0x5BB2,
- 0x5BB7, 0x5BBA, 0x5BBC, 0x5BC0, 0x5BC1, 0x5BCD, 0x5BCF, 0x5BD6,
- 0x5BD7, 0x5BD8, 0x5BD9, 0x5BDA, 0x5BE0, 0x5BEF, 0x5BF1, 0x5BF4,
- 0x5BFD, 0x5C0C, 0x5C17, 0x5C1E, 0x5C1F, 0x5C23, 0x5C26, 0x5C29,
- 0x5C2B, 0x5C2C, 0x5C2E, 0x5C30, 0x5C32, 0x5C35, 0x5C36, 0x5C59,
- 0x5C5A, 0x5C5C, 0x5C62, 0x5C63, 0x5C67, 0x5C68, 0x5C69,
-};
-const unsigned short euc_to_utf8_8FBB[] = {
-         0x5C6D, 0x5C70, 0x5C74, 0x5C75, 0x5C7A, 0x5C7B, 0x5C7C,
- 0x5C7D, 0x5C87, 0x5C88, 0x5C8A, 0x5C8F, 0x5C92, 0x5C9D, 0x5C9F,
- 0x5CA0, 0x5CA2, 0x5CA3, 0x5CA6, 0x5CAA, 0x5CB2, 0x5CB4, 0x5CB5,
- 0x5CBA, 0x5CC9, 0x5CCB, 0x5CD2, 0x5CDD, 0x5CD7, 0x5CEE, 0x5CF1,
- 0x5CF2, 0x5CF4, 0x5D01, 0x5D06, 0x5D0D, 0x5D12, 0x5D2B, 0x5D23,
- 0x5D24, 0x5D26, 0x5D27, 0x5D31, 0x5D34, 0x5D39, 0x5D3D, 0x5D3F,
- 0x5D42, 0x5D43, 0x5D46, 0x5D48, 0x5D55, 0x5D51, 0x5D59, 0x5D4A,
- 0x5D5F, 0x5D60, 0x5D61, 0x5D62, 0x5D64, 0x5D6A, 0x5D6D, 0x5D70,
- 0x5D79, 0x5D7A, 0x5D7E, 0x5D7F, 0x5D81, 0x5D83, 0x5D88, 0x5D8A,
- 0x5D92, 0x5D93, 0x5D94, 0x5D95, 0x5D99, 0x5D9B, 0x5D9F, 0x5DA0,
- 0x5DA7, 0x5DAB, 0x5DB0, 0x5DB4, 0x5DB8, 0x5DB9, 0x5DC3, 0x5DC7,
- 0x5DCB, 0x5DD0, 0x5DCE, 0x5DD8, 0x5DD9, 0x5DE0, 0x5DE4,
-};
-const unsigned short euc_to_utf8_8FBC[] = {
-         0x5DE9, 0x5DF8, 0x5DF9, 0x5E00, 0x5E07, 0x5E0D, 0x5E12,
- 0x5E14, 0x5E15, 0x5E18, 0x5E1F, 0x5E20, 0x5E2E, 0x5E28, 0x5E32,
- 0x5E35, 0x5E3E, 0x5E4B, 0x5E50, 0x5E49, 0x5E51, 0x5E56, 0x5E58,
- 0x5E5B, 0x5E5C, 0x5E5E, 0x5E68, 0x5E6A, 0x5E6B, 0x5E6C, 0x5E6D,
- 0x5E6E, 0x5E70, 0x5E80, 0x5E8B, 0x5E8E, 0x5EA2, 0x5EA4, 0x5EA5,
- 0x5EA8, 0x5EAA, 0x5EAC, 0x5EB1, 0x5EB3, 0x5EBD, 0x5EBE, 0x5EBF,
- 0x5EC6, 0x5ECC, 0x5ECB, 0x5ECE, 0x5ED1, 0x5ED2, 0x5ED4, 0x5ED5,
- 0x5EDC, 0x5EDE, 0x5EE5, 0x5EEB, 0x5F02, 0x5F06, 0x5F07, 0x5F08,
- 0x5F0E, 0x5F19, 0x5F1C, 0x5F1D, 0x5F21, 0x5F22, 0x5F23, 0x5F24,
- 0x5F28, 0x5F2B, 0x5F2C, 0x5F2E, 0x5F30, 0x5F34, 0x5F36, 0x5F3B,
- 0x5F3D, 0x5F3F, 0x5F40, 0x5F44, 0x5F45, 0x5F47, 0x5F4D, 0x5F50,
- 0x5F54, 0x5F58, 0x5F5B, 0x5F60, 0x5F63, 0x5F64, 0x5F67,
-};
-const unsigned short euc_to_utf8_8FBD[] = {
-         0x5F6F, 0x5F72, 0x5F74, 0x5F75, 0x5F78, 0x5F7A, 0x5F7D,
- 0x5F7E, 0x5F89, 0x5F8D, 0x5F8F, 0x5F96, 0x5F9C, 0x5F9D, 0x5FA2,
- 0x5FA7, 0x5FAB, 0x5FA4, 0x5FAC, 0x5FAF, 0x5FB0, 0x5FB1, 0x5FB8,
- 0x5FC4, 0x5FC7, 0x5FC8, 0x5FC9, 0x5FCB, 0x5FD0, 0x5FD1, 0x5FD2,
- 0x5FD3, 0x5FD4, 0x5FDE, 0x5FE1, 0x5FE2, 0x5FE8, 0x5FE9, 0x5FEA,
- 0x5FEC, 0x5FED, 0x5FEE, 0x5FEF, 0x5FF2, 0x5FF3, 0x5FF6, 0x5FFA,
- 0x5FFC, 0x6007, 0x600A, 0x600D, 0x6013, 0x6014, 0x6017, 0x6018,
- 0x601A, 0x601F, 0x6024, 0x602D, 0x6033, 0x6035, 0x6040, 0x6047,
- 0x6048, 0x6049, 0x604C, 0x6051, 0x6054, 0x6056, 0x6057, 0x605D,
- 0x6061, 0x6067, 0x6071, 0x607E, 0x607F, 0x6082, 0x6086, 0x6088,
- 0x608A, 0x608E, 0x6091, 0x6093, 0x6095, 0x6098, 0x609D, 0x609E,
- 0x60A2, 0x60A4, 0x60A5, 0x60A8, 0x60B0, 0x60B1, 0x60B7,
-};
-const unsigned short euc_to_utf8_8FBE[] = {
-         0x60BB, 0x60BE, 0x60C2, 0x60C4, 0x60C8, 0x60C9, 0x60CA,
- 0x60CB, 0x60CE, 0x60CF, 0x60D4, 0x60D5, 0x60D9, 0x60DB, 0x60DD,
- 0x60DE, 0x60E2, 0x60E5, 0x60F2, 0x60F5, 0x60F8, 0x60FC, 0x60FD,
- 0x6102, 0x6107, 0x610A, 0x610C, 0x6110, 0x6111, 0x6112, 0x6113,
- 0x6114, 0x6116, 0x6117, 0x6119, 0x611C, 0x611E, 0x6122, 0x612A,
- 0x612B, 0x6130, 0x6131, 0x6135, 0x6136, 0x6137, 0x6139, 0x6141,
- 0x6145, 0x6146, 0x6149, 0x615E, 0x6160, 0x616C, 0x6172, 0x6178,
- 0x617B, 0x617C, 0x617F, 0x6180, 0x6181, 0x6183, 0x6184, 0x618B,
- 0x618D, 0x6192, 0x6193, 0x6197, 0x6198, 0x619C, 0x619D, 0x619F,
- 0x61A0, 0x61A5, 0x61A8, 0x61AA, 0x61AD, 0x61B8, 0x61B9, 0x61BC,
- 0x61C0, 0x61C1, 0x61C2, 0x61CE, 0x61CF, 0x61D5, 0x61DC, 0x61DD,
- 0x61DE, 0x61DF, 0x61E1, 0x61E2, 0x61E7, 0x61E9, 0x61E5,
-};
-const unsigned short euc_to_utf8_8FBF[] = {
-         0x61EC, 0x61ED, 0x61EF, 0x6201, 0x6203, 0x6204, 0x6207,
- 0x6213, 0x6215, 0x621C, 0x6220, 0x6222, 0x6223, 0x6227, 0x6229,
- 0x622B, 0x6239, 0x623D, 0x6242, 0x6243, 0x6244, 0x6246, 0x624C,
- 0x6250, 0x6251, 0x6252, 0x6254, 0x6256, 0x625A, 0x625C, 0x6264,
- 0x626D, 0x626F, 0x6273, 0x627A, 0x627D, 0x628D, 0x628E, 0x628F,
- 0x6290, 0x62A6, 0x62A8, 0x62B3, 0x62B6, 0x62B7, 0x62BA, 0x62BE,
- 0x62BF, 0x62C4, 0x62CE, 0x62D5, 0x62D6, 0x62DA, 0x62EA, 0x62F2,
- 0x62F4, 0x62FC, 0x62FD, 0x6303, 0x6304, 0x630A, 0x630B, 0x630D,
- 0x6310, 0x6313, 0x6316, 0x6318, 0x6329, 0x632A, 0x632D, 0x6335,
- 0x6336, 0x6339, 0x633C, 0x6341, 0x6342, 0x6343, 0x6344, 0x6346,
- 0x634A, 0x634B, 0x634E, 0x6352, 0x6353, 0x6354, 0x6358, 0x635B,
- 0x6365, 0x6366, 0x636C, 0x636D, 0x6371, 0x6374, 0x6375,
-};
-const unsigned short euc_to_utf8_8FC0[] = {
-         0x6378, 0x637C, 0x637D, 0x637F, 0x6382, 0x6384, 0x6387,
- 0x638A, 0x6390, 0x6394, 0x6395, 0x6399, 0x639A, 0x639E, 0x63A4,
- 0x63A6, 0x63AD, 0x63AE, 0x63AF, 0x63BD, 0x63C1, 0x63C5, 0x63C8,
- 0x63CE, 0x63D1, 0x63D3, 0x63D4, 0x63D5, 0x63DC, 0x63E0, 0x63E5,
- 0x63EA, 0x63EC, 0x63F2, 0x63F3, 0x63F5, 0x63F8, 0x63F9, 0x6409,
- 0x640A, 0x6410, 0x6412, 0x6414, 0x6418, 0x641E, 0x6420, 0x6422,
- 0x6424, 0x6425, 0x6429, 0x642A, 0x642F, 0x6430, 0x6435, 0x643D,
- 0x643F, 0x644B, 0x644F, 0x6451, 0x6452, 0x6453, 0x6454, 0x645A,
- 0x645B, 0x645C, 0x645D, 0x645F, 0x6460, 0x6461, 0x6463, 0x646D,
- 0x6473, 0x6474, 0x647B, 0x647D, 0x6485, 0x6487, 0x648F, 0x6490,
- 0x6491, 0x6498, 0x6499, 0x649B, 0x649D, 0x649F, 0x64A1, 0x64A3,
- 0x64A6, 0x64A8, 0x64AC, 0x64B3, 0x64BD, 0x64BE, 0x64BF,
-};
-const unsigned short euc_to_utf8_8FC1[] = {
-         0x64C4, 0x64C9, 0x64CA, 0x64CB, 0x64CC, 0x64CE, 0x64D0,
- 0x64D1, 0x64D5, 0x64D7, 0x64E4, 0x64E5, 0x64E9, 0x64EA, 0x64ED,
- 0x64F0, 0x64F5, 0x64F7, 0x64FB, 0x64FF, 0x6501, 0x6504, 0x6508,
- 0x6509, 0x650A, 0x650F, 0x6513, 0x6514, 0x6516, 0x6519, 0x651B,
- 0x651E, 0x651F, 0x6522, 0x6526, 0x6529, 0x652E, 0x6531, 0x653A,
- 0x653C, 0x653D, 0x6543, 0x6547, 0x6549, 0x6550, 0x6552, 0x6554,
- 0x655F, 0x6560, 0x6567, 0x656B, 0x657A, 0x657D, 0x6581, 0x6585,
- 0x658A, 0x6592, 0x6595, 0x6598, 0x659D, 0x65A0, 0x65A3, 0x65A6,
- 0x65AE, 0x65B2, 0x65B3, 0x65B4, 0x65BF, 0x65C2, 0x65C8, 0x65C9,
- 0x65CE, 0x65D0, 0x65D4, 0x65D6, 0x65D8, 0x65DF, 0x65F0, 0x65F2,
- 0x65F4, 0x65F5, 0x65F9, 0x65FE, 0x65FF, 0x6600, 0x6604, 0x6608,
- 0x6609, 0x660D, 0x6611, 0x6612, 0x6615, 0x6616, 0x661D,
-};
-const unsigned short euc_to_utf8_8FC2[] = {
-         0x661E, 0x6621, 0x6622, 0x6623, 0x6624, 0x6626, 0x6629,
- 0x662A, 0x662B, 0x662C, 0x662E, 0x6630, 0x6631, 0x6633, 0x6639,
- 0x6637, 0x6640, 0x6645, 0x6646, 0x664A, 0x664C, 0x6651, 0x664E,
- 0x6657, 0x6658, 0x6659, 0x665B, 0x665C, 0x6660, 0x6661, 0x66FB,
- 0x666A, 0x666B, 0x666C, 0x667E, 0x6673, 0x6675, 0x667F, 0x6677,
- 0x6678, 0x6679, 0x667B, 0x6680, 0x667C, 0x668B, 0x668C, 0x668D,
- 0x6690, 0x6692, 0x6699, 0x669A, 0x669B, 0x669C, 0x669F, 0x66A0,
- 0x66A4, 0x66AD, 0x66B1, 0x66B2, 0x66B5, 0x66BB, 0x66BF, 0x66C0,
- 0x66C2, 0x66C3, 0x66C8, 0x66CC, 0x66CE, 0x66CF, 0x66D4, 0x66DB,
- 0x66DF, 0x66E8, 0x66EB, 0x66EC, 0x66EE, 0x66FA, 0x6705, 0x6707,
- 0x670E, 0x6713, 0x6719, 0x671C, 0x6720, 0x6722, 0x6733, 0x673E,
- 0x6745, 0x6747, 0x6748, 0x674C, 0x6754, 0x6755, 0x675D,
-};
-const unsigned short euc_to_utf8_8FC3[] = {
-         0x6766, 0x676C, 0x676E, 0x6774, 0x6776, 0x677B, 0x6781,
- 0x6784, 0x678E, 0x678F, 0x6791, 0x6793, 0x6796, 0x6798, 0x6799,
- 0x679B, 0x67B0, 0x67B1, 0x67B2, 0x67B5, 0x67BB, 0x67BC, 0x67BD,
- 0x67F9, 0x67C0, 0x67C2, 0x67C3, 0x67C5, 0x67C8, 0x67C9, 0x67D2,
- 0x67D7, 0x67D9, 0x67DC, 0x67E1, 0x67E6, 0x67F0, 0x67F2, 0x67F6,
- 0x67F7, 0x6852, 0x6814, 0x6819, 0x681D, 0x681F, 0x6828, 0x6827,
- 0x682C, 0x682D, 0x682F, 0x6830, 0x6831, 0x6833, 0x683B, 0x683F,
- 0x6844, 0x6845, 0x684A, 0x684C, 0x6855, 0x6857, 0x6858, 0x685B,
- 0x686B, 0x686E, 0x686F, 0x6870, 0x6871, 0x6872, 0x6875, 0x6879,
- 0x687A, 0x687B, 0x687C, 0x6882, 0x6884, 0x6886, 0x6888, 0x6896,
- 0x6898, 0x689A, 0x689C, 0x68A1, 0x68A3, 0x68A5, 0x68A9, 0x68AA,
- 0x68AE, 0x68B2, 0x68BB, 0x68C5, 0x68C8, 0x68CC, 0x68CF,
-};
-const unsigned short euc_to_utf8_8FC4[] = {
-         0x68D0, 0x68D1, 0x68D3, 0x68D6, 0x68D9, 0x68DC, 0x68DD,
- 0x68E5, 0x68E8, 0x68EA, 0x68EB, 0x68EC, 0x68ED, 0x68F0, 0x68F1,
- 0x68F5, 0x68F6, 0x68FB, 0x68FC, 0x68FD, 0x6906, 0x6909, 0x690A,
- 0x6910, 0x6911, 0x6913, 0x6916, 0x6917, 0x6931, 0x6933, 0x6935,
- 0x6938, 0x693B, 0x6942, 0x6945, 0x6949, 0x694E, 0x6957, 0x695B,
- 0x6963, 0x6964, 0x6965, 0x6966, 0x6968, 0x6969, 0x696C, 0x6970,
- 0x6971, 0x6972, 0x697A, 0x697B, 0x697F, 0x6980, 0x698D, 0x6992,
- 0x6996, 0x6998, 0x69A1, 0x69A5, 0x69A6, 0x69A8, 0x69AB, 0x69AD,
- 0x69AF, 0x69B7, 0x69B8, 0x69BA, 0x69BC, 0x69C5, 0x69C8, 0x69D1,
- 0x69D6, 0x69D7, 0x69E2, 0x69E5, 0x69EE, 0x69EF, 0x69F1, 0x69F3,
- 0x69F5, 0x69FE, 0x6A00, 0x6A01, 0x6A03, 0x6A0F, 0x6A11, 0x6A15,
- 0x6A1A, 0x6A1D, 0x6A20, 0x6A24, 0x6A28, 0x6A30, 0x6A32,
-};
-const unsigned short euc_to_utf8_8FC5[] = {
-         0x6A34, 0x6A37, 0x6A3B, 0x6A3E, 0x6A3F, 0x6A45, 0x6A46,
- 0x6A49, 0x6A4A, 0x6A4E, 0x6A50, 0x6A51, 0x6A52, 0x6A55, 0x6A56,
- 0x6A5B, 0x6A64, 0x6A67, 0x6A6A, 0x6A71, 0x6A73, 0x6A7E, 0x6A81,
- 0x6A83, 0x6A86, 0x6A87, 0x6A89, 0x6A8B, 0x6A91, 0x6A9B, 0x6A9D,
- 0x6A9E, 0x6A9F, 0x6AA5, 0x6AAB, 0x6AAF, 0x6AB0, 0x6AB1, 0x6AB4,
- 0x6ABD, 0x6ABE, 0x6ABF, 0x6AC6, 0x6AC9, 0x6AC8, 0x6ACC, 0x6AD0,
- 0x6AD4, 0x6AD5, 0x6AD6, 0x6ADC, 0x6ADD, 0x6AE4, 0x6AE7, 0x6AEC,
- 0x6AF0, 0x6AF1, 0x6AF2, 0x6AFC, 0x6AFD, 0x6B02, 0x6B03, 0x6B06,
- 0x6B07, 0x6B09, 0x6B0F, 0x6B10, 0x6B11, 0x6B17, 0x6B1B, 0x6B1E,
- 0x6B24, 0x6B28, 0x6B2B, 0x6B2C, 0x6B2F, 0x6B35, 0x6B36, 0x6B3B,
- 0x6B3F, 0x6B46, 0x6B4A, 0x6B4D, 0x6B52, 0x6B56, 0x6B58, 0x6B5D,
- 0x6B60, 0x6B67, 0x6B6B, 0x6B6E, 0x6B70, 0x6B75, 0x6B7D,
-};
-const unsigned short euc_to_utf8_8FC6[] = {
-         0x6B7E, 0x6B82, 0x6B85, 0x6B97, 0x6B9B, 0x6B9F, 0x6BA0,
- 0x6BA2, 0x6BA3, 0x6BA8, 0x6BA9, 0x6BAC, 0x6BAD, 0x6BAE, 0x6BB0,
- 0x6BB8, 0x6BB9, 0x6BBD, 0x6BBE, 0x6BC3, 0x6BC4, 0x6BC9, 0x6BCC,
- 0x6BD6, 0x6BDA, 0x6BE1, 0x6BE3, 0x6BE6, 0x6BE7, 0x6BEE, 0x6BF1,
- 0x6BF7, 0x6BF9, 0x6BFF, 0x6C02, 0x6C04, 0x6C05, 0x6C09, 0x6C0D,
- 0x6C0E, 0x6C10, 0x6C12, 0x6C19, 0x6C1F, 0x6C26, 0x6C27, 0x6C28,
- 0x6C2C, 0x6C2E, 0x6C33, 0x6C35, 0x6C36, 0x6C3A, 0x6C3B, 0x6C3F,
- 0x6C4A, 0x6C4B, 0x6C4D, 0x6C4F, 0x6C52, 0x6C54, 0x6C59, 0x6C5B,
- 0x6C5C, 0x6C6B, 0x6C6D, 0x6C6F, 0x6C74, 0x6C76, 0x6C78, 0x6C79,
- 0x6C7B, 0x6C85, 0x6C86, 0x6C87, 0x6C89, 0x6C94, 0x6C95, 0x6C97,
- 0x6C98, 0x6C9C, 0x6C9F, 0x6CB0, 0x6CB2, 0x6CB4, 0x6CC2, 0x6CC6,
- 0x6CCD, 0x6CCF, 0x6CD0, 0x6CD1, 0x6CD2, 0x6CD4, 0x6CD6,
-};
-const unsigned short euc_to_utf8_8FC7[] = {
-         0x6CDA, 0x6CDC, 0x6CE0, 0x6CE7, 0x6CE9, 0x6CEB, 0x6CEC,
- 0x6CEE, 0x6CF2, 0x6CF4, 0x6D04, 0x6D07, 0x6D0A, 0x6D0E, 0x6D0F,
- 0x6D11, 0x6D13, 0x6D1A, 0x6D26, 0x6D27, 0x6D28, 0x6C67, 0x6D2E,
- 0x6D2F, 0x6D31, 0x6D39, 0x6D3C, 0x6D3F, 0x6D57, 0x6D5E, 0x6D5F,
- 0x6D61, 0x6D65, 0x6D67, 0x6D6F, 0x6D70, 0x6D7C, 0x6D82, 0x6D87,
- 0x6D91, 0x6D92, 0x6D94, 0x6D96, 0x6D97, 0x6D98, 0x6DAA, 0x6DAC,
- 0x6DB4, 0x6DB7, 0x6DB9, 0x6DBD, 0x6DBF, 0x6DC4, 0x6DC8, 0x6DCA,
- 0x6DCE, 0x6DCF, 0x6DD6, 0x6DDB, 0x6DDD, 0x6DDF, 0x6DE0, 0x6DE2,
- 0x6DE5, 0x6DE9, 0x6DEF, 0x6DF0, 0x6DF4, 0x6DF6, 0x6DFC, 0x6E00,
- 0x6E04, 0x6E1E, 0x6E22, 0x6E27, 0x6E32, 0x6E36, 0x6E39, 0x6E3B,
- 0x6E3C, 0x6E44, 0x6E45, 0x6E48, 0x6E49, 0x6E4B, 0x6E4F, 0x6E51,
- 0x6E52, 0x6E53, 0x6E54, 0x6E57, 0x6E5C, 0x6E5D, 0x6E5E,
-};
-const unsigned short euc_to_utf8_8FC8[] = {
-         0x6E62, 0x6E63, 0x6E68, 0x6E73, 0x6E7B, 0x6E7D, 0x6E8D,
- 0x6E93, 0x6E99, 0x6EA0, 0x6EA7, 0x6EAD, 0x6EAE, 0x6EB1, 0x6EB3,
- 0x6EBB, 0x6EBF, 0x6EC0, 0x6EC1, 0x6EC3, 0x6EC7, 0x6EC8, 0x6ECA,
- 0x6ECD, 0x6ECE, 0x6ECF, 0x6EEB, 0x6EED, 0x6EEE, 0x6EF9, 0x6EFB,
- 0x6EFD, 0x6F04, 0x6F08, 0x6F0A, 0x6F0C, 0x6F0D, 0x6F16, 0x6F18,
- 0x6F1A, 0x6F1B, 0x6F26, 0x6F29, 0x6F2A, 0x6F2F, 0x6F30, 0x6F33,
- 0x6F36, 0x6F3B, 0x6F3C, 0x6F2D, 0x6F4F, 0x6F51, 0x6F52, 0x6F53,
- 0x6F57, 0x6F59, 0x6F5A, 0x6F5D, 0x6F5E, 0x6F61, 0x6F62, 0x6F68,
- 0x6F6C, 0x6F7D, 0x6F7E, 0x6F83, 0x6F87, 0x6F88, 0x6F8B, 0x6F8C,
- 0x6F8D, 0x6F90, 0x6F92, 0x6F93, 0x6F94, 0x6F96, 0x6F9A, 0x6F9F,
- 0x6FA0, 0x6FA5, 0x6FA6, 0x6FA7, 0x6FA8, 0x6FAE, 0x6FAF, 0x6FB0,
- 0x6FB5, 0x6FB6, 0x6FBC, 0x6FC5, 0x6FC7, 0x6FC8, 0x6FCA,
-};
-const unsigned short euc_to_utf8_8FC9[] = {
-         0x6FDA, 0x6FDE, 0x6FE8, 0x6FE9, 0x6FF0, 0x6FF5, 0x6FF9,
- 0x6FFC, 0x6FFD, 0x7000, 0x7005, 0x7006, 0x7007, 0x700D, 0x7017,
- 0x7020, 0x7023, 0x702F, 0x7034, 0x7037, 0x7039, 0x703C, 0x7043,
- 0x7044, 0x7048, 0x7049, 0x704A, 0x704B, 0x7054, 0x7055, 0x705D,
- 0x705E, 0x704E, 0x7064, 0x7065, 0x706C, 0x706E, 0x7075, 0x7076,
- 0x707E, 0x7081, 0x7085, 0x7086, 0x7094, 0x7095, 0x7096, 0x7097,
- 0x7098, 0x709B, 0x70A4, 0x70AB, 0x70B0, 0x70B1, 0x70B4, 0x70B7,
- 0x70CA, 0x70D1, 0x70D3, 0x70D4, 0x70D5, 0x70D6, 0x70D8, 0x70DC,
- 0x70E4, 0x70FA, 0x7103, 0x7104, 0x7105, 0x7106, 0x7107, 0x710B,
- 0x710C, 0x710F, 0x711E, 0x7120, 0x712B, 0x712D, 0x712F, 0x7130,
- 0x7131, 0x7138, 0x7141, 0x7145, 0x7146, 0x7147, 0x714A, 0x714B,
- 0x7150, 0x7152, 0x7157, 0x715A, 0x715C, 0x715E, 0x7160,
-};
-const unsigned short euc_to_utf8_8FCA[] = {
-         0x7168, 0x7179, 0x7180, 0x7185, 0x7187, 0x718C, 0x7192,
- 0x719A, 0x719B, 0x71A0, 0x71A2, 0x71AF, 0x71B0, 0x71B2, 0x71B3,
- 0x71BA, 0x71BF, 0x71C0, 0x71C1, 0x71C4, 0x71CB, 0x71CC, 0x71D3,
- 0x71D6, 0x71D9, 0x71DA, 0x71DC, 0x71F8, 0x71FE, 0x7200, 0x7207,
- 0x7208, 0x7209, 0x7213, 0x7217, 0x721A, 0x721D, 0x721F, 0x7224,
- 0x722B, 0x722F, 0x7234, 0x7238, 0x7239, 0x7241, 0x7242, 0x7243,
- 0x7245, 0x724E, 0x724F, 0x7250, 0x7253, 0x7255, 0x7256, 0x725A,
- 0x725C, 0x725E, 0x7260, 0x7263, 0x7268, 0x726B, 0x726E, 0x726F,
- 0x7271, 0x7277, 0x7278, 0x727B, 0x727C, 0x727F, 0x7284, 0x7289,
- 0x728D, 0x728E, 0x7293, 0x729B, 0x72A8, 0x72AD, 0x72AE, 0x72B1,
- 0x72B4, 0x72BE, 0x72C1, 0x72C7, 0x72C9, 0x72CC, 0x72D5, 0x72D6,
- 0x72D8, 0x72DF, 0x72E5, 0x72F3, 0x72F4, 0x72FA, 0x72FB,
-};
-const unsigned short euc_to_utf8_8FCB[] = {
-         0x72FE, 0x7302, 0x7304, 0x7305, 0x7307, 0x730B, 0x730D,
- 0x7312, 0x7313, 0x7318, 0x7319, 0x731E, 0x7322, 0x7324, 0x7327,
- 0x7328, 0x732C, 0x7331, 0x7332, 0x7335, 0x733A, 0x733B, 0x733D,
- 0x7343, 0x734D, 0x7350, 0x7352, 0x7356, 0x7358, 0x735D, 0x735E,
- 0x735F, 0x7360, 0x7366, 0x7367, 0x7369, 0x736B, 0x736C, 0x736E,
- 0x736F, 0x7371, 0x7377, 0x7379, 0x737C, 0x7380, 0x7381, 0x7383,
- 0x7385, 0x7386, 0x738E, 0x7390, 0x7393, 0x7395, 0x7397, 0x7398,
- 0x739C, 0x739E, 0x739F, 0x73A0, 0x73A2, 0x73A5, 0x73A6, 0x73AA,
- 0x73AB, 0x73AD, 0x73B5, 0x73B7, 0x73B9, 0x73BC, 0x73BD, 0x73BF,
- 0x73C5, 0x73C6, 0x73C9, 0x73CB, 0x73CC, 0x73CF, 0x73D2, 0x73D3,
- 0x73D6, 0x73D9, 0x73DD, 0x73E1, 0x73E3, 0x73E6, 0x73E7, 0x73E9,
- 0x73F4, 0x73F5, 0x73F7, 0x73F9, 0x73FA, 0x73FB, 0x73FD,
-};
-const unsigned short euc_to_utf8_8FCC[] = {
-         0x73FF, 0x7400, 0x7401, 0x7404, 0x7407, 0x740A, 0x7411,
- 0x741A, 0x741B, 0x7424, 0x7426, 0x7428, 0x7429, 0x742A, 0x742B,
- 0x742C, 0x742D, 0x742E, 0x742F, 0x7430, 0x7431, 0x7439, 0x7440,
- 0x7443, 0x7444, 0x7446, 0x7447, 0x744B, 0x744D, 0x7451, 0x7452,
- 0x7457, 0x745D, 0x7462, 0x7466, 0x7467, 0x7468, 0x746B, 0x746D,
- 0x746E, 0x7471, 0x7472, 0x7480, 0x7481, 0x7485, 0x7486, 0x7487,
- 0x7489, 0x748F, 0x7490, 0x7491, 0x7492, 0x7498, 0x7499, 0x749A,
- 0x749C, 0x749F, 0x74A0, 0x74A1, 0x74A3, 0x74A6, 0x74A8, 0x74A9,
- 0x74AA, 0x74AB, 0x74AE, 0x74AF, 0x74B1, 0x74B2, 0x74B5, 0x74B9,
- 0x74BB, 0x74BF, 0x74C8, 0x74C9, 0x74CC, 0x74D0, 0x74D3, 0x74D8,
- 0x74DA, 0x74DB, 0x74DE, 0x74DF, 0x74E4, 0x74E8, 0x74EA, 0x74EB,
- 0x74EF, 0x74F4, 0x74FA, 0x74FB, 0x74FC, 0x74FF, 0x7506,
-};
-const unsigned short euc_to_utf8_8FCD[] = {
-         0x7512, 0x7516, 0x7517, 0x7520, 0x7521, 0x7524, 0x7527,
- 0x7529, 0x752A, 0x752F, 0x7536, 0x7539, 0x753D, 0x753E, 0x753F,
- 0x7540, 0x7543, 0x7547, 0x7548, 0x754E, 0x7550, 0x7552, 0x7557,
- 0x755E, 0x755F, 0x7561, 0x756F, 0x7571, 0x7579, 0x757A, 0x757B,
- 0x757C, 0x757D, 0x757E, 0x7581, 0x7585, 0x7590, 0x7592, 0x7593,
- 0x7595, 0x7599, 0x759C, 0x75A2, 0x75A4, 0x75B4, 0x75BA, 0x75BF,
- 0x75C0, 0x75C1, 0x75C4, 0x75C6, 0x75CC, 0x75CE, 0x75CF, 0x75D7,
- 0x75DC, 0x75DF, 0x75E0, 0x75E1, 0x75E4, 0x75E7, 0x75EC, 0x75EE,
- 0x75EF, 0x75F1, 0x75F9, 0x7600, 0x7602, 0x7603, 0x7604, 0x7607,
- 0x7608, 0x760A, 0x760C, 0x760F, 0x7612, 0x7613, 0x7615, 0x7616,
- 0x7619, 0x761B, 0x761C, 0x761D, 0x761E, 0x7623, 0x7625, 0x7626,
- 0x7629, 0x762D, 0x7632, 0x7633, 0x7635, 0x7638, 0x7639,
-};
-const unsigned short euc_to_utf8_8FCE[] = {
-         0x763A, 0x763C, 0x764A, 0x7640, 0x7641, 0x7643, 0x7644,
- 0x7645, 0x7649, 0x764B, 0x7655, 0x7659, 0x765F, 0x7664, 0x7665,
- 0x766D, 0x766E, 0x766F, 0x7671, 0x7674, 0x7681, 0x7685, 0x768C,
- 0x768D, 0x7695, 0x769B, 0x769C, 0x769D, 0x769F, 0x76A0, 0x76A2,
- 0x76A3, 0x76A4, 0x76A5, 0x76A6, 0x76A7, 0x76A8, 0x76AA, 0x76AD,
- 0x76BD, 0x76C1, 0x76C5, 0x76C9, 0x76CB, 0x76CC, 0x76CE, 0x76D4,
- 0x76D9, 0x76E0, 0x76E6, 0x76E8, 0x76EC, 0x76F0, 0x76F1, 0x76F6,
- 0x76F9, 0x76FC, 0x7700, 0x7706, 0x770A, 0x770E, 0x7712, 0x7714,
- 0x7715, 0x7717, 0x7719, 0x771A, 0x771C, 0x7722, 0x7728, 0x772D,
- 0x772E, 0x772F, 0x7734, 0x7735, 0x7736, 0x7739, 0x773D, 0x773E,
- 0x7742, 0x7745, 0x7746, 0x774A, 0x774D, 0x774E, 0x774F, 0x7752,
- 0x7756, 0x7757, 0x775C, 0x775E, 0x775F, 0x7760, 0x7762,
-};
-const unsigned short euc_to_utf8_8FCF[] = {
-         0x7764, 0x7767, 0x776A, 0x776C, 0x7770, 0x7772, 0x7773,
- 0x7774, 0x777A, 0x777D, 0x7780, 0x7784, 0x778C, 0x778D, 0x7794,
- 0x7795, 0x7796, 0x779A, 0x779F, 0x77A2, 0x77A7, 0x77AA, 0x77AE,
- 0x77AF, 0x77B1, 0x77B5, 0x77BE, 0x77C3, 0x77C9, 0x77D1, 0x77D2,
- 0x77D5, 0x77D9, 0x77DE, 0x77DF, 0x77E0, 0x77E4, 0x77E6, 0x77EA,
- 0x77EC, 0x77F0, 0x77F1, 0x77F4, 0x77F8, 0x77FB, 0x7805, 0x7806,
- 0x7809, 0x780D, 0x780E, 0x7811, 0x781D, 0x7821, 0x7822, 0x7823,
- 0x782D, 0x782E, 0x7830, 0x7835, 0x7837, 0x7843, 0x7844, 0x7847,
- 0x7848, 0x784C, 0x784E, 0x7852, 0x785C, 0x785E, 0x7860, 0x7861,
- 0x7863, 0x7864, 0x7868, 0x786A, 0x786E, 0x787A, 0x787E, 0x788A,
- 0x788F, 0x7894, 0x7898, 0x78A1, 0x789D, 0x789E, 0x789F, 0x78A4,
- 0x78A8, 0x78AC, 0x78AD, 0x78B0, 0x78B1, 0x78B2, 0x78B3,
-};
-const unsigned short euc_to_utf8_8FD0[] = {
-         0x78BB, 0x78BD, 0x78BF, 0x78C7, 0x78C8, 0x78C9, 0x78CC,
- 0x78CE, 0x78D2, 0x78D3, 0x78D5, 0x78D6, 0x78E4, 0x78DB, 0x78DF,
- 0x78E0, 0x78E1, 0x78E6, 0x78EA, 0x78F2, 0x78F3, 0x7900, 0x78F6,
- 0x78F7, 0x78FA, 0x78FB, 0x78FF, 0x7906, 0x790C, 0x7910, 0x791A,
- 0x791C, 0x791E, 0x791F, 0x7920, 0x7925, 0x7927, 0x7929, 0x792D,
- 0x7931, 0x7934, 0x7935, 0x793B, 0x793D, 0x793F, 0x7944, 0x7945,
- 0x7946, 0x794A, 0x794B, 0x794F, 0x7951, 0x7954, 0x7958, 0x795B,
- 0x795C, 0x7967, 0x7969, 0x796B, 0x7972, 0x7979, 0x797B, 0x797C,
- 0x797E, 0x798B, 0x798C, 0x7991, 0x7993, 0x7994, 0x7995, 0x7996,
- 0x7998, 0x799B, 0x799C, 0x79A1, 0x79A8, 0x79A9, 0x79AB, 0x79AF,
- 0x79B1, 0x79B4, 0x79B8, 0x79BB, 0x79C2, 0x79C4, 0x79C7, 0x79C8,
- 0x79CA, 0x79CF, 0x79D4, 0x79D6, 0x79DA, 0x79DD, 0x79DE,
-};
-const unsigned short euc_to_utf8_8FD1[] = {
-         0x79E0, 0x79E2, 0x79E5, 0x79EA, 0x79EB, 0x79ED, 0x79F1,
- 0x79F8, 0x79FC, 0x7A02, 0x7A03, 0x7A07, 0x7A09, 0x7A0A, 0x7A0C,
- 0x7A11, 0x7A15, 0x7A1B, 0x7A1E, 0x7A21, 0x7A27, 0x7A2B, 0x7A2D,
- 0x7A2F, 0x7A30, 0x7A34, 0x7A35, 0x7A38, 0x7A39, 0x7A3A, 0x7A44,
- 0x7A45, 0x7A47, 0x7A48, 0x7A4C, 0x7A55, 0x7A56, 0x7A59, 0x7A5C,
- 0x7A5D, 0x7A5F, 0x7A60, 0x7A65, 0x7A67, 0x7A6A, 0x7A6D, 0x7A75,
- 0x7A78, 0x7A7E, 0x7A80, 0x7A82, 0x7A85, 0x7A86, 0x7A8A, 0x7A8B,
- 0x7A90, 0x7A91, 0x7A94, 0x7A9E, 0x7AA0, 0x7AA3, 0x7AAC, 0x7AB3,
- 0x7AB5, 0x7AB9, 0x7ABB, 0x7ABC, 0x7AC6, 0x7AC9, 0x7ACC, 0x7ACE,
- 0x7AD1, 0x7ADB, 0x7AE8, 0x7AE9, 0x7AEB, 0x7AEC, 0x7AF1, 0x7AF4,
- 0x7AFB, 0x7AFD, 0x7AFE, 0x7B07, 0x7B14, 0x7B1F, 0x7B23, 0x7B27,
- 0x7B29, 0x7B2A, 0x7B2B, 0x7B2D, 0x7B2E, 0x7B2F, 0x7B30,
-};
-const unsigned short euc_to_utf8_8FD2[] = {
-         0x7B31, 0x7B34, 0x7B3D, 0x7B3F, 0x7B40, 0x7B41, 0x7B47,
- 0x7B4E, 0x7B55, 0x7B60, 0x7B64, 0x7B66, 0x7B69, 0x7B6A, 0x7B6D,
- 0x7B6F, 0x7B72, 0x7B73, 0x7B77, 0x7B84, 0x7B89, 0x7B8E, 0x7B90,
- 0x7B91, 0x7B96, 0x7B9B, 0x7B9E, 0x7BA0, 0x7BA5, 0x7BAC, 0x7BAF,
- 0x7BB0, 0x7BB2, 0x7BB5, 0x7BB6, 0x7BBA, 0x7BBB, 0x7BBC, 0x7BBD,
- 0x7BC2, 0x7BC5, 0x7BC8, 0x7BCA, 0x7BD4, 0x7BD6, 0x7BD7, 0x7BD9,
- 0x7BDA, 0x7BDB, 0x7BE8, 0x7BEA, 0x7BF2, 0x7BF4, 0x7BF5, 0x7BF8,
- 0x7BF9, 0x7BFA, 0x7BFC, 0x7BFE, 0x7C01, 0x7C02, 0x7C03, 0x7C04,
- 0x7C06, 0x7C09, 0x7C0B, 0x7C0C, 0x7C0E, 0x7C0F, 0x7C19, 0x7C1B,
- 0x7C20, 0x7C25, 0x7C26, 0x7C28, 0x7C2C, 0x7C31, 0x7C33, 0x7C34,
- 0x7C36, 0x7C39, 0x7C3A, 0x7C46, 0x7C4A, 0x7C55, 0x7C51, 0x7C52,
- 0x7C53, 0x7C59, 0x7C5A, 0x7C5B, 0x7C5C, 0x7C5D, 0x7C5E,
-};
-const unsigned short euc_to_utf8_8FD3[] = {
-         0x7C61, 0x7C63, 0x7C67, 0x7C69, 0x7C6D, 0x7C6E, 0x7C70,
- 0x7C72, 0x7C79, 0x7C7C, 0x7C7D, 0x7C86, 0x7C87, 0x7C8F, 0x7C94,
- 0x7C9E, 0x7CA0, 0x7CA6, 0x7CB0, 0x7CB6, 0x7CB7, 0x7CBA, 0x7CBB,
- 0x7CBC, 0x7CBF, 0x7CC4, 0x7CC7, 0x7CC8, 0x7CC9, 0x7CCD, 0x7CCF,
- 0x7CD3, 0x7CD4, 0x7CD5, 0x7CD7, 0x7CD9, 0x7CDA, 0x7CDD, 0x7CE6,
- 0x7CE9, 0x7CEB, 0x7CF5, 0x7D03, 0x7D07, 0x7D08, 0x7D09, 0x7D0F,
- 0x7D11, 0x7D12, 0x7D13, 0x7D16, 0x7D1D, 0x7D1E, 0x7D23, 0x7D26,
- 0x7D2A, 0x7D2D, 0x7D31, 0x7D3C, 0x7D3D, 0x7D3E, 0x7D40, 0x7D41,
- 0x7D47, 0x7D48, 0x7D4D, 0x7D51, 0x7D53, 0x7D57, 0x7D59, 0x7D5A,
- 0x7D5C, 0x7D5D, 0x7D65, 0x7D67, 0x7D6A, 0x7D70, 0x7D78, 0x7D7A,
- 0x7D7B, 0x7D7F, 0x7D81, 0x7D82, 0x7D83, 0x7D85, 0x7D86, 0x7D88,
- 0x7D8B, 0x7D8C, 0x7D8D, 0x7D91, 0x7D96, 0x7D97, 0x7D9D,
-};
-const unsigned short euc_to_utf8_8FD4[] = {
-         0x7D9E, 0x7DA6, 0x7DA7, 0x7DAA, 0x7DB3, 0x7DB6, 0x7DB7,
- 0x7DB9, 0x7DC2, 0x7DC3, 0x7DC4, 0x7DC5, 0x7DC6, 0x7DCC, 0x7DCD,
- 0x7DCE, 0x7DD7, 0x7DD9, 0x7E00, 0x7DE2, 0x7DE5, 0x7DE6, 0x7DEA,
- 0x7DEB, 0x7DED, 0x7DF1, 0x7DF5, 0x7DF6, 0x7DF9, 0x7DFA, 0x7E08,
- 0x7E10, 0x7E11, 0x7E15, 0x7E17, 0x7E1C, 0x7E1D, 0x7E20, 0x7E27,
- 0x7E28, 0x7E2C, 0x7E2D, 0x7E2F, 0x7E33, 0x7E36, 0x7E3F, 0x7E44,
- 0x7E45, 0x7E47, 0x7E4E, 0x7E50, 0x7E52, 0x7E58, 0x7E5F, 0x7E61,
- 0x7E62, 0x7E65, 0x7E6B, 0x7E6E, 0x7E6F, 0x7E73, 0x7E78, 0x7E7E,
- 0x7E81, 0x7E86, 0x7E87, 0x7E8A, 0x7E8D, 0x7E91, 0x7E95, 0x7E98,
- 0x7E9A, 0x7E9D, 0x7E9E, 0x7F3C, 0x7F3B, 0x7F3D, 0x7F3E, 0x7F3F,
- 0x7F43, 0x7F44, 0x7F47, 0x7F4F, 0x7F52, 0x7F53, 0x7F5B, 0x7F5C,
- 0x7F5D, 0x7F61, 0x7F63, 0x7F64, 0x7F65, 0x7F66, 0x7F6D,
-};
-const unsigned short euc_to_utf8_8FD5[] = {
-         0x7F71, 0x7F7D, 0x7F7E, 0x7F7F, 0x7F80, 0x7F8B, 0x7F8D,
- 0x7F8F, 0x7F90, 0x7F91, 0x7F96, 0x7F97, 0x7F9C, 0x7FA1, 0x7FA2,
- 0x7FA6, 0x7FAA, 0x7FAD, 0x7FB4, 0x7FBC, 0x7FBF, 0x7FC0, 0x7FC3,
- 0x7FC8, 0x7FCE, 0x7FCF, 0x7FDB, 0x7FDF, 0x7FE3, 0x7FE5, 0x7FE8,
- 0x7FEC, 0x7FEE, 0x7FEF, 0x7FF2, 0x7FFA, 0x7FFD, 0x7FFE, 0x7FFF,
- 0x8007, 0x8008, 0x800A, 0x800D, 0x800E, 0x800F, 0x8011, 0x8013,
- 0x8014, 0x8016, 0x801D, 0x801E, 0x801F, 0x8020, 0x8024, 0x8026,
- 0x802C, 0x802E, 0x8030, 0x8034, 0x8035, 0x8037, 0x8039, 0x803A,
- 0x803C, 0x803E, 0x8040, 0x8044, 0x8060, 0x8064, 0x8066, 0x806D,
- 0x8071, 0x8075, 0x8081, 0x8088, 0x808E, 0x809C, 0x809E, 0x80A6,
- 0x80A7, 0x80AB, 0x80B8, 0x80B9, 0x80C8, 0x80CD, 0x80CF, 0x80D2,
- 0x80D4, 0x80D5, 0x80D7, 0x80D8, 0x80E0, 0x80ED, 0x80EE,
-};
-const unsigned short euc_to_utf8_8FD6[] = {
-         0x80F0, 0x80F2, 0x80F3, 0x80F6, 0x80F9, 0x80FA, 0x80FE,
- 0x8103, 0x810B, 0x8116, 0x8117, 0x8118, 0x811C, 0x811E, 0x8120,
- 0x8124, 0x8127, 0x812C, 0x8130, 0x8135, 0x813A, 0x813C, 0x8145,
- 0x8147, 0x814A, 0x814C, 0x8152, 0x8157, 0x8160, 0x8161, 0x8167,
- 0x8168, 0x8169, 0x816D, 0x816F, 0x8177, 0x8181, 0x8190, 0x8184,
- 0x8185, 0x8186, 0x818B, 0x818E, 0x8196, 0x8198, 0x819B, 0x819E,
- 0x81A2, 0x81AE, 0x81B2, 0x81B4, 0x81BB, 0x81CB, 0x81C3, 0x81C5,
- 0x81CA, 0x81CE, 0x81CF, 0x81D5, 0x81D7, 0x81DB, 0x81DD, 0x81DE,
- 0x81E1, 0x81E4, 0x81EB, 0x81EC, 0x81F0, 0x81F1, 0x81F2, 0x81F5,
- 0x81F6, 0x81F8, 0x81F9, 0x81FD, 0x81FF, 0x8200, 0x8203, 0x820F,
- 0x8213, 0x8214, 0x8219, 0x821A, 0x821D, 0x8221, 0x8222, 0x8228,
- 0x8232, 0x8234, 0x823A, 0x8243, 0x8244, 0x8245, 0x8246,
-};
-const unsigned short euc_to_utf8_8FD7[] = {
-         0x824B, 0x824E, 0x824F, 0x8251, 0x8256, 0x825C, 0x8260,
- 0x8263, 0x8267, 0x826D, 0x8274, 0x827B, 0x827D, 0x827F, 0x8280,
- 0x8281, 0x8283, 0x8284, 0x8287, 0x8289, 0x828A, 0x828E, 0x8291,
- 0x8294, 0x8296, 0x8298, 0x829A, 0x829B, 0x82A0, 0x82A1, 0x82A3,
- 0x82A4, 0x82A7, 0x82A8, 0x82A9, 0x82AA, 0x82AE, 0x82B0, 0x82B2,
- 0x82B4, 0x82B7, 0x82BA, 0x82BC, 0x82BE, 0x82BF, 0x82C6, 0x82D0,
- 0x82D5, 0x82DA, 0x82E0, 0x82E2, 0x82E4, 0x82E8, 0x82EA, 0x82ED,
- 0x82EF, 0x82F6, 0x82F7, 0x82FD, 0x82FE, 0x8300, 0x8301, 0x8307,
- 0x8308, 0x830A, 0x830B, 0x8354, 0x831B, 0x831D, 0x831E, 0x831F,
- 0x8321, 0x8322, 0x832C, 0x832D, 0x832E, 0x8330, 0x8333, 0x8337,
- 0x833A, 0x833C, 0x833D, 0x8342, 0x8343, 0x8344, 0x8347, 0x834D,
- 0x834E, 0x8351, 0x8355, 0x8356, 0x8357, 0x8370, 0x8378,
-};
-const unsigned short euc_to_utf8_8FD8[] = {
-         0x837D, 0x837F, 0x8380, 0x8382, 0x8384, 0x8386, 0x838D,
- 0x8392, 0x8394, 0x8395, 0x8398, 0x8399, 0x839B, 0x839C, 0x839D,
- 0x83A6, 0x83A7, 0x83A9, 0x83AC, 0x83BE, 0x83BF, 0x83C0, 0x83C7,
- 0x83C9, 0x83CF, 0x83D0, 0x83D1, 0x83D4, 0x83DD, 0x8353, 0x83E8,
- 0x83EA, 0x83F6, 0x83F8, 0x83F9, 0x83FC, 0x8401, 0x8406, 0x840A,
- 0x840F, 0x8411, 0x8415, 0x8419, 0x83AD, 0x842F, 0x8439, 0x8445,
- 0x8447, 0x8448, 0x844A, 0x844D, 0x844F, 0x8451, 0x8452, 0x8456,
- 0x8458, 0x8459, 0x845A, 0x845C, 0x8460, 0x8464, 0x8465, 0x8467,
- 0x846A, 0x8470, 0x8473, 0x8474, 0x8476, 0x8478, 0x847C, 0x847D,
- 0x8481, 0x8485, 0x8492, 0x8493, 0x8495, 0x849E, 0x84A6, 0x84A8,
- 0x84A9, 0x84AA, 0x84AF, 0x84B1, 0x84B4, 0x84BA, 0x84BD, 0x84BE,
- 0x84C0, 0x84C2, 0x84C7, 0x84C8, 0x84CC, 0x84CF, 0x84D3,
-};
-const unsigned short euc_to_utf8_8FD9[] = {
-         0x84DC, 0x84E7, 0x84EA, 0x84EF, 0x84F0, 0x84F1, 0x84F2,
- 0x84F7, 0x8532, 0x84FA, 0x84FB, 0x84FD, 0x8502, 0x8503, 0x8507,
- 0x850C, 0x850E, 0x8510, 0x851C, 0x851E, 0x8522, 0x8523, 0x8524,
- 0x8525, 0x8527, 0x852A, 0x852B, 0x852F, 0x8533, 0x8534, 0x8536,
- 0x853F, 0x8546, 0x854F, 0x8550, 0x8551, 0x8552, 0x8553, 0x8556,
- 0x8559, 0x855C, 0x855D, 0x855E, 0x855F, 0x8560, 0x8561, 0x8562,
- 0x8564, 0x856B, 0x856F, 0x8579, 0x857A, 0x857B, 0x857D, 0x857F,
- 0x8581, 0x8585, 0x8586, 0x8589, 0x858B, 0x858C, 0x858F, 0x8593,
- 0x8598, 0x859D, 0x859F, 0x85A0, 0x85A2, 0x85A5, 0x85A7, 0x85B4,
- 0x85B6, 0x85B7, 0x85B8, 0x85BC, 0x85BD, 0x85BE, 0x85BF, 0x85C2,
- 0x85C7, 0x85CA, 0x85CB, 0x85CE, 0x85AD, 0x85D8, 0x85DA, 0x85DF,
- 0x85E0, 0x85E6, 0x85E8, 0x85ED, 0x85F3, 0x85F6, 0x85FC,
-};
-const unsigned short euc_to_utf8_8FDA[] = {
-         0x85FF, 0x8600, 0x8604, 0x8605, 0x860D, 0x860E, 0x8610,
- 0x8611, 0x8612, 0x8618, 0x8619, 0x861B, 0x861E, 0x8621, 0x8627,
- 0x8629, 0x8636, 0x8638, 0x863A, 0x863C, 0x863D, 0x8640, 0x8642,
- 0x8646, 0x8652, 0x8653, 0x8656, 0x8657, 0x8658, 0x8659, 0x865D,
- 0x8660, 0x8661, 0x8662, 0x8663, 0x8664, 0x8669, 0x866C, 0x866F,
- 0x8675, 0x8676, 0x8677, 0x867A, 0x868D, 0x8691, 0x8696, 0x8698,
- 0x869A, 0x869C, 0x86A1, 0x86A6, 0x86A7, 0x86A8, 0x86AD, 0x86B1,
- 0x86B3, 0x86B4, 0x86B5, 0x86B7, 0x86B8, 0x86B9, 0x86BF, 0x86C0,
- 0x86C1, 0x86C3, 0x86C5, 0x86D1, 0x86D2, 0x86D5, 0x86D7, 0x86DA,
- 0x86DC, 0x86E0, 0x86E3, 0x86E5, 0x86E7, 0x8688, 0x86FA, 0x86FC,
- 0x86FD, 0x8704, 0x8705, 0x8707, 0x870B, 0x870E, 0x870F, 0x8710,
- 0x8713, 0x8714, 0x8719, 0x871E, 0x871F, 0x8721, 0x8723,
-};
-const unsigned short euc_to_utf8_8FDB[] = {
-         0x8728, 0x872E, 0x872F, 0x8731, 0x8732, 0x8739, 0x873A,
- 0x873C, 0x873D, 0x873E, 0x8740, 0x8743, 0x8745, 0x874D, 0x8758,
- 0x875D, 0x8761, 0x8764, 0x8765, 0x876F, 0x8771, 0x8772, 0x877B,
- 0x8783, 0x8784, 0x8785, 0x8786, 0x8787, 0x8788, 0x8789, 0x878B,
- 0x878C, 0x8790, 0x8793, 0x8795, 0x8797, 0x8798, 0x8799, 0x879E,
- 0x87A0, 0x87A3, 0x87A7, 0x87AC, 0x87AD, 0x87AE, 0x87B1, 0x87B5,
- 0x87BE, 0x87BF, 0x87C1, 0x87C8, 0x87C9, 0x87CA, 0x87CE, 0x87D5,
- 0x87D6, 0x87D9, 0x87DA, 0x87DC, 0x87DF, 0x87E2, 0x87E3, 0x87E4,
- 0x87EA, 0x87EB, 0x87ED, 0x87F1, 0x87F3, 0x87F8, 0x87FA, 0x87FF,
- 0x8801, 0x8803, 0x8806, 0x8809, 0x880A, 0x880B, 0x8810, 0x8819,
- 0x8812, 0x8813, 0x8814, 0x8818, 0x881A, 0x881B, 0x881C, 0x881E,
- 0x881F, 0x8828, 0x882D, 0x882E, 0x8830, 0x8832, 0x8835,
-};
-const unsigned short euc_to_utf8_8FDC[] = {
-         0x883A, 0x883C, 0x8841, 0x8843, 0x8845, 0x8848, 0x8849,
- 0x884A, 0x884B, 0x884E, 0x8851, 0x8855, 0x8856, 0x8858, 0x885A,
- 0x885C, 0x885F, 0x8860, 0x8864, 0x8869, 0x8871, 0x8879, 0x887B,
- 0x8880, 0x8898, 0x889A, 0x889B, 0x889C, 0x889F, 0x88A0, 0x88A8,
- 0x88AA, 0x88BA, 0x88BD, 0x88BE, 0x88C0, 0x88CA, 0x88CB, 0x88CC,
- 0x88CD, 0x88CE, 0x88D1, 0x88D2, 0x88D3, 0x88DB, 0x88DE, 0x88E7,
- 0x88EF, 0x88F0, 0x88F1, 0x88F5, 0x88F7, 0x8901, 0x8906, 0x890D,
- 0x890E, 0x890F, 0x8915, 0x8916, 0x8918, 0x8919, 0x891A, 0x891C,
- 0x8920, 0x8926, 0x8927, 0x8928, 0x8930, 0x8931, 0x8932, 0x8935,
- 0x8939, 0x893A, 0x893E, 0x8940, 0x8942, 0x8945, 0x8946, 0x8949,
- 0x894F, 0x8952, 0x8957, 0x895A, 0x895B, 0x895C, 0x8961, 0x8962,
- 0x8963, 0x896B, 0x896E, 0x8970, 0x8973, 0x8975, 0x897A,
-};
-const unsigned short euc_to_utf8_8FDD[] = {
-         0x897B, 0x897C, 0x897D, 0x8989, 0x898D, 0x8990, 0x8994,
- 0x8995, 0x899B, 0x899C, 0x899F, 0x89A0, 0x89A5, 0x89B0, 0x89B4,
- 0x89B5, 0x89B6, 0x89B7, 0x89BC, 0x89D4, 0x89D5, 0x89D6, 0x89D7,
- 0x89D8, 0x89E5, 0x89E9, 0x89EB, 0x89ED, 0x89F1, 0x89F3, 0x89F6,
- 0x89F9, 0x89FD, 0x89FF, 0x8A04, 0x8A05, 0x8A07, 0x8A0F, 0x8A11,
- 0x8A12, 0x8A14, 0x8A15, 0x8A1E, 0x8A20, 0x8A22, 0x8A24, 0x8A26,
- 0x8A2B, 0x8A2C, 0x8A2F, 0x8A35, 0x8A37, 0x8A3D, 0x8A3E, 0x8A40,
- 0x8A43, 0x8A45, 0x8A47, 0x8A49, 0x8A4D, 0x8A4E, 0x8A53, 0x8A56,
- 0x8A57, 0x8A58, 0x8A5C, 0x8A5D, 0x8A61, 0x8A65, 0x8A67, 0x8A75,
- 0x8A76, 0x8A77, 0x8A79, 0x8A7A, 0x8A7B, 0x8A7E, 0x8A7F, 0x8A80,
- 0x8A83, 0x8A86, 0x8A8B, 0x8A8F, 0x8A90, 0x8A92, 0x8A96, 0x8A97,
- 0x8A99, 0x8A9F, 0x8AA7, 0x8AA9, 0x8AAE, 0x8AAF, 0x8AB3,
-};
-const unsigned short euc_to_utf8_8FDE[] = {
-         0x8AB6, 0x8AB7, 0x8ABB, 0x8ABE, 0x8AC3, 0x8AC6, 0x8AC8,
- 0x8AC9, 0x8ACA, 0x8AD1, 0x8AD3, 0x8AD4, 0x8AD5, 0x8AD7, 0x8ADD,
- 0x8ADF, 0x8AEC, 0x8AF0, 0x8AF4, 0x8AF5, 0x8AF6, 0x8AFC, 0x8AFF,
- 0x8B05, 0x8B06, 0x8B0B, 0x8B11, 0x8B1C, 0x8B1E, 0x8B1F, 0x8B0A,
- 0x8B2D, 0x8B30, 0x8B37, 0x8B3C, 0x8B42, 0x8B43, 0x8B44, 0x8B45,
- 0x8B46, 0x8B48, 0x8B52, 0x8B53, 0x8B54, 0x8B59, 0x8B4D, 0x8B5E,
- 0x8B63, 0x8B6D, 0x8B76, 0x8B78, 0x8B79, 0x8B7C, 0x8B7E, 0x8B81,
- 0x8B84, 0x8B85, 0x8B8B, 0x8B8D, 0x8B8F, 0x8B94, 0x8B95, 0x8B9C,
- 0x8B9E, 0x8B9F, 0x8C38, 0x8C39, 0x8C3D, 0x8C3E, 0x8C45, 0x8C47,
- 0x8C49, 0x8C4B, 0x8C4F, 0x8C51, 0x8C53, 0x8C54, 0x8C57, 0x8C58,
- 0x8C5B, 0x8C5D, 0x8C59, 0x8C63, 0x8C64, 0x8C66, 0x8C68, 0x8C69,
- 0x8C6D, 0x8C73, 0x8C75, 0x8C76, 0x8C7B, 0x8C7E, 0x8C86,
-};
-const unsigned short euc_to_utf8_8FDF[] = {
-         0x8C87, 0x8C8B, 0x8C90, 0x8C92, 0x8C93, 0x8C99, 0x8C9B,
- 0x8C9C, 0x8CA4, 0x8CB9, 0x8CBA, 0x8CC5, 0x8CC6, 0x8CC9, 0x8CCB,
- 0x8CCF, 0x8CD6, 0x8CD5, 0x8CD9, 0x8CDD, 0x8CE1, 0x8CE8, 0x8CEC,
- 0x8CEF, 0x8CF0, 0x8CF2, 0x8CF5, 0x8CF7, 0x8CF8, 0x8CFE, 0x8CFF,
- 0x8D01, 0x8D03, 0x8D09, 0x8D12, 0x8D17, 0x8D1B, 0x8D65, 0x8D69,
- 0x8D6C, 0x8D6E, 0x8D7F, 0x8D82, 0x8D84, 0x8D88, 0x8D8D, 0x8D90,
- 0x8D91, 0x8D95, 0x8D9E, 0x8D9F, 0x8DA0, 0x8DA6, 0x8DAB, 0x8DAC,
- 0x8DAF, 0x8DB2, 0x8DB5, 0x8DB7, 0x8DB9, 0x8DBB, 0x8DC0, 0x8DC5,
- 0x8DC6, 0x8DC7, 0x8DC8, 0x8DCA, 0x8DCE, 0x8DD1, 0x8DD4, 0x8DD5,
- 0x8DD7, 0x8DD9, 0x8DE4, 0x8DE5, 0x8DE7, 0x8DEC, 0x8DF0, 0x8DBC,
- 0x8DF1, 0x8DF2, 0x8DF4, 0x8DFD, 0x8E01, 0x8E04, 0x8E05, 0x8E06,
- 0x8E0B, 0x8E11, 0x8E14, 0x8E16, 0x8E20, 0x8E21, 0x8E22,
-};
-const unsigned short euc_to_utf8_8FE0[] = {
-         0x8E23, 0x8E26, 0x8E27, 0x8E31, 0x8E33, 0x8E36, 0x8E37,
- 0x8E38, 0x8E39, 0x8E3D, 0x8E40, 0x8E41, 0x8E4B, 0x8E4D, 0x8E4E,
- 0x8E4F, 0x8E54, 0x8E5B, 0x8E5C, 0x8E5D, 0x8E5E, 0x8E61, 0x8E62,
- 0x8E69, 0x8E6C, 0x8E6D, 0x8E6F, 0x8E70, 0x8E71, 0x8E79, 0x8E7A,
- 0x8E7B, 0x8E82, 0x8E83, 0x8E89, 0x8E90, 0x8E92, 0x8E95, 0x8E9A,
- 0x8E9B, 0x8E9D, 0x8E9E, 0x8EA2, 0x8EA7, 0x8EA9, 0x8EAD, 0x8EAE,
- 0x8EB3, 0x8EB5, 0x8EBA, 0x8EBB, 0x8EC0, 0x8EC1, 0x8EC3, 0x8EC4,
- 0x8EC7, 0x8ECF, 0x8ED1, 0x8ED4, 0x8EDC, 0x8EE8, 0x8EEE, 0x8EF0,
- 0x8EF1, 0x8EF7, 0x8EF9, 0x8EFA, 0x8EED, 0x8F00, 0x8F02, 0x8F07,
- 0x8F08, 0x8F0F, 0x8F10, 0x8F16, 0x8F17, 0x8F18, 0x8F1E, 0x8F20,
- 0x8F21, 0x8F23, 0x8F25, 0x8F27, 0x8F28, 0x8F2C, 0x8F2D, 0x8F2E,
- 0x8F34, 0x8F35, 0x8F36, 0x8F37, 0x8F3A, 0x8F40, 0x8F41,
-};
-const unsigned short euc_to_utf8_8FE1[] = {
-         0x8F43, 0x8F47, 0x8F4F, 0x8F51, 0x8F52, 0x8F53, 0x8F54,
- 0x8F55, 0x8F58, 0x8F5D, 0x8F5E, 0x8F65, 0x8F9D, 0x8FA0, 0x8FA1,
- 0x8FA4, 0x8FA5, 0x8FA6, 0x8FB5, 0x8FB6, 0x8FB8, 0x8FBE, 0x8FC0,
- 0x8FC1, 0x8FC6, 0x8FCA, 0x8FCB, 0x8FCD, 0x8FD0, 0x8FD2, 0x8FD3,
- 0x8FD5, 0x8FE0, 0x8FE3, 0x8FE4, 0x8FE8, 0x8FEE, 0x8FF1, 0x8FF5,
- 0x8FF6, 0x8FFB, 0x8FFE, 0x9002, 0x9004, 0x9008, 0x900C, 0x9018,
- 0x901B, 0x9028, 0x9029, 0x902F, 0x902A, 0x902C, 0x902D, 0x9033,
- 0x9034, 0x9037, 0x903F, 0x9043, 0x9044, 0x904C, 0x905B, 0x905D,
- 0x9062, 0x9066, 0x9067, 0x906C, 0x9070, 0x9074, 0x9079, 0x9085,
- 0x9088, 0x908B, 0x908C, 0x908E, 0x9090, 0x9095, 0x9097, 0x9098,
- 0x9099, 0x909B, 0x90A0, 0x90A1, 0x90A2, 0x90A5, 0x90B0, 0x90B2,
- 0x90B3, 0x90B4, 0x90B6, 0x90BD, 0x90CC, 0x90BE, 0x90C3,
-};
-const unsigned short euc_to_utf8_8FE2[] = {
-         0x90C4, 0x90C5, 0x90C7, 0x90C8, 0x90D5, 0x90D7, 0x90D8,
- 0x90D9, 0x90DC, 0x90DD, 0x90DF, 0x90E5, 0x90D2, 0x90F6, 0x90EB,
- 0x90EF, 0x90F0, 0x90F4, 0x90FE, 0x90FF, 0x9100, 0x9104, 0x9105,
- 0x9106, 0x9108, 0x910D, 0x9110, 0x9114, 0x9116, 0x9117, 0x9118,
- 0x911A, 0x911C, 0x911E, 0x9120, 0x9125, 0x9122, 0x9123, 0x9127,
- 0x9129, 0x912E, 0x912F, 0x9131, 0x9134, 0x9136, 0x9137, 0x9139,
- 0x913A, 0x913C, 0x913D, 0x9143, 0x9147, 0x9148, 0x914F, 0x9153,
- 0x9157, 0x9159, 0x915A, 0x915B, 0x9161, 0x9164, 0x9167, 0x916D,
- 0x9174, 0x9179, 0x917A, 0x917B, 0x9181, 0x9183, 0x9185, 0x9186,
- 0x918A, 0x918E, 0x9191, 0x9193, 0x9194, 0x9195, 0x9198, 0x919E,
- 0x91A1, 0x91A6, 0x91A8, 0x91AC, 0x91AD, 0x91AE, 0x91B0, 0x91B1,
- 0x91B2, 0x91B3, 0x91B6, 0x91BB, 0x91BC, 0x91BD, 0x91BF,
-};
-const unsigned short euc_to_utf8_8FE3[] = {
-         0x91C2, 0x91C3, 0x91C5, 0x91D3, 0x91D4, 0x91D7, 0x91D9,
- 0x91DA, 0x91DE, 0x91E4, 0x91E5, 0x91E9, 0x91EA, 0x91EC, 0x91ED,
- 0x91EE, 0x91EF, 0x91F0, 0x91F1, 0x91F7, 0x91F9, 0x91FB, 0x91FD,
- 0x9200, 0x9201, 0x9204, 0x9205, 0x9206, 0x9207, 0x9209, 0x920A,
- 0x920C, 0x9210, 0x9212, 0x9213, 0x9216, 0x9218, 0x921C, 0x921D,
- 0x9223, 0x9224, 0x9225, 0x9226, 0x9228, 0x922E, 0x922F, 0x9230,
- 0x9233, 0x9235, 0x9236, 0x9238, 0x9239, 0x923A, 0x923C, 0x923E,
- 0x9240, 0x9242, 0x9243, 0x9246, 0x9247, 0x924A, 0x924D, 0x924E,
- 0x924F, 0x9251, 0x9258, 0x9259, 0x925C, 0x925D, 0x9260, 0x9261,
- 0x9265, 0x9267, 0x9268, 0x9269, 0x926E, 0x926F, 0x9270, 0x9275,
- 0x9276, 0x9277, 0x9278, 0x9279, 0x927B, 0x927C, 0x927D, 0x927F,
- 0x9288, 0x9289, 0x928A, 0x928D, 0x928E, 0x9292, 0x9297,
-};
-const unsigned short euc_to_utf8_8FE4[] = {
-         0x9299, 0x929F, 0x92A0, 0x92A4, 0x92A5, 0x92A7, 0x92A8,
- 0x92AB, 0x92AF, 0x92B2, 0x92B6, 0x92B8, 0x92BA, 0x92BB, 0x92BC,
- 0x92BD, 0x92BF, 0x92C0, 0x92C1, 0x92C2, 0x92C3, 0x92C5, 0x92C6,
- 0x92C7, 0x92C8, 0x92CB, 0x92CC, 0x92CD, 0x92CE, 0x92D0, 0x92D3,
- 0x92D5, 0x92D7, 0x92D8, 0x92D9, 0x92DC, 0x92DD, 0x92DF, 0x92E0,
- 0x92E1, 0x92E3, 0x92E5, 0x92E7, 0x92E8, 0x92EC, 0x92EE, 0x92F0,
- 0x92F9, 0x92FB, 0x92FF, 0x9300, 0x9302, 0x9308, 0x930D, 0x9311,
- 0x9314, 0x9315, 0x931C, 0x931D, 0x931E, 0x931F, 0x9321, 0x9324,
- 0x9325, 0x9327, 0x9329, 0x932A, 0x9333, 0x9334, 0x9336, 0x9337,
- 0x9347, 0x9348, 0x9349, 0x9350, 0x9351, 0x9352, 0x9355, 0x9357,
- 0x9358, 0x935A, 0x935E, 0x9364, 0x9365, 0x9367, 0x9369, 0x936A,
- 0x936D, 0x936F, 0x9370, 0x9371, 0x9373, 0x9374, 0x9376,
-};
-const unsigned short euc_to_utf8_8FE5[] = {
-         0x937A, 0x937D, 0x937F, 0x9380, 0x9381, 0x9382, 0x9388,
- 0x938A, 0x938B, 0x938D, 0x938F, 0x9392, 0x9395, 0x9398, 0x939B,
- 0x939E, 0x93A1, 0x93A3, 0x93A4, 0x93A6, 0x93A8, 0x93AB, 0x93B4,
- 0x93B5, 0x93B6, 0x93BA, 0x93A9, 0x93C1, 0x93C4, 0x93C5, 0x93C6,
- 0x93C7, 0x93C9, 0x93CA, 0x93CB, 0x93CC, 0x93CD, 0x93D3, 0x93D9,
- 0x93DC, 0x93DE, 0x93DF, 0x93E2, 0x93E6, 0x93E7, 0x93F9, 0x93F7,
- 0x93F8, 0x93FA, 0x93FB, 0x93FD, 0x9401, 0x9402, 0x9404, 0x9408,
- 0x9409, 0x940D, 0x940E, 0x940F, 0x9415, 0x9416, 0x9417, 0x941F,
- 0x942E, 0x942F, 0x9431, 0x9432, 0x9433, 0x9434, 0x943B, 0x943F,
- 0x943D, 0x9443, 0x9445, 0x9448, 0x944A, 0x944C, 0x9455, 0x9459,
- 0x945C, 0x945F, 0x9461, 0x9463, 0x9468, 0x946B, 0x946D, 0x946E,
- 0x946F, 0x9471, 0x9472, 0x9484, 0x9483, 0x9578, 0x9579,
-};
-const unsigned short euc_to_utf8_8FE6[] = {
-         0x957E, 0x9584, 0x9588, 0x958C, 0x958D, 0x958E, 0x959D,
- 0x959E, 0x959F, 0x95A1, 0x95A6, 0x95A9, 0x95AB, 0x95AC, 0x95B4,
- 0x95B6, 0x95BA, 0x95BD, 0x95BF, 0x95C6, 0x95C8, 0x95C9, 0x95CB,
- 0x95D0, 0x95D1, 0x95D2, 0x95D3, 0x95D9, 0x95DA, 0x95DD, 0x95DE,
- 0x95DF, 0x95E0, 0x95E4, 0x95E6, 0x961D, 0x961E, 0x9622, 0x9624,
- 0x9625, 0x9626, 0x962C, 0x9631, 0x9633, 0x9637, 0x9638, 0x9639,
- 0x963A, 0x963C, 0x963D, 0x9641, 0x9652, 0x9654, 0x9656, 0x9657,
- 0x9658, 0x9661, 0x966E, 0x9674, 0x967B, 0x967C, 0x967E, 0x967F,
- 0x9681, 0x9682, 0x9683, 0x9684, 0x9689, 0x9691, 0x9696, 0x969A,
- 0x969D, 0x969F, 0x96A4, 0x96A5, 0x96A6, 0x96A9, 0x96AE, 0x96AF,
- 0x96B3, 0x96BA, 0x96CA, 0x96D2, 0x5DB2, 0x96D8, 0x96DA, 0x96DD,
- 0x96DE, 0x96DF, 0x96E9, 0x96EF, 0x96F1, 0x96FA, 0x9702,
-};
-const unsigned short euc_to_utf8_8FE7[] = {
-         0x9703, 0x9705, 0x9709, 0x971A, 0x971B, 0x971D, 0x9721,
- 0x9722, 0x9723, 0x9728, 0x9731, 0x9733, 0x9741, 0x9743, 0x974A,
- 0x974E, 0x974F, 0x9755, 0x9757, 0x9758, 0x975A, 0x975B, 0x9763,
- 0x9767, 0x976A, 0x976E, 0x9773, 0x9776, 0x9777, 0x9778, 0x977B,
- 0x977D, 0x977F, 0x9780, 0x9789, 0x9795, 0x9796, 0x9797, 0x9799,
- 0x979A, 0x979E, 0x979F, 0x97A2, 0x97AC, 0x97AE, 0x97B1, 0x97B2,
- 0x97B5, 0x97B6, 0x97B8, 0x97B9, 0x97BA, 0x97BC, 0x97BE, 0x97BF,
- 0x97C1, 0x97C4, 0x97C5, 0x97C7, 0x97C9, 0x97CA, 0x97CC, 0x97CD,
- 0x97CE, 0x97D0, 0x97D1, 0x97D4, 0x97D7, 0x97D8, 0x97D9, 0x97DD,
- 0x97DE, 0x97E0, 0x97DB, 0x97E1, 0x97E4, 0x97EF, 0x97F1, 0x97F4,
- 0x97F7, 0x97F8, 0x97FA, 0x9807, 0x980A, 0x9819, 0x980D, 0x980E,
- 0x9814, 0x9816, 0x981C, 0x981E, 0x9820, 0x9823, 0x9826,
-};
-const unsigned short euc_to_utf8_8FE8[] = {
-         0x982B, 0x982E, 0x982F, 0x9830, 0x9832, 0x9833, 0x9835,
- 0x9825, 0x983E, 0x9844, 0x9847, 0x984A, 0x9851, 0x9852, 0x9853,
- 0x9856, 0x9857, 0x9859, 0x985A, 0x9862, 0x9863, 0x9865, 0x9866,
- 0x986A, 0x986C, 0x98AB, 0x98AD, 0x98AE, 0x98B0, 0x98B4, 0x98B7,
- 0x98B8, 0x98BA, 0x98BB, 0x98BF, 0x98C2, 0x98C5, 0x98C8, 0x98CC,
- 0x98E1, 0x98E3, 0x98E5, 0x98E6, 0x98E7, 0x98EA, 0x98F3, 0x98F6,
- 0x9902, 0x9907, 0x9908, 0x9911, 0x9915, 0x9916, 0x9917, 0x991A,
- 0x991B, 0x991C, 0x991F, 0x9922, 0x9926, 0x9927, 0x992B, 0x9931,
- 0x9932, 0x9933, 0x9934, 0x9935, 0x9939, 0x993A, 0x993B, 0x993C,
- 0x9940, 0x9941, 0x9946, 0x9947, 0x9948, 0x994D, 0x994E, 0x9954,
- 0x9958, 0x9959, 0x995B, 0x995C, 0x995E, 0x995F, 0x9960, 0x999B,
- 0x999D, 0x999F, 0x99A6, 0x99B0, 0x99B1, 0x99B2, 0x99B5,
-};
-const unsigned short euc_to_utf8_8FE9[] = {
-         0x99B9, 0x99BA, 0x99BD, 0x99BF, 0x99C3, 0x99C9, 0x99D3,
- 0x99D4, 0x99D9, 0x99DA, 0x99DC, 0x99DE, 0x99E7, 0x99EA, 0x99EB,
- 0x99EC, 0x99F0, 0x99F4, 0x99F5, 0x99F9, 0x99FD, 0x99FE, 0x9A02,
- 0x9A03, 0x9A04, 0x9A0B, 0x9A0C, 0x9A10, 0x9A11, 0x9A16, 0x9A1E,
- 0x9A20, 0x9A22, 0x9A23, 0x9A24, 0x9A27, 0x9A2D, 0x9A2E, 0x9A33,
- 0x9A35, 0x9A36, 0x9A38, 0x9A47, 0x9A41, 0x9A44, 0x9A4A, 0x9A4B,
- 0x9A4C, 0x9A4E, 0x9A51, 0x9A54, 0x9A56, 0x9A5D, 0x9AAA, 0x9AAC,
- 0x9AAE, 0x9AAF, 0x9AB2, 0x9AB4, 0x9AB5, 0x9AB6, 0x9AB9, 0x9ABB,
- 0x9ABE, 0x9ABF, 0x9AC1, 0x9AC3, 0x9AC6, 0x9AC8, 0x9ACE, 0x9AD0,
- 0x9AD2, 0x9AD5, 0x9AD6, 0x9AD7, 0x9ADB, 0x9ADC, 0x9AE0, 0x9AE4,
- 0x9AE5, 0x9AE7, 0x9AE9, 0x9AEC, 0x9AF2, 0x9AF3, 0x9AF5, 0x9AF9,
- 0x9AFA, 0x9AFD, 0x9AFF, 0x9B00, 0x9B01, 0x9B02, 0x9B03,
-};
-const unsigned short euc_to_utf8_8FEA[] = {
-         0x9B04, 0x9B05, 0x9B08, 0x9B09, 0x9B0B, 0x9B0C, 0x9B0D,
- 0x9B0E, 0x9B10, 0x9B12, 0x9B16, 0x9B19, 0x9B1B, 0x9B1C, 0x9B20,
- 0x9B26, 0x9B2B, 0x9B2D, 0x9B33, 0x9B34, 0x9B35, 0x9B37, 0x9B39,
- 0x9B3A, 0x9B3D, 0x9B48, 0x9B4B, 0x9B4C, 0x9B55, 0x9B56, 0x9B57,
- 0x9B5B, 0x9B5E, 0x9B61, 0x9B63, 0x9B65, 0x9B66, 0x9B68, 0x9B6A,
- 0x9B6B, 0x9B6C, 0x9B6D, 0x9B6E, 0x9B73, 0x9B75, 0x9B77, 0x9B78,
- 0x9B79, 0x9B7F, 0x9B80, 0x9B84, 0x9B85, 0x9B86, 0x9B87, 0x9B89,
- 0x9B8A, 0x9B8B, 0x9B8D, 0x9B8F, 0x9B90, 0x9B94, 0x9B9A, 0x9B9D,
- 0x9B9E, 0x9BA6, 0x9BA7, 0x9BA9, 0x9BAC, 0x9BB0, 0x9BB1, 0x9BB2,
- 0x9BB7, 0x9BB8, 0x9BBB, 0x9BBC, 0x9BBE, 0x9BBF, 0x9BC1, 0x9BC7,
- 0x9BC8, 0x9BCE, 0x9BD0, 0x9BD7, 0x9BD8, 0x9BDD, 0x9BDF, 0x9BE5,
- 0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF, 0x9BF3, 0x9BF7, 0x9BF8,
-};
-const unsigned short euc_to_utf8_8FEB[] = {
-         0x9BF9, 0x9BFA, 0x9BFD, 0x9BFF, 0x9C00, 0x9C02, 0x9C0B,
- 0x9C0F, 0x9C11, 0x9C16, 0x9C18, 0x9C19, 0x9C1A, 0x9C1C, 0x9C1E,
- 0x9C22, 0x9C23, 0x9C26, 0x9C27, 0x9C28, 0x9C29, 0x9C2A, 0x9C31,
- 0x9C35, 0x9C36, 0x9C37, 0x9C3D, 0x9C41, 0x9C43, 0x9C44, 0x9C45,
- 0x9C49, 0x9C4A, 0x9C4E, 0x9C4F, 0x9C50, 0x9C53, 0x9C54, 0x9C56,
- 0x9C58, 0x9C5B, 0x9C5D, 0x9C5E, 0x9C5F, 0x9C63, 0x9C69, 0x9C6A,
- 0x9C5C, 0x9C6B, 0x9C68, 0x9C6E, 0x9C70, 0x9C72, 0x9C75, 0x9C77,
- 0x9C7B, 0x9CE6, 0x9CF2, 0x9CF7, 0x9CF9, 0x9D0B, 0x9D02, 0x9D11,
- 0x9D17, 0x9D18, 0x9D1C, 0x9D1D, 0x9D1E, 0x9D2F, 0x9D30, 0x9D32,
- 0x9D33, 0x9D34, 0x9D3A, 0x9D3C, 0x9D45, 0x9D3D, 0x9D42, 0x9D43,
- 0x9D47, 0x9D4A, 0x9D53, 0x9D54, 0x9D5F, 0x9D63, 0x9D62, 0x9D65,
- 0x9D69, 0x9D6A, 0x9D6B, 0x9D70, 0x9D76, 0x9D77, 0x9D7B,
-};
-const unsigned short euc_to_utf8_8FEC[] = {
-         0x9D7C, 0x9D7E, 0x9D83, 0x9D84, 0x9D86, 0x9D8A, 0x9D8D,
- 0x9D8E, 0x9D92, 0x9D93, 0x9D95, 0x9D96, 0x9D97, 0x9D98, 0x9DA1,
- 0x9DAA, 0x9DAC, 0x9DAE, 0x9DB1, 0x9DB5, 0x9DB9, 0x9DBC, 0x9DBF,
- 0x9DC3, 0x9DC7, 0x9DC9, 0x9DCA, 0x9DD4, 0x9DD5, 0x9DD6, 0x9DD7,
- 0x9DDA, 0x9DDE, 0x9DDF, 0x9DE0, 0x9DE5, 0x9DE7, 0x9DE9, 0x9DEB,
- 0x9DEE, 0x9DF0, 0x9DF3, 0x9DF4, 0x9DFE, 0x9E0A, 0x9E02, 0x9E07,
- 0x9E0E, 0x9E10, 0x9E11, 0x9E12, 0x9E15, 0x9E16, 0x9E19, 0x9E1C,
- 0x9E1D, 0x9E7A, 0x9E7B, 0x9E7C, 0x9E80, 0x9E82, 0x9E83, 0x9E84,
- 0x9E85, 0x9E87, 0x9E8E, 0x9E8F, 0x9E96, 0x9E98, 0x9E9B, 0x9E9E,
- 0x9EA4, 0x9EA8, 0x9EAC, 0x9EAE, 0x9EAF, 0x9EB0, 0x9EB3, 0x9EB4,
- 0x9EB5, 0x9EC6, 0x9EC8, 0x9ECB, 0x9ED5, 0x9EDF, 0x9EE4, 0x9EE7,
- 0x9EEC, 0x9EED, 0x9EEE, 0x9EF0, 0x9EF1, 0x9EF2, 0x9EF5,
-};
-const unsigned short euc_to_utf8_8FED[] = {
-         0x9EF8, 0x9EFF, 0x9F02, 0x9F03, 0x9F09, 0x9F0F, 0x9F10,
- 0x9F11, 0x9F12, 0x9F14, 0x9F16, 0x9F17, 0x9F19, 0x9F1A, 0x9F1B,
- 0x9F1F, 0x9F22, 0x9F26, 0x9F2A, 0x9F2B, 0x9F2F, 0x9F31, 0x9F32,
- 0x9F34, 0x9F37, 0x9F39, 0x9F3A, 0x9F3C, 0x9F3D, 0x9F3F, 0x9F41,
- 0x9F43, 0x9F44, 0x9F45, 0x9F46, 0x9F47, 0x9F53, 0x9F55, 0x9F56,
- 0x9F57, 0x9F58, 0x9F5A, 0x9F5D, 0x9F5E, 0x9F68, 0x9F69, 0x9F6D,
- 0x9F6E, 0x9F6F, 0x9F70, 0x9F71, 0x9F73, 0x9F75, 0x9F7A, 0x9F7D,
- 0x9F8F, 0x9F90, 0x9F91, 0x9F92, 0x9F94, 0x9F96, 0x9F97, 0x9F9E,
- 0x9FA1, 0x9FA2, 0x9FA3, 0x9FA5,      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,
-};
-const unsigned short euc_to_utf8_8FF3[] = {
-              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,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174,
- 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x2160, 0x2161,
-};
-const unsigned short euc_to_utf8_8FF4[] = {
-            0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168,
-    0x2169, 0xff07, 0xff02, 0x3231, 0x2116, 0x2121, 0x70bb, 0x4efc,
-    0x50f4, 0x51ec, 0x5307, 0x5324, 0xfa0e, 0x548a, 0x5759, 0xfa0f,
-    0xfa10, 0x589e, 0x5bec, 0x5cf5, 0x5d53, 0xfa11, 0x5fb7, 0x6085,
-    0x6120, 0x654e, 0x663b, 0x6665, 0xfa12, 0xf929, 0x6801, 0xfa13,
-    0xfa14, 0x6a6b, 0x6ae2, 0x6df8, 0x6df2, 0x7028, 0xfa15, 0xfa16,
-    0x7501, 0x7682, 0x769e, 0xfa17, 0x7930, 0xfa18, 0xfa19, 0xfa1a,
-    0xfa1b, 0x7ae7, 0xfa1c, 0xfa1d, 0x7da0, 0x7dd6, 0xfa1e, 0x8362,
-    0xfa1f, 0x85b0, 0xfa20, 0xfa21, 0x8807, 0xfa22, 0x8b7f, 0x8cf4,
-    0x8d76, 0xfa23, 0xfa24, 0xfa25, 0x90de, 0xfa26, 0x9115, 0xfa27,
-    0xfa28, 0x9592, 0xf9dc, 0xfa29, 0x973b, 0x974d, 0x9751, 0xfa2a,
-    0xfa2b, 0xfa2c, 0x999e, 0x9ad9, 0x9b72, 0xfa2d, 0x9ed1,
-};
-#endif /* X0212_ENABLE */
-
-const unsigned short euc_to_utf8_1byte[] = {
-         0xFF61, 0xFF62, 0xFF63, 0xFF64, 0xFF65, 0xFF66, 0xFF67,
- 0xFF68, 0xFF69, 0xFF6A, 0xFF6B, 0xFF6C, 0xFF6D, 0xFF6E, 0xFF6F,
- 0xFF70, 0xFF71, 0xFF72, 0xFF73, 0xFF74, 0xFF75, 0xFF76, 0xFF77,
- 0xFF78, 0xFF79, 0xFF7A, 0xFF7B, 0xFF7C, 0xFF7D, 0xFF7E, 0xFF7F,
- 0xFF80, 0xFF81, 0xFF82, 0xFF83, 0xFF84, 0xFF85, 0xFF86, 0xFF87,
- 0xFF88, 0xFF89, 0xFF8A, 0xFF8B, 0xFF8C, 0xFF8D, 0xFF8E, 0xFF8F,
- 0xFF90, 0xFF91, 0xFF92, 0xFF93, 0xFF94, 0xFF95, 0xFF96, 0xFF97,
- 0xFF98, 0xFF99, 0xFF9A, 0xFF9B, 0xFF9C, 0xFF9D, 0xFF9E, 0xFF9F,
-      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, 0x00A9, 0x2122,
-};
-const unsigned short *const euc_to_utf8_2bytes[] = {
-                 euc_to_utf8_A1, euc_to_utf8_A2, euc_to_utf8_A3,
- euc_to_utf8_A4, euc_to_utf8_A5, euc_to_utf8_A6, euc_to_utf8_A7,
- euc_to_utf8_A8, euc_to_utf8_A9, euc_to_utf8_AA, euc_to_utf8_AB,
- euc_to_utf8_AC, euc_to_utf8_AD, euc_to_utf8_AE, euc_to_utf8_AF,
- euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
- euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
- euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
- euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
- euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
- euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
- euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
- euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF,
- euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
- euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
- euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
- euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
- euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
- euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
- euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
- euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
- euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
- euc_to_utf8_F4, euc_to_utf8_F5,              0,              0,
-              0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
- euc_to_utf8_FC,              0,              0,
-};
-/* Microsoft UCS Mapping Compatible */
-const unsigned short *const euc_to_utf8_2bytes_ms[] = {
-                 euc_to_utf8_A1_ms, euc_to_utf8_A2_ms, euc_to_utf8_A3,
- euc_to_utf8_A4, euc_to_utf8_A5, euc_to_utf8_A6, euc_to_utf8_A7,
- euc_to_utf8_A8, euc_to_utf8_A9, euc_to_utf8_AA, euc_to_utf8_AB,
- euc_to_utf8_AC, euc_to_utf8_AD, euc_to_utf8_AE, euc_to_utf8_AF,
- euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
- euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
- euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
- euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
- euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
- euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
- euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
- euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF,
- euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
- euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
- euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
- euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
- euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
- euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
- euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
- euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
- euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
- euc_to_utf8_F4, euc_to_utf8_F5,              0,              0,
-              0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
- euc_to_utf8_FC_ms,              0,              0,
-};
-
-#ifdef X0212_ENABLE
-const unsigned short *const x0212_to_utf8_2bytes[] = {
-                              0, euc_to_utf8_8FA2,              0,
-              0,              0, euc_to_utf8_8FA6, euc_to_utf8_8FA7,
-              0, euc_to_utf8_8FA9, euc_to_utf8_8FAA, euc_to_utf8_8FAB,
-              0,              0,              0,              0,
- euc_to_utf8_8FB0, euc_to_utf8_8FB1, euc_to_utf8_8FB2, euc_to_utf8_8FB3,
- euc_to_utf8_8FB4, euc_to_utf8_8FB5, euc_to_utf8_8FB6, euc_to_utf8_8FB7,
- euc_to_utf8_8FB8, euc_to_utf8_8FB9, euc_to_utf8_8FBA, euc_to_utf8_8FBB,
- euc_to_utf8_8FBC, euc_to_utf8_8FBD, euc_to_utf8_8FBE, euc_to_utf8_8FBF,
- euc_to_utf8_8FC0, euc_to_utf8_8FC1, euc_to_utf8_8FC2, euc_to_utf8_8FC3,
- euc_to_utf8_8FC4, euc_to_utf8_8FC5, euc_to_utf8_8FC6, euc_to_utf8_8FC7,
- euc_to_utf8_8FC8, euc_to_utf8_8FC9, euc_to_utf8_8FCA, euc_to_utf8_8FCB,
- euc_to_utf8_8FCC, euc_to_utf8_8FCD, euc_to_utf8_8FCE, euc_to_utf8_8FCF,
- euc_to_utf8_8FD0, euc_to_utf8_8FD1, euc_to_utf8_8FD2, euc_to_utf8_8FD3,
- euc_to_utf8_8FD4, euc_to_utf8_8FD5, euc_to_utf8_8FD6, euc_to_utf8_8FD7,
- euc_to_utf8_8FD8, euc_to_utf8_8FD9, euc_to_utf8_8FDA, euc_to_utf8_8FDB,
- euc_to_utf8_8FDC, euc_to_utf8_8FDD, euc_to_utf8_8FDE, euc_to_utf8_8FDF,
- euc_to_utf8_8FE0, euc_to_utf8_8FE1, euc_to_utf8_8FE2, euc_to_utf8_8FE3,
- euc_to_utf8_8FE4, euc_to_utf8_8FE5, euc_to_utf8_8FE6, euc_to_utf8_8FE7,
- euc_to_utf8_8FE8, euc_to_utf8_8FE9, euc_to_utf8_8FEA, euc_to_utf8_8FEB,
- euc_to_utf8_8FEC, euc_to_utf8_8FED,              0,              0,
-              0,              0,              0,       euc_to_utf8_8FF3,
- euc_to_utf8_8FF4,            0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,};
-#endif /* X0212_ENABLE */
-#endif /* UTF8_OUTPUT_ENABLE */
-
-#ifdef UTF8_INPUT_ENABLE
-const unsigned short utf8_to_euc_C2[] = {
-      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, 0xA242, 0x2171, 0x2172, 0xA270, 0x216F, 0xA243, 0x2178,
- 0x212F, 0xA26D, 0xA26C,      0, 0x224C,      0, 0xA26E, 0xA234,
- 0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
- 0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
-};
-const unsigned short utf8_to_euc_C2_ms[] = {
-      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, 0xA242, 0x2171, 0x2172, 0xA270,   0x5C, 0xA243, 0x2178,
- 0x212F, 0xA26D, 0xA26C,      0, 0x224C,      0, 0xA26E, 0xA234,
- 0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
- 0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
-};
-const unsigned short utf8_to_euc_C2_932[] = {
-      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,   0x21, 0x2171, 0x2172,      0,   0x5C,   0x7C, 0x2178,
- 0x212F,   0x63,   0x61, 0x2263, 0x224C,   0x2D,   0x52, 0x2131,
- 0x216B, 0x215E,   0x32,   0x33, 0x212D, 0x264C, 0x2279, 0x2126,
- 0x2124,   0x31,   0x6F, 0x2264,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_C3[] = {
- 0xAA22, 0xAA21, 0xAA24, 0xAA2A, 0xAA23, 0xAA29, 0xA921, 0xAA2E,
- 0xAA32, 0xAA31, 0xAA34, 0xAA33, 0xAA40, 0xAA3F, 0xAA42, 0xAA41,
-      0, 0xAA50, 0xAA52, 0xAA51, 0xAA54, 0xAA58, 0xAA53, 0x215F,
- 0xA92C, 0xAA63, 0xAA62, 0xAA65, 0xAA64, 0xAA72, 0xA930, 0xA94E,
- 0xAB22, 0xAB21, 0xAB24, 0xAB2A, 0xAB23, 0xAB29, 0xA941, 0xAB2E,
- 0xAB32, 0xAB31, 0xAB34, 0xAB33, 0xAB40, 0xAB3F, 0xAB42, 0xAB41,
- 0xA943, 0xAB50, 0xAB52, 0xAB51, 0xAB54, 0xAB58, 0xAB53, 0x2160,
- 0xA94C, 0xAB63, 0xAB62, 0xAB65, 0xAB64, 0xAB72, 0xA950, 0xAB73,
-};
-const unsigned short utf8_to_euc_C3_932[] = {
-   0x41,   0x41,   0x41,   0x41,   0x41,   0x41,   0x41,   0x43,
-   0x45,   0x45,   0x45,   0x45,   0x49,   0x49,   0x49,   0x49,
-   0x44,   0x4E,   0x4F,   0x4F,   0x4F,   0x4F,   0x4F, 0x215F,
-   0x4F,   0x55,   0x55,   0x55,   0x55,   0x59,   0x54,   0x73,
-   0x61,   0x61,   0x61,   0x61,   0x61,   0x61,   0x61,   0x63,
-   0x65,   0x65,   0x65,   0x65,   0x69,   0x69,   0x69,   0x69,
-   0x64,   0x6E,   0x6F,   0x6F,   0x6F,   0x6F,   0x6F, 0x2160,
-   0x6F,   0x75,   0x75,   0x75,   0x75,   0x79,   0x74,   0x79,
-};
-const unsigned short utf8_to_euc_C4[] = {
- 0xAA27, 0xAB27, 0xAA25, 0xAB25, 0xAA28, 0xAB28, 0xAA2B, 0xAB2B,
- 0xAA2C, 0xAB2C, 0xAA2F, 0xAB2F, 0xAA2D, 0xAB2D, 0xAA30, 0xAB30,
- 0xA922, 0xA942, 0xAA37, 0xAB37,      0,      0, 0xAA36, 0xAB36,
- 0xAA38, 0xAB38, 0xAA35, 0xAB35, 0xAA3A, 0xAB3A, 0xAA3B, 0xAB3B,
- 0xAA3D, 0xAB3D, 0xAA3C,      0, 0xAA3E, 0xAB3E, 0xA924, 0xA944,
- 0xAA47, 0xAB47, 0xAA45, 0xAB45,      0,      0, 0xAA46, 0xAB46,
- 0xAA44, 0xA945, 0xA926, 0xA946, 0xAA48, 0xAB48, 0xAA49, 0xAB49,
- 0xA947, 0xAA4A, 0xAB4A, 0xAA4C, 0xAB4C, 0xAA4B, 0xAB4B, 0xA929,
-};
-const unsigned short utf8_to_euc_C5[] = {
- 0xA949, 0xA928, 0xA948, 0xAA4D, 0xAB4D, 0xAA4F, 0xAB4F, 0xAA4E,
- 0xAB4E, 0xA94A, 0xA92B, 0xA94B, 0xAA57, 0xAB57,      0,      0,
- 0xAA56, 0xAB56, 0xA92D, 0xA94D, 0xAA59, 0xAB59, 0xAA5B, 0xAB5B,
- 0xAA5A, 0xAB5A, 0xAA5C, 0xAB5C, 0xAA5D, 0xAB5D, 0xAA5F, 0xAB5F,
- 0xAA5E, 0xAB5E, 0xAA61, 0xAB61, 0xAA60, 0xAB60, 0xA92F, 0xA94F,
- 0xAA6C, 0xAB6C, 0xAA69, 0xAB69, 0xAA66, 0xAB66, 0xAA6B, 0xAB6B,
- 0xAA68, 0xAB68, 0xAA6A, 0xAB6A, 0xAA71, 0xAB71, 0xAA74, 0xAB74,
- 0xAA73, 0xAA75, 0xAB75, 0xAA77, 0xAB77, 0xAA76, 0xAB76,      0,
-};
-const unsigned short utf8_to_euc_C7[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xAA26, 0xAB26, 0xAA43,
- 0xAB43, 0xAA55, 0xAB55, 0xAA67, 0xAB67, 0xAA70, 0xAB70, 0xAA6D,
- 0xAB6D, 0xAA6F, 0xAB6F, 0xAA6E, 0xAB6E,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xAB39,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_CB[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xA230,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xA22F, 0xA232, 0xA236, 0xA235,      0, 0xA233,      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,
-};
-const unsigned short utf8_to_euc_CE[] = {
-      0,      0,      0,      0, 0xA238, 0xA239, 0xA661,      0,
- 0xA662, 0xA663, 0xA664,      0, 0xA667,      0, 0xA669, 0xA66C,
- 0xA676, 0x2621, 0x2622, 0x2623, 0x2624, 0x2625, 0x2626, 0x2627,
- 0x2628, 0x2629, 0x262A, 0x262B, 0x262C, 0x262D, 0x262E, 0x262F,
- 0x2630, 0x2631,      0, 0x2632, 0x2633, 0x2634, 0x2635, 0x2636,
- 0x2637, 0x2638, 0xA665, 0xA66A, 0xA671, 0xA672, 0xA673, 0xA674,
- 0xA67B, 0x2641, 0x2642, 0x2643, 0x2644, 0x2645, 0x2646, 0x2647,
- 0x2648, 0x2649, 0x264A, 0x264B, 0x264C, 0x264D, 0x264E, 0x264F,
-};
-const unsigned short utf8_to_euc_CF[] = {
- 0x2650, 0x2651, 0xA678, 0x2652, 0x2653, 0x2654, 0x2655, 0x2656,
- 0x2657, 0x2658, 0xA675, 0xA67A, 0xA677, 0xA679, 0xA67C,      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,
-};
-const unsigned short utf8_to_euc_D0[] = {
-      0, 0x2727, 0xA742, 0xA743, 0xA744, 0xA745, 0xA746, 0xA747,
- 0xA748, 0xA749, 0xA74A, 0xA74B, 0xA74C,      0, 0xA74D, 0xA74E,
- 0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2728, 0x2729,
- 0x272A, 0x272B, 0x272C, 0x272D, 0x272E, 0x272F, 0x2730, 0x2731,
- 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, 0x2738, 0x2739,
- 0x273A, 0x273B, 0x273C, 0x273D, 0x273E, 0x273F, 0x2740, 0x2741,
- 0x2751, 0x2752, 0x2753, 0x2754, 0x2755, 0x2756, 0x2758, 0x2759,
- 0x275A, 0x275B, 0x275C, 0x275D, 0x275E, 0x275F, 0x2760, 0x2761,
-};
-const unsigned short utf8_to_euc_D1[] = {
- 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2768, 0x2769,
- 0x276A, 0x276B, 0x276C, 0x276D, 0x276E, 0x276F, 0x2770, 0x2771,
-      0, 0x2757, 0xA772, 0xA773, 0xA774, 0xA775, 0xA776, 0xA777,
- 0xA778, 0xA779, 0xA77A, 0xA77B, 0xA77C,      0, 0xA77D, 0xA77E,
-      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,
-};
-const unsigned short utf8_to_euc_E280[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x213E,      0,      0,      0, 0x213D, 0x213D, 0x2142,      0,
- 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
- 0x2277, 0x2278,      0,      0,      0, 0x2145, 0x2144,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
-      0,      0,      0, 0x2228,      0,      0, 0x2131,      0,
-};
-const unsigned short utf8_to_euc_E280_ms[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x213E,      0,      0,      0, 0x213D, 0x213D, 0x2142,      0,
- 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
- 0x2277, 0x2278,      0,      0,      0, 0x2145, 0x2144,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
-      0,      0,      0, 0x2228,      0,      0,   0x7E,      0,
-};
-const unsigned short utf8_to_euc_E280_932[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x213E,      0,      0,      0,      0, 0x213D,      0,      0,
- 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
- 0x2277, 0x2278,      0,      0,      0, 0x2145, 0x2144,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
-      0,      0,      0, 0x2228,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E284[] = {
-      0,      0,      0, 0x216E,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2D62,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2D64, 0xA26F,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2272,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E285[] = {
-      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,
- 0x2D35, 0x2D36, 0x2D37, 0x2D38, 0x2D39, 0x2D3A, 0x2D3B, 0x2D3C,
- 0x2D3D, 0x2D3E,      0,      0,      0,      0,      0,      0,
- 0xF373, 0xF374, 0xF375, 0xF376, 0xF377, 0xF378, 0xF379, 0xF37A,
- 0xF37B, 0xF37C,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E286[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x222B, 0x222C, 0x222A, 0x222D,      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,
-};
-const unsigned short utf8_to_euc_E287[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x224D,      0, 0x224E,      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,
-};
-const unsigned short utf8_to_euc_E288[] = {
- 0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
- 0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
-      0, 0x2D74, 0x215D,      0,      0,      0,      0,      0,
-      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2D78,
- 0x225C,      0,      0,      0,      0, 0x2142,      0, 0x224A,
- 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2D73,      0,
-      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
-      0,      0,      0,      0,      0, 0x2266,      0,      0,
-};
-const unsigned short utf8_to_euc_E288_932[] = {
- 0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
- 0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
-      0, 0x2D74,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2D78,
- 0x225C,      0,      0,      0,      0, 0x2142,      0, 0x224A,
- 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2D73,      0,
-      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
-      0,      0,      0,      0,      0, 0x2266,      0,      0,
-};
-const unsigned short utf8_to_euc_E289[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2262,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2162, 0x2261,      0,      0,      0,      0, 0x2165, 0x2166,
-      0,      0, 0x2263, 0x2264,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E28A[] = {
-      0,      0, 0x223E, 0x223F,      0,      0, 0x223C, 0x223D,
-      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, 0x225D,      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, 0x2D79,
-};
-const unsigned short utf8_to_euc_E28C[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x225E,      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,
-};
-const unsigned short utf8_to_euc_E291[] = {
-      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,
- 0x2D21, 0x2D22, 0x2D23, 0x2D24, 0x2D25, 0x2D26, 0x2D27, 0x2D28,
- 0x2D29, 0x2D2A, 0x2D2B, 0x2D2C, 0x2D2D, 0x2D2E, 0x2D2F, 0x2D30,
- 0x2D31, 0x2D32, 0x2D33, 0x2D34,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E294[] = {
- 0x2821, 0x282C, 0x2822, 0x282D,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2823,      0,      0, 0x282E,
- 0x2824,      0,      0, 0x282F, 0x2826,      0,      0, 0x2831,
- 0x2825,      0,      0, 0x2830, 0x2827, 0x283C,      0,      0,
- 0x2837,      0,      0, 0x2832, 0x2829, 0x283E,      0,      0,
- 0x2839,      0,      0, 0x2834, 0x2828,      0,      0, 0x2838,
- 0x283D,      0,      0, 0x2833, 0x282A,      0,      0, 0x283A,
- 0x283F,      0,      0, 0x2835, 0x282B,      0,      0, 0x283B,
-};
-const unsigned short utf8_to_euc_E295[] = {
-      0,      0, 0x2840,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2836,      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,
-};
-const unsigned short utf8_to_euc_E296[] = {
-      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,
- 0x2223, 0x2222,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2225, 0x2224,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2227, 0x2226,      0,      0,
-};
-const unsigned short utf8_to_euc_E297[] = {
-      0,      0,      0,      0,      0,      0, 0x2221, 0x217E,
-      0,      0,      0, 0x217B,      0,      0, 0x217D, 0x217C,
-      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, 0x227E,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E298[] = {
-      0,      0,      0,      0,      0, 0x217A, 0x2179,      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,
-};
-const unsigned short utf8_to_euc_E299[] = {
- 0x216A,      0, 0x2169,      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, 0x2276,      0,      0, 0x2275,      0, 0x2274,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E380[] = {
- 0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
- 0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
- 0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D,      0,      0,
-      0,      0,      0,      0, 0x2141, 0x2D60,      0, 0x2D61,
-      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,
-};
-const unsigned short utf8_to_euc_E380_932[] = {
- 0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
- 0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
- 0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D,      0,      0,
-      0,      0,      0,      0,      0, 0x2D60,      0, 0x2D61,
-      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,
-};
-const unsigned short utf8_to_euc_E381[] = {
-      0, 0x2421, 0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427,
- 0x2428, 0x2429, 0x242A, 0x242B, 0x242C, 0x242D, 0x242E, 0x242F,
- 0x2430, 0x2431, 0x2432, 0x2433, 0x2434, 0x2435, 0x2436, 0x2437,
- 0x2438, 0x2439, 0x243A, 0x243B, 0x243C, 0x243D, 0x243E, 0x243F,
- 0x2440, 0x2441, 0x2442, 0x2443, 0x2444, 0x2445, 0x2446, 0x2447,
- 0x2448, 0x2449, 0x244A, 0x244B, 0x244C, 0x244D, 0x244E, 0x244F,
- 0x2450, 0x2451, 0x2452, 0x2453, 0x2454, 0x2455, 0x2456, 0x2457,
- 0x2458, 0x2459, 0x245A, 0x245B, 0x245C, 0x245D, 0x245E, 0x245F,
-};
-const unsigned short utf8_to_euc_E382[] = {
- 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
- 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
- 0x2470, 0x2471, 0x2472, 0x2473,      0,      0,      0,      0,
-      0,      0,      0, 0x212B, 0x212C, 0x2135, 0x2136,      0,
-      0, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526, 0x2527,
- 0x2528, 0x2529, 0x252A, 0x252B, 0x252C, 0x252D, 0x252E, 0x252F,
- 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
- 0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
-};
-const unsigned short utf8_to_euc_E382_932[] = {
- 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
- 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
- 0x2470, 0x2471, 0x2472, 0x2473, 0x2574,      0,      0,      0,
-      0,      0,      0, 0x212B, 0x212C, 0x2135, 0x2136,      0,
-      0, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526, 0x2527,
- 0x2528, 0x2529, 0x252A, 0x252B, 0x252C, 0x252D, 0x252E, 0x252F,
- 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
- 0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
-};
-const unsigned short utf8_to_euc_E383[] = {
- 0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547,
- 0x2548, 0x2549, 0x254A, 0x254B, 0x254C, 0x254D, 0x254E, 0x254F,
- 0x2550, 0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556, 0x2557,
- 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E, 0x255F,
- 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
- 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x256D, 0x256E, 0x256F,
- 0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576,      0,
-      0,      0,      0, 0x2126, 0x213C, 0x2133, 0x2134,      0,
-};
-const unsigned short utf8_to_euc_E388[] = {
-      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, 0x2D6A, 0x2D6B,      0,      0,      0,      0,      0,
-      0, 0x2D6C,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E38A[] = {
-      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, 0x2D65, 0x2D66, 0x2D67, 0x2D68,
- 0x2D69,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E38C[] = {
-      0,      0,      0, 0x2D46,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2D4A,      0,      0,
-      0,      0,      0,      0, 0x2D41,      0,      0,      0,
- 0x2D44,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2D42, 0x2D4C,      0,      0, 0x2D4B, 0x2D45,
-      0,      0,      0, 0x2D4D,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2D47,      0,
-      0,      0,      0, 0x2D4F,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E38D[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2D40, 0x2D4E,      0,      0, 0x2D43,      0,      0,
-      0, 0x2D48,      0,      0,      0,      0,      0, 0x2D49,
-      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, 0x2D5F, 0x2D6F, 0x2D6E, 0x2D6D,      0,
-};
-const unsigned short utf8_to_euc_E38E[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2D53, 0x2D54,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2D50, 0x2D51, 0x2D52,      0,
-      0, 0x2D56,      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,
-};
-const unsigned short utf8_to_euc_E38F[] = {
-      0,      0,      0,      0, 0x2D55,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2D63,      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,
-};
-const unsigned short utf8_to_euc_E4B8[] = {
- 0x306C, 0x437A, 0xB021, 0x3C37, 0xB022, 0xB023,      0, 0x4B7C,
- 0x3E66, 0x3B30, 0x3E65, 0x323C, 0xB024, 0x4954, 0x4D3F,      0,
- 0x5022, 0x312F, 0xB025,      0, 0x336E, 0x5023, 0x4024, 0x5242,
- 0x3556, 0x4A3A,      0,      0,      0,      0, 0x3E67, 0xB026,
-      0, 0x4E3E,      0, 0xB027, 0xB028,      0, 0x4A42,      0,
- 0xB029,      0, 0x5024, 0xB02A,      0, 0x4366, 0xB02B, 0xB02C,
- 0xB02D, 0x5025, 0x367A,      0,      0, 0xB02E, 0x5026,      0,
- 0x345D, 0x4330,      0, 0x3C67, 0x5027,      0,      0, 0x5028,
-};
-const unsigned short utf8_to_euc_E4B9[] = {
- 0xB02F, 0xB030, 0x5029, 0x4735, 0xB031, 0x3557,      0, 0xB032,
-      0,      0,      0, 0x4737,      0, 0x4663, 0x3843, 0x4B33,
-      0, 0xB033,      0,      0,      0, 0x6949, 0x502A, 0x3E68,
- 0x502B, 0x3235, 0xB034,      0, 0xB035, 0x3665, 0x3870, 0x4C69,
-      0,      0, 0x5626, 0xB036,      0,      0,      0,      0,
- 0xB037, 0xB038,      0,      0,      0,      0,      0,      0,
-      0, 0x4D70,      0, 0x467D, 0xB039, 0xB03A,      0,      0,
-      0, 0xB03B,      0,      0,      0,      0, 0x3425, 0xB03C,
-};
-const unsigned short utf8_to_euc_E4BA[] = {
- 0x3535,      0, 0x502C,      0,      0, 0x502D, 0x4E3B,      0,
- 0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 0xB03D, 0x5032,      0,
-      0, 0x313E, 0x385F,      0, 0x385E, 0x3066, 0xB03E, 0xB03F,
- 0x4F4B, 0x4F4A,      0, 0x3A33, 0x3021, 0xB040, 0x5033, 0x5034,
- 0x5035, 0x4B34, 0x5036,      0, 0x3872, 0x3067, 0x4B72,      0,
- 0x357C,      0,      0, 0x357D, 0x357E, 0x4462, 0x4E3C, 0xB041,
- 0x5037,      0,      0, 0x5038,      0,      0, 0x5039,      0,
-      0, 0xB042, 0x3F4D,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E4BB[] = {
- 0x3D3A, 0x3F4E, 0x503E, 0xB043, 0x503C,      0, 0x503D, 0x3558,
-      0,      0, 0x3A23, 0x3270,      0, 0x503B, 0x503A, 0x4A29,
- 0xB044,      0,      0,      0, 0x3B46, 0x3B45, 0x423E, 0x503F,
- 0x4955, 0x4067, 0xB045, 0xB046,      0, 0x2138, 0x5040, 0x5042,
- 0xB047, 0xB048, 0xB049, 0x4265, 0x4E61, 0x304A,      0,      0,
- 0xB04A,      0,      0,      0,      0, 0x5041, 0x323E, 0xB04B,
- 0x3644, 0xB04C, 0x4367, 0xB04D,      0, 0xB04E, 0x376F, 0x5043,
-      0,      0,      0, 0x4724, 0xF42F, 0xB04F, 0xB050, 0xB051,
-};
-const unsigned short utf8_to_euc_E4BC[] = {
- 0xB052, 0x346B, 0xB053, 0xB054,      0,      0,      0,      0,
- 0xB055, 0x5044, 0x304B, 0xB056, 0xB057, 0x3860, 0x346C, 0x497A,
- 0x4832, 0x3559, 0xB058,      0,      0, 0xB059, 0xB05A, 0xB05B,
-      0, 0xB05C, 0x3271,      0, 0x5067, 0x4541,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xB05D, 0x476C,
- 0x5046, 0xB05E,      0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xB062,
- 0x3F2D, 0xB063, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xB065,      0,
-};
-const unsigned short utf8_to_euc_E4BD[] = {
- 0xB066,      0, 0xB067, 0x4451,      0,      0, 0x4322, 0x504A,
- 0xB068, 0xB069,      0, 0xB06A, 0xB06B, 0x304C, 0x4463, 0x3D3B,
- 0x3A34, 0x4D24, 0xB06C, 0x424E, 0xB06D, 0x323F, 0xB06E, 0x5049,
- 0xB06F, 0x4D3E, 0x5045, 0x5047, 0x3A6E, 0x5048, 0x5524, 0xB070,
- 0xB05F,      0,      0, 0xB071,      0,      0,      0,      0,
-      0, 0x5050, 0xB072,      0, 0xB073,      0, 0xB074, 0x5053,
- 0x5051, 0xB075,      0, 0x3242,      0, 0x4A3B, 0x504B, 0xB076,
- 0xB077, 0xB078, 0xB079, 0x504F, 0x3873, 0xB07A, 0xB07B, 0x3B48,
-};
-const unsigned short utf8_to_euc_E4BE[] = {
-      0, 0xB07C, 0xB07D, 0x3426, 0xB07E, 0xB121, 0x5054,      0,
- 0x504C, 0xB122, 0xB123, 0x4E63, 0xB124, 0x3B78, 0xB125, 0x504D,
- 0xB126, 0x5052, 0xB127, 0xB128, 0xB129,      0, 0x5055, 0xB12A,
- 0x504E, 0xB12B, 0xB12C, 0x3621,      0, 0x304D, 0xB12D, 0xB12E,
- 0x3622, 0x3241,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x5525,      0, 0x4B79, 0x496E, 0x3874,
-      0,      0, 0xB12F,      0,      0, 0x3F2F, 0x4E37, 0xB130,
-      0, 0xB131,      0, 0xB132, 0xB133, 0xB134, 0xB135, 0x4A58,
-};
-const unsigned short utf8_to_euc_E4BF[] = {
- 0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xB138, 0xB139,      0,
- 0xB13A, 0xB13B, 0x3D53, 0xB13C, 0xB13D, 0xB13E, 0x5059, 0xB13F,
- 0x505E, 0x505C, 0xB140,      0, 0x5057,      0,      0, 0x422F,
- 0x505A,      0, 0x505D, 0x505B, 0xB141, 0x4A5D,      0, 0x5058,
- 0xB142, 0x3F2E, 0xB143, 0x4B73, 0x505F, 0x5060,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x3D24, 0x506D,
- 0xB144,      0, 0xB145, 0x4750,      0, 0x4936, 0x5068,      0,
- 0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C, 0xB148,
-};
-const unsigned short utf8_to_euc_E580[] = {
- 0xB149, 0xB14A,      0,      0, 0xB14B, 0x5066, 0x506F, 0xB14C,
-      0, 0x4152, 0xB14D, 0x3844, 0xB14E, 0x475C, 0xB14F, 0x6047,
- 0xB150, 0x506E, 0x455D, 0xB151, 0x5063,      0, 0x3876, 0xB152,
- 0xB153, 0x3875, 0x5061, 0xB154, 0xB155, 0xB156, 0xB157, 0x3C5A,
-      0, 0x5069, 0xB158, 0x4A6F, 0x434D, 0x5065, 0x3771, 0xB159,
- 0x5062, 0x506A, 0x5064, 0x4E51, 0x506B, 0x4F41, 0xB15A,      0,
- 0xB15B,      0, 0xB15C, 0xB15D,      0, 0xB15E, 0x3666,      0,
-      0, 0x3770,      0, 0xB176,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E581[] = {
- 0xB15F, 0xB160, 0xB161, 0x5070,      0, 0xB162, 0xB163, 0x5071,
- 0x5075, 0x304E, 0xB164,      0, 0xB165,      0, 0xB166, 0x4A50,
- 0x5074, 0xB167, 0xB168, 0xB169,      0, 0x5073, 0x5077, 0xB16A,
-      0, 0xB16B, 0x5076,      0, 0x4464,      0,      0, 0xB16C,
- 0xB16D,      0, 0xB16E, 0xB16F,      0, 0x3772, 0xB170, 0xB171,
-      0,      0, 0xB172,      0, 0x5078, 0xB173,      0,      0,
- 0xB174, 0xB175, 0x3C45,      0, 0x4226, 0x4465, 0x3676,      0,
- 0x5079,      0,      0,      0,      0, 0x3536,      0,      0,
-};
-const unsigned short utf8_to_euc_E582[] = {
- 0x507A, 0xB177,      0, 0xB178, 0xB179, 0x507C, 0xB17A,      0,
-      0,      0, 0xB17B,      0,      0, 0x4B35, 0xB17C, 0xB17D,
- 0xB17E, 0x3766, 0xB221, 0xB222, 0xB223,      0, 0xB224,      0,
- 0x3B31, 0x4877, 0x507B, 0xB225, 0xB226,      0, 0xB227, 0xB228,
- 0xB229, 0xB22A, 0xB22B,      0,      0,      0,      0,      0,
-      0,      0, 0xB22C,      0, 0x3A45, 0x4D43,      0, 0xB22D,
- 0xB22E,      0, 0x507E, 0x5123, 0x507D, 0x3A44,      0, 0x3D7D,
-      0, 0xB22F, 0xB230,      0,      0, 0xB231, 0x3739,      0,
-};
-const unsigned short utf8_to_euc_E583[] = {
- 0xB232,      0, 0x5124, 0xB233, 0xB234, 0x364F,      0, 0xB235,
-      0, 0x5121, 0x5122,      0, 0xB236, 0x462F, 0xB237, 0x417C,
- 0xB238, 0x3623,      0, 0xB239, 0xB23A, 0x4B4D, 0x5125,      0,
- 0xB23B,      0, 0x4E3D,      0, 0xB23C, 0xB23D, 0x5126, 0xB23E,
-      0,      0, 0xB23F, 0x5129, 0xB240, 0x5127, 0xB241, 0x414E,
- 0xB242, 0xB243,      0,      0,      0, 0x5128, 0x512A, 0xB244,
-      0, 0xB245, 0xB251,      0, 0xF430, 0x512C, 0xB246,      0,
-      0, 0x512B, 0xB247, 0x4A48,      0,      0, 0xB248,      0,
-};
-const unsigned short utf8_to_euc_E584[] = {
- 0x3537, 0x512E, 0x512F, 0xB249, 0x322F,      0, 0xB24A, 0xB24B,
- 0xB24C, 0x512D,      0, 0xB24D, 0xB24E, 0xB24F, 0xB250,      0,
- 0xB252,      0, 0x3C74,      0, 0x5132, 0x5131, 0x5130, 0xB253,
- 0x5056, 0xB254, 0x5133, 0xB255, 0xB256, 0xB257, 0xB258, 0x3D7E,
-      0, 0x5134,      0, 0xB259,      0,      0,      0, 0xB25A,
- 0xB25B,      0, 0x4D25,      0, 0xB25C, 0xB25D,      0, 0xB25E,
-      0, 0xB25F, 0x4C59, 0xB260, 0xB261, 0xB262,      0, 0x5136,
- 0xB263, 0xB264, 0x5135, 0x5138, 0x5137,      0,      0, 0x5139,
-};
-const unsigned short utf8_to_euc_E585[] = {
- 0x513A, 0x3074, 0xB265, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624,
- 0x4068, 0x3877, 0xB266, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
- 0x3B79,      0, 0x513B, 0xB268, 0x513D, 0xB269,      0, 0xB26A,
- 0xB26B,      0, 0x455E,      0, 0x3375,      0,      0, 0xB26C,
-      0,      0, 0x513E,      0, 0xB26D, 0x467E, 0xB26E,      0,
- 0x4134, 0x5140, 0x5141, 0x482C, 0x3878, 0x4F3B, 0x5142,      0,
-      0, 0x3626,      0,      0,      0, 0x4A3C, 0x4236, 0x3671,
- 0x4535,      0,      0,      0, 0x3773,      0, 0xB26F,      0,
-};
-const unsigned short utf8_to_euc_E586[] = {
- 0x5143,      0, 0x5144, 0xB270, 0xB271, 0x4662, 0x315F,      0,
-      0, 0x5147, 0x3A7D, 0xB272, 0x5146, 0x3A46, 0xB273, 0x5148,
- 0x666E, 0x5149, 0x4B41, 0x514A,      0, 0x514B, 0x514C, 0x3E69,
- 0xB274, 0x3C4C,      0,      0,      0, 0xB275,      0,      0,
- 0x3427, 0xB276, 0x514F, 0xB277, 0x514D, 0x4C3D, 0x514E,      0,
- 0x495A, 0x5150, 0x5151, 0x5152, 0x455F, 0xB278,      0,      0,
- 0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
- 0xB279,      0, 0xB27A,      0, 0xB27B, 0x5158, 0xB27C, 0xB27D,
-};
-const unsigned short utf8_to_euc_E587[] = {
-      0,      0, 0xB27E,      0, 0x4028, 0x5159, 0x3D5A,      0,
- 0xB321, 0x515A,      0, 0x437C, 0x4E3F, 0x4560,      0, 0xB322,
-      0, 0xB323, 0xB324, 0xB325,      0, 0xB326, 0x5245,      0,
- 0xB327,      0,      0, 0x515B, 0x7425, 0x3645, 0xB328,      0,
- 0x515C, 0x4B5E, 0xB329,      0,      0, 0xB32A, 0x3D68, 0x427C,
-      0, 0x515E, 0x4664,      0, 0xF431, 0x515F, 0xB32B,      0,
- 0x5160, 0x332E, 0xB32C, 0xB32D, 0xB32E, 0x5161, 0x3627, 0xB32F,
- 0x464C, 0x317A, 0x3D50,      0,      0, 0x4821, 0x5162,      0,
-};
-const unsigned short utf8_to_euc_E588[] = {
- 0x4561, 0xB330, 0xB331, 0x3F4F, 0x5163, 0xB332, 0x4A2C, 0x405A,
- 0x3422,      0, 0x3429, 0x5164,      0,      0, 0x5166,      0,
-      0, 0x373A, 0xB333, 0xB334, 0x5165, 0xB335, 0xB336, 0x4E73,
- 0xB337,      0,      0,      0,      0, 0x3D69,      0,      0,
-      0,      0, 0xB338,      0, 0x483D, 0x4A4C,      0, 0x5167,
- 0xB339, 0x4D78, 0x5168,      0,      0,      0, 0x5169,      0,
- 0x457E, 0xB33A, 0xB33B, 0x516A,      0, 0xB33C, 0x4029, 0x3A7E,
- 0x3774, 0x516B, 0x3B49, 0x396F, 0xB33D,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E589[] = {
-      0,      0,      0, 0x4466, 0x516D, 0xB33E,      0, 0x4227,
-      0, 0xB33F, 0x3A6F, 0x516E, 0x516F, 0x4130,      0, 0x516C,
-      0,      0,      0,      0, 0x5171, 0xB340, 0x4B36, 0xB341,
- 0xB342,      0, 0xB343, 0x3964, 0xB344,      0, 0x5170, 0xB345,
- 0xB346, 0xB347,      0, 0x3775, 0x3A5E, 0x476D, 0xB348,      0,
-      0, 0x5174, 0x5172,      0,      0,      0, 0xB349, 0x497B,
- 0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F,      0, 0xB34A,
- 0xB34B, 0xB34C,      0,      0,      0, 0x5177,      0, 0x5176,
-};
-const unsigned short utf8_to_euc_E58A[] = {
- 0xB34D,      0, 0xB34E, 0x3344,      0, 0xB34F,      0, 0x3760,
- 0x517C, 0x4E2D, 0xB350,      0, 0xB351, 0x5178,      0,      0,
-      0, 0x517D, 0x517A, 0xB352, 0x5179, 0xB353, 0xB354, 0xB355,
- 0xB356,      0, 0xB357, 0x4E4F, 0xB358,      0,      0, 0x3879,
- 0x3243,      0,      0, 0x4E74, 0xB359, 0xB35A, 0xB35B, 0xB35C,
-      0, 0x3D75, 0x4558, 0x3965, 0x5222, 0x5223,      0, 0xB35D,
- 0xB35E, 0x4E65,      0,      0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
- 0xB361, 0x387A, 0xB362, 0xB363, 0x5224, 0xB364, 0x332F,      0,
-};
-const unsigned short utf8_to_euc_E58B[] = {
- 0xB365, 0x5226,      0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
- 0xB368, 0x4A59,      0,      0, 0xB369, 0x5227,      0, 0xB36A,
-      0, 0xB36B, 0x7055,      0, 0xB36C, 0x4630, 0xB36D, 0x5228,
- 0x342A, 0x4C33,      0, 0xB36E, 0xB36F, 0x3E21, 0x5229, 0x4A67,
- 0x522D, 0xB370, 0x402A, 0x522A, 0x3650, 0xB371, 0x522B, 0x342B,
- 0xB372, 0xB373, 0xB374,      0, 0xB375,      0,      0,      0,
- 0xB376, 0xB377, 0x372E, 0x522E, 0xB378, 0x522F, 0xB379, 0xB37A,
- 0x5230, 0x5231, 0x3C5B,      0,      0,      0, 0x387B, 0x4C5E,
-};
-const unsigned short utf8_to_euc_E58C[] = {
- 0xB37B, 0x4C68, 0x4677, 0xB37C,      0, 0x4A71, 0x5232, 0xF432,
- 0x5233,      0, 0xB37D, 0xB37E, 0xB421, 0x5235,      0, 0x5237,
- 0x5236, 0xB422,      0, 0xB423,      0, 0x5238, 0x323D, 0x4B4C,
- 0xB424, 0x3A7C, 0x5239, 0xB425, 0xB426, 0x4159, 0xB427, 0xB428,
- 0x3E22, 0x3629,      0, 0x523A, 0xF433, 0xB429,      0, 0xB42A,
- 0xB42B, 0xB42C, 0x485B, 0xB42D, 0xB42E, 0xB42F,      0, 0x523B,
- 0xB430, 0x523C, 0xB431, 0x523D,      0, 0xB432,      0,      0,
- 0x523E, 0x4924, 0x3668, 0x3065, 0xB433, 0xB434, 0xB435, 0x463F,
-};
-const unsigned short utf8_to_euc_E58D[] = {
- 0x523F, 0x3D3D, 0xB436, 0x4069,      0, 0x5241, 0x5240, 0x3E23,
- 0x3861, 0x5243, 0x483E, 0xB438, 0xB437, 0x5244,      0,      0,
-      0, 0x485C, 0x4234, 0x426E, 0x3628,      0,      0, 0x466E,
- 0x4331, 0xB439, 0x476E, 0xB43A, 0x4B4E,      0, 0x5246,      0,
- 0x406A, 0xB43B,      0, 0xB43C,      0, 0xB43D, 0x3735,      0,
-      0, 0x5247,      0,      0, 0xB43E, 0xB43F, 0x5248, 0x312C,
- 0x3075, 0x346D, 0xB440, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
- 0x3237, 0xB441,      0, 0x524A,      0,      0, 0xB442, 0x362A,
-};
-const unsigned short utf8_to_euc_E58E[] = {
-      0,      0, 0x524C, 0xB443, 0x4C71,      0,      0, 0xB444,
- 0xB445,      0,      0,      0,      0,      0, 0xB446,      0,
-      0,      0,      0, 0xB447, 0xB448,      0, 0x524D,      0,
- 0x4E52, 0xB449, 0x387C,      0,      0, 0xB44A,      0, 0x3836,
- 0x524E, 0xB44B,      0,      0, 0xB44C, 0x5250, 0x524F,      0,
- 0x3F5F, 0x3139, 0xB44D, 0xB44E,      0, 0x315E, 0x5251, 0xB44F,
- 0x5252,      0, 0xB450, 0x3837, 0xB451, 0xB452, 0x5253, 0xB453,
- 0xB454,      0, 0xB455, 0x356E,      0, 0xB456,      0,      0,
-};
-const unsigned short utf8_to_euc_E58F[] = {
- 0xB457,      0, 0x3B32, 0x5254,      0, 0xB458,      0,      0,
- 0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
-      0,      0, 0xB45A, 0xB45B, 0x3D47, 0xB45C, 0x3C68, 0x3C75,
-      0, 0x3D76, 0xB45D, 0x4840,      0, 0xB45E, 0xB45F, 0x5257,
- 0xB460, 0x3143, 0x4151, 0x387D, 0x3845, 0x3667, 0xB461, 0xB462,
- 0x525B, 0x4321, 0x427E, 0x362B, 0x3E24, 0x525C, 0x525A, 0x3244,
- 0x4266, 0x3C38, 0x3B4B, 0x3126,      0, 0xB463, 0x3370, 0x3966,
- 0x3B4A,      0, 0x525D,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E590[] = {
-      0, 0x525E, 0xB464, 0x3549, 0x3346,      0,      0,      0,
- 0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79,
- 0x4547, 0x387E,      0, 0xB465,      0,      0,      0,      0,
-      0,      0, 0xB466, 0x372F,      0, 0x5267,      0, 0x3663,
- 0x4B4A, 0xB467,      0,      0,      0,      0, 0x485D, 0xB468,
- 0xB469, 0x5266, 0xB46A, 0x345E, 0x5261, 0x5262, 0x5264, 0xB46B,
-      0, 0xB46C,      0,      0, 0xB46D, 0xB46E, 0x5265,      0,
- 0x355B, 0x3F61,      0, 0x4A2D, 0x5263, 0x525F, 0x3863,      0,
-};
-const unsigned short utf8_to_euc_E591[] = {
- 0x5260,      0, 0x4F24, 0xB46F, 0xB470,      0, 0x4A72, 0xB471,
- 0x4468, 0x3862, 0x3970,      0,      0, 0xB472, 0x5268, 0xB473,
-      0, 0x465D,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xB474, 0x526C,
-      0,      0, 0xB475,      0, 0xB476,      0, 0xB477, 0xB478,
- 0x3C7E, 0xB479, 0x3C76, 0xB47A,      0, 0xB47B, 0xB47C,      0,
- 0x526F, 0x526D,      0, 0x4C23, 0xB47D, 0x526A, 0x5273, 0x526E,
-      0,      0,      0, 0x5271, 0x3846, 0x4C3F,      0, 0xB47E,
-};
-const unsigned short utf8_to_euc_E592[] = {
- 0x5272, 0xB521,      0, 0xB522, 0x5274, 0xB523, 0x5276,      0,
- 0xB524, 0xB525, 0xF435, 0x3A70, 0x4F42, 0xB526, 0x526B, 0x5269,
- 0x5275, 0xB527, 0x5270,      0,      0, 0xB528, 0xB529,      0,
-      0,      0,      0,      0, 0xB52A,      0,      0, 0xB52B,
-      0, 0xB52C, 0x5278,      0, 0x5323, 0x527A, 0xB52D, 0xB52E,
- 0x527E, 0xB52F, 0xB530, 0x5321, 0x527B, 0xB531, 0xB532, 0x533E,
-      0, 0xB533, 0x3A69, 0x3331,      0,      0,      0, 0xB534,
- 0x5279, 0xB535, 0xB536, 0xB537, 0x5325, 0x3076, 0x5324, 0xB538,
-};
-const unsigned short utf8_to_euc_E593[] = {
- 0x3025, 0x494A, 0x5322,      0, 0x527C,      0, 0xB539, 0x5277,
- 0x527D, 0x3A48, 0xB53A,      0,      0, 0xB53B, 0xB53C,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x5326,      0,      0,      0,      0,      0,      0,      0,
- 0xB53D, 0x3077, 0x532F,      0,      0, 0x5327, 0x5328,      0,
- 0x3E25, 0x4B69, 0xB53E,      0, 0xB53F, 0x532D, 0x532C, 0xB540,
-      0,      0, 0x452F,      0,      0,      0, 0xB541,      0,
-      0,      0, 0x532E,      0, 0xB542, 0x532B, 0xB543, 0xB544,
-};
-const unsigned short utf8_to_euc_E594[] = {
- 0xB545, 0xB546,      0,      0, 0x3134, 0xB547, 0x3A36, 0x3F30,
- 0xB548, 0xB549,      0,      0, 0xB54A, 0xB54B, 0xB54C, 0x5329,
- 0x4562,      0,      0,      0, 0x532A, 0xB54D, 0x3022,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xB54E, 0xB54F,      0,      0, 0x5334, 0x4D23,
-      0, 0x3E27, 0xB550, 0x533A,      0, 0xB551, 0xB552,      0,
- 0x5339, 0x5330,      0, 0xB553, 0xB554, 0xB555, 0x4243,      0,
-};
-const unsigned short utf8_to_euc_E595[] = {
- 0x5331, 0xB556,      0,      0, 0x426F, 0x5336, 0x3E26, 0xB557,
-      0, 0xB558, 0xB559,      0, 0x5333, 0xB55A,      0, 0x4C64,
- 0xB55B, 0xB55C,      0, 0x373C,      0,      0, 0x5337, 0x5338,
- 0xB55D,      0, 0xB55E, 0xB55F, 0x5335, 0x533B, 0xB560,      0,
- 0xB561, 0xB562,      0, 0x5332, 0xB563,      0, 0xB564,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x5341, 0x5346,      0, 0x5342, 0xB565,
-};
-const unsigned short utf8_to_euc_E596[] = {
- 0x533D, 0xB566, 0xB567, 0x5347, 0x4131,      0, 0xB568, 0x5349,
- 0xB569, 0x3922, 0x533F, 0x437D,      0,      0, 0xB56A, 0xB56B,
-      0, 0xB56C, 0xB56D, 0xB56E, 0xB56F,      0,      0, 0xB570,
- 0x5343, 0x533C, 0x342D,      0, 0x346E, 0x3365, 0x5344, 0x5340,
-      0,      0,      0, 0xB571, 0xB572,      0,      0, 0x3776,
- 0x534A, 0x5348, 0x4153, 0x354A, 0x362C, 0xB573, 0x5345,      0,
- 0x3674,      0, 0xB574,      0,      0,      0, 0x3144,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xB575,
-};
-const unsigned short utf8_to_euc_E597[] = {
-      0, 0xB576,      0, 0xB577, 0x534E, 0x534C, 0xB578, 0x5427,
-      0, 0xB579,      0, 0xB57A, 0xB57B,      0, 0xB57C,      0,
-      0, 0xB57D, 0xB57E, 0xB621, 0x5351,      0,      0, 0xB622,
- 0xB623,      0, 0x534B, 0xB624, 0x534F,      0, 0xB625, 0x534D,
-      0,      0, 0xB626, 0x3B4C, 0x5350,      0,      0,      0,
-      0, 0xB627,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xB628, 0x5353,
-      0, 0x5358,      0,      0,      0, 0x5356, 0x5355, 0xB629,
-};
-const unsigned short utf8_to_euc_E598[] = {
-      0,      0,      0,      0,      0, 0xB62A, 0x4332,      0,
- 0xB62B, 0x3245, 0xB62C,      0,      0, 0xB62D, 0xB62E, 0xB62F,
- 0xB630, 0xB631, 0xB632,      0, 0x5352,      0, 0x5354, 0x3E28,
- 0x3133, 0xB633,      0, 0x5357,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x325E,      0,      0, 0xB634,      0,      0, 0x5362,
- 0xB635, 0x3E7C, 0x535E, 0xB636, 0x535C, 0xB637, 0x535D, 0xB638,
- 0x535F, 0xB639,      0, 0xB63A, 0xB63B, 0xB63C,      0, 0xB63D,
-};
-const unsigned short utf8_to_euc_E599[] = {
- 0xB63E, 0xB63F, 0x313D, 0xB640, 0xB641,      0, 0xB642,      0,
-      0, 0xB643,      0, 0xB644, 0x4139, 0xB645, 0x5359, 0xB646,
- 0x535A,      0,      0,      0, 0xB647,      0,      0,      0,
-      0,      0,      0, 0x337A,      0,      0, 0xB648,      0,
- 0xB649, 0xB64A, 0xB64B, 0xB64C, 0x5361,      0, 0xB64D,      0,
- 0x346F, 0xB64E, 0x5364, 0x5360, 0x5363, 0xB64F,      0, 0xB650,
-      0, 0xB651, 0xB652,      0, 0x4A2E, 0xB653,      0,      0,
- 0x4655,      0, 0x4838,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E59A[] = {
- 0x5366,      0,      0,      0, 0xB654, 0xB655, 0x5365, 0x3345,
- 0xB656,      0, 0x5367, 0xB657, 0xB658,      0,      0, 0x536A,
-      0,      0,      0,      0, 0x5369, 0xB659,      0,      0,
-      0, 0xB65A, 0xB65B,      0,      0, 0xB65C, 0xB65D, 0xB65E,
- 0x5368,      0, 0x4739,      0,      0, 0x536B, 0xB65F, 0xB660,
- 0xB661, 0xB662,      0, 0xB663, 0xB664, 0xB665, 0x536C,      0,
-      0, 0xB666,      0, 0xB667, 0x536E,      0, 0x536D, 0xB668,
-      0,      0,      0,      0, 0x5370,      0, 0xB669,      0,
-};
-const unsigned short utf8_to_euc_E59B[] = {
- 0x5373, 0x5371, 0x536F, 0x5372,      0, 0xB66A,      0,      0,
- 0x5374, 0xB66B, 0xB66C, 0xB66D, 0xB670, 0xB671, 0x5375, 0xB66E,
- 0xB66F, 0x5376,      0, 0x5377,      0,      0,      0, 0x5378,
- 0x5145, 0xB672, 0x3C7C, 0x3B4D, 0xB673, 0xB674, 0x3273, 0xB675,
- 0x3078, 0xB676,      0, 0x4344, 0xB677, 0xB678, 0xB679, 0xB67A,
- 0xB67B,      0,      0, 0xB67D,      0, 0xB67E, 0x5379,      0,
- 0x3A24, 0xB67C, 0x304F, 0x3F5E,      0,      0, 0xB721, 0xB722,
-      0, 0x537A, 0x3847,      0,      0, 0x3971,      0, 0x537C,
-};
-const unsigned short utf8_to_euc_E59C[] = {
- 0x537B, 0xB723, 0xB724, 0x4A60, 0x537D,      0,      0, 0xB725,
- 0x5421, 0x537E, 0xB726, 0x5422, 0xB727, 0x5423,      0, 0x3777,
-      0, 0xB728, 0x3160, 0x5424,      0, 0xB729, 0x5426,      0,
- 0x5425,      0, 0xB72A, 0xB72B, 0x5428, 0xB72C,      0, 0x455A,
- 0xB72D,      0, 0xB72E, 0xB72F, 0xB730, 0xB731, 0x5429, 0x3035,
- 0x3A5F, 0xB732, 0xB733,      0, 0xB734, 0x373D, 0xB735, 0xB736,
- 0x434F,      0,      0, 0xB737, 0xB738,      0,      0, 0x542A,
- 0x542B,      0,      0, 0x542D,      0, 0xB739, 0xB73A, 0xB73B,
-};
-const unsigned short utf8_to_euc_E59D[] = {
- 0x542E,      0, 0x3A64,      0,      0, 0xB73C, 0xB73D, 0x3651,
-      0,      0, 0x4B37,      0, 0xB73E, 0xB73F, 0x542C, 0x542F,
- 0x3A41, 0x3923, 0xB740,      0,      0,      0,      0,      0,
-      0, 0xF436,      0,      0,      0,      0,      0,      0,
-      0, 0x5433, 0xB741,      0, 0x3A25, 0xB742, 0x4333, 0xB743,
- 0xB744, 0x5430, 0x445A, 0xB745,      0, 0xB746, 0xB747, 0xB748,
- 0xB749, 0xB74A,      0, 0xB74B, 0xB74C, 0xB74D,      0, 0xB74E,
-      0, 0xB74F, 0xB750, 0xB751, 0xB752,      0, 0xB753, 0x5434,
-};
-const unsigned short utf8_to_euc_E59E[] = {
-      0, 0xB754, 0x3F62, 0xB755,      0,      0,      0,      0,
- 0x5432, 0x5435,      0, 0x373F, 0xB756,      0,      0,      0,
-      0,      0,      0, 0x5436, 0xB757, 0xB760,      0, 0xB758,
-      0, 0xB759, 0xB75A,      0, 0xB75B, 0xB75C, 0xB75D, 0xB75E,
- 0x5437, 0xB75F, 0x3924, 0x3340, 0x5439,      0,      0, 0xB761,
- 0xB762, 0xB763, 0x543A,      0, 0xB764,      0,      0,      0,
- 0x543B,      0,      0, 0x5438,      0,      0,      0,      0,
- 0xB765,      0,      0,      0,      0, 0xB766,      0,      0,
-};
-const unsigned short utf8_to_euc_E59F[] = {
- 0x5431,      0,      0, 0x543C,      0,      0, 0x543D, 0xB767,
- 0xB768,      0,      0, 0x4B64, 0xB769,      0, 0x3E6B, 0xB76A,
-      0,      0, 0x543F, 0x5440, 0x543E, 0xB76B, 0x5442,      0,
-      0,      0,      0,      0, 0x4738, 0xB76C, 0xB76D, 0x3068,
- 0x4956, 0xB77E,      0, 0x5443, 0xB76E,      0, 0xB76F, 0xB770,
-      0, 0xB771,      0,      0,      0, 0xB772,      0,      0,
- 0xB773,      0,      0,      0, 0x3E7D, 0xB774, 0xB775, 0x3C39,
- 0xB776, 0x475D, 0x3470,      0, 0x3A6B, 0xB777, 0xB778, 0xB779,
-};
-const unsigned short utf8_to_euc_E5A0[] = {
- 0x4B59,      0, 0x4632, 0xB77A, 0xB77B, 0x3778, 0x424F,      0,
- 0xB77C, 0xB77D, 0x5441, 0x5444, 0xB821, 0xB822,      0,      0,
-      0,      0,      0,      0,      0, 0x4244,      0,      0,
-      0, 0x5445,      0, 0xB823,      0, 0x5446, 0xB824, 0xB825,
- 0xB826, 0x5448,      0,      0, 0x4469,      0, 0xB827, 0xB828,
-      0,      0, 0x342E,      0,      0, 0xB829,      0, 0x7421,
- 0x3161, 0x4A73, 0xB82A,      0, 0x3E6C, 0x4548,      0,      0,
-      0, 0xB82B, 0x3A66,      0,      0, 0x544E,      0, 0xB82C,
-};
-const unsigned short utf8_to_euc_E5A1[] = {
- 0x4A3D, 0x4E5D,      0,      0,      0,      0,      0,      0,
-      0, 0xB82D, 0x3274, 0x544A, 0xB82E, 0xB82F,      0, 0xB830,
- 0xB831, 0x413A, 0x544D,      0, 0x4563, 0xB832,      0, 0x4549,
- 0x4564, 0x4839, 0x444D,      0,      0,      0, 0x3A49, 0xB833,
-      0, 0xB834, 0x5449,      0, 0xB835,      0,      0, 0xB836,
- 0xB837, 0x3176,      0, 0x4536,      0,      0,      0,      0,
- 0x544B,      0, 0x5447,      0,      0, 0x3F50,      0,      0,
- 0xB838, 0x544F,      0,      0, 0xB839,      0, 0x3D4E, 0xB83A,
-};
-const unsigned short utf8_to_euc_E5A2[] = {
- 0xB83B, 0xB83C,      0, 0x362D,      0, 0x5450,      0, 0xB83D,
- 0xB83E, 0xB83F, 0xB840,      0, 0xB841, 0xB842,      0, 0xB843,
- 0xB844,      0,      0, 0x4A68, 0xB845,      0, 0xB846, 0x417D,
-      0,      0,      0,      0, 0x4446, 0xB847, 0xF439, 0x5452,
- 0xB848, 0xB849, 0xB84A,      0,      0,      0, 0xB84B,      0,
- 0x4B4F, 0xB84C,      0, 0x5453,      0,      0, 0x5458,      0,
-      0, 0xB84D, 0xB84E, 0x4A2F,      0,      0,      0,      0,
- 0x5457, 0x5451, 0x5454, 0x5456, 0xB850,      0, 0x3A26,      0,
-};
-const unsigned short utf8_to_euc_E5A3[] = {
-      0, 0x4A49, 0xB851,      0, 0xB84F, 0x5459,      0, 0x4345,
- 0xB852,      0, 0x3275,      0, 0x3E6D, 0xB853, 0xB854,      0,
- 0xB855, 0x545B, 0xB856, 0x545A, 0xB857, 0x3968, 0xB858, 0x545C,
- 0x545E, 0x545D, 0xB859,      0, 0x5460, 0xB85A, 0x5455, 0x5462,
-      0, 0xB85B, 0xB85C,      0, 0x5461, 0x545F,      0,      0,
-      0, 0xB85D,      0, 0x3B4E, 0x3F51,      0, 0x4154, 0x5463,
- 0x403C, 0x306D, 0x4764, 0xB85E,      0,      0,      0, 0x445B,
-      0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468,      0,      0,
-};
-const unsigned short utf8_to_euc_E5A4[] = {
-      0,      0, 0x5469,      0,      0, 0xB85F, 0xB860,      0,
-      0, 0x4A51, 0x546A, 0xB861, 0xB862,      0,      0, 0x3246,
- 0x546B,      0, 0xB863, 0xB864, 0xB865, 0x4D3C, 0x3330,      0,
- 0x5249, 0x3D48, 0x423F, 0x546C, 0x4C6B, 0xB867,      0,      0,
-      0, 0xB868, 0x4C34, 0xB869, 0xB86A, 0x546E,      0, 0x4267,
- 0xB86B, 0x4537, 0x4240, 0x4957, 0x546F, 0x5470, 0x317B, 0xB86C,
- 0xB86D, 0x3C3A, 0x5471, 0xB86E,      0, 0xB86F, 0xB870, 0x3050,
- 0x5472,      0,      0,      0,      0,      0, 0x5473, 0xB871,
-};
-const unsigned short utf8_to_euc_E5A5[] = {
-      0,      0,      0, 0xB872, 0x3162,      0, 0xB873, 0x3471,
- 0x4660, 0x4A74,      0,      0,      0,      0, 0x5477, 0x4155,
- 0x5476, 0x3740, 0xB874, 0xB875, 0x4B5B, 0x5475,      0, 0x4565,
- 0x5479, 0xB876, 0x5478, 0xB877,      0, 0xB878, 0xB879, 0xB87A,
- 0x547B, 0xB87B, 0x547A, 0xB87C,      0, 0x317C,      0, 0x547C,
- 0x3E29, 0x547E, 0x4325, 0xB87D, 0x547D, 0xB87E, 0x4A33, 0xB921,
-      0,      0, 0xB922, 0x3D77, 0x455B, 0xB923, 0xB924,      0,
- 0x5521, 0xB925,      0, 0xB926, 0xB927, 0x3925,      0,      0,
-};
-const unsigned short utf8_to_euc_E5A6[] = {
-      0, 0x5522, 0x4721, 0x485E, 0x4C51,      0,      0,      0,
-      0,      0, 0x4725, 0xB928, 0xB929, 0x552B, 0xB92A,      0,
-      0,      0, 0xB92B, 0x3538,      0, 0xB92C, 0x4D45, 0xB92D,
-      0, 0x4C2F,      0, 0x562C,      0, 0x5523,      0, 0xB92E,
-      0,      0,      0, 0x5526, 0xB92F, 0x4245,      0, 0xB930,
- 0x4B38,      0,      0,      0, 0x454A, 0xB931, 0xB932, 0xB933,
- 0xB934,      0, 0x5527, 0xB935,      0,      0,      0, 0xB936,
-      0, 0x4B65, 0xB937, 0x3A4A, 0xB938,      0, 0x3E2A,      0,
-};
-const unsigned short utf8_to_euc_E5A7[] = {
-      0, 0xB939,      0, 0xB93A, 0xB93B,      0, 0x5528,      0,
- 0xB93C, 0x3B50, 0xB93D, 0x3B4F,      0, 0xB93E,      0,      0,
- 0x3039, 0x3848, 0xB93F, 0x402B, 0x3051,      0,      0,      0,
-      0, 0x552C, 0x552D,      0, 0x552A, 0xB940, 0xB941, 0xB942,
-      0,      0,      0, 0xB943, 0xB944, 0x3138, 0x342F, 0xB945,
- 0x5529,      0, 0x4C45, 0x4931,      0,      0, 0xB946, 0xB947,
-      0, 0xB948, 0xB949,      0, 0xB94A,      0, 0x3028, 0xB94B,
-      0,      0,      0, 0x3079,      0,      0,      0, 0x3B51,
-};
-const unsigned short utf8_to_euc_E5A8[] = {
- 0xB94C, 0x3052,      0, 0x3023, 0xB94D,      0,      0,      0,
-      0, 0x5532,      0,      0, 0xB94E, 0xB94F, 0xB950,      0,
-      0, 0x5530, 0xB951, 0xB952,      0,      0,      0,      0,
- 0x4C3C,      0, 0x5533,      0, 0x5531,      0, 0xB953, 0x552F,
- 0x3F31,      0,      0, 0xB954, 0xB955, 0x552E,      0, 0xB956,
- 0xB957, 0x4A5A, 0xB958,      0,      0, 0xB959,      0, 0x3864,
- 0xB95A,      0,      0,      0,      0, 0x5537, 0x5538,      0,
-      0,      0,      0,      0, 0x3E2B,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E5A9[] = {
- 0x5534, 0x4F2C,      0,      0, 0xB95B, 0xB95C, 0x474C, 0xB95D,
- 0xB95E, 0x5536,      0,      0, 0xB95F,      0,      0,      0,
- 0xB960,      0,      0,      0,      0, 0xB961,      0,      0,
-      0,      0, 0x3A27,      0,      0,      0, 0xB962,      0,
-      0,      0, 0x5539, 0xB963,      0, 0xB964, 0x4958, 0xB965,
-      0,      0, 0x553A,      0, 0x5535, 0xB966,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xB967,
-      0,      0, 0xB968, 0xB969,      0,      0, 0xB96A, 0x4C3B,
-};
-const unsigned short utf8_to_euc_E5AA[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xB96B,      0,      0,      0,      0,
- 0xB96C,      0, 0x475E, 0xB96D,      0,      0, 0xB96E,      0,
-      0, 0xB96F, 0x553B, 0x4932, 0xB970,      0, 0xB971, 0xB972,
- 0xB973,      0, 0xB974,      0,      0,      0,      0, 0xB975,
-      0,      0,      0,      0, 0xB976,      0,      0,      0,
-      0, 0xB977, 0xB978, 0xB979,      0, 0xB97A,      0,      0,
- 0xB97B,      0, 0xB97C, 0xB97D, 0x553C, 0x5540, 0x553D, 0xB97E,
-};
-const unsigned short utf8_to_euc_E5AB[] = {
-      0, 0x3247, 0x553F,      0, 0xBA21,      0, 0xBA22,      0,
- 0xBA23, 0x3C3B,      0, 0x553E, 0x3779,      0,      0, 0xBA24,
- 0x554C,      0,      0,      0,      0,      0, 0x5545, 0x5542,
-      0,      0, 0xBA25,      0, 0xBA26,      0,      0,      0,
- 0xBA27, 0x4364,      0, 0x5541,      0, 0xBA28, 0x5543,      0,
-      0, 0x5544, 0xBA29,      0,      0,      0, 0xBA2A,      0,
-      0,      0,      0,      0,      0, 0xBA2B, 0xBA2C,      0,
-      0,      0, 0x5546, 0x5547,      0, 0xBA2D,      0,      0,
-};
-const unsigned short utf8_to_euc_E5AC[] = {
- 0xBA2E, 0xBA2F,      0,      0,      0,      0,      0,      0,
- 0xBA30, 0x3472,      0, 0x5549, 0x5548,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x554A, 0xBA31,
-      0, 0xBA33,      0, 0xBA34,      0, 0xBA35,      0,      0,
-      0, 0xBA36, 0x3E6E,      0,      0, 0xBA37,      0,      0,
-      0,      0, 0x554D,      0, 0x445C, 0xBA38,      0,      0,
- 0x3145,      0, 0x554B,      0, 0xBA32,      0, 0x554E,      0,
- 0xBA39,      0,      0,      0,      0,      0, 0x554F,      0,
-};
-const unsigned short utf8_to_euc_E5AD[] = {
- 0x5552, 0xBA3A,      0, 0x5550,      0, 0x5551,      0,      0,
-      0,      0,      0, 0xBA3B, 0xBA3C,      0,      0,      0,
- 0x3B52, 0x5553, 0xBA3D,      0, 0x3926, 0x5554, 0xBA3E, 0x3B7A,
- 0x4238,      0, 0x5555, 0x5556, 0x3B5A, 0x3927, 0xBA3F, 0x4C52,
-      0,      0,      0, 0x3528, 0x3849, 0x5557, 0x3358,      0,
- 0xBA40, 0x5558,      0, 0x4239,      0,      0, 0xBA41, 0xBA42,
- 0x5559, 0x5623,      0, 0x555A,      0, 0x555B,      0,      0,
- 0x555C,      0, 0x555E,      0, 0xBA43, 0xBA44, 0xBA45, 0xBA46,
-};
-const unsigned short utf8_to_euc_E5AE[] = {
- 0x555F, 0xBA47,      0, 0x5560, 0xBA48, 0x4270, 0xBA49, 0x3127,
- 0x3C69, 0x3042, 0xBA4A, 0x4157, 0x3430, 0x3C35, 0xBA4B, 0x3928,
- 0xBA4C, 0xBA4D,      0, 0xBA4E, 0xBA4F, 0x4566, 0xBA50, 0x3D21,
- 0x3431, 0x4368, 0x446A, 0x3038, 0x3539, 0x4A75,      0, 0x3C42,
-      0,      0, 0x3552, 0x406B, 0x3C3C, 0x4D28, 0x5561,      0,
- 0xBA51, 0xBA52,      0,      0, 0xBA53, 0xBA54, 0x355C, 0xBA55,
- 0x3A4B, 0xBA56, 0xBA57, 0x3332, 0x3163, 0x3E2C, 0x3248, 0xBA58,
- 0x5562, 0x4D46, 0xBA59,      0, 0xBA5A,      0,      0, 0x3D49,
-};
-const unsigned short utf8_to_euc_E5AF[] = {
- 0xBA5B, 0xBA5C, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564,
-      0, 0x5565,      0,      0, 0x4959, 0xBA5D,      0, 0xBA5E,
- 0x5567,      0, 0x3428, 0x3677, 0x5566,      0, 0xBA5F, 0xBA60,
- 0xBA61, 0xBA62, 0xBA63, 0x3432,      0, 0x3F32, 0x556B, 0x3B21,
- 0xBA64, 0x3249, 0x556A,      0, 0x5568, 0x556C, 0x5569, 0x472B,
- 0x5C4D, 0x3F33,      0, 0x556D, 0xF43A,      0, 0x4E40, 0xBA65,
- 0x556E, 0xBA66,      0, 0x5570, 0xBA67, 0x437E, 0x556F,      0,
- 0x4023,      0, 0x3B7B,      0,      0, 0xBA68, 0x4250, 0x3C77,
-};
-const unsigned short utf8_to_euc_E5B0[] = {
-      0, 0x4975, 0x406C,      0, 0x3C4D, 0x5571, 0x3E2D, 0x5572,
- 0x5573, 0x3053, 0x423A, 0x3F52, 0xBA69, 0x5574, 0x4633, 0x3E2E,
-      0, 0x3E2F,      0, 0x5575,      0,      0, 0x406D, 0xBA6A,
-      0,      0, 0x3E30,      0,      0,      0, 0xBA6B, 0xBA6C,
- 0x5576,      0, 0x5577, 0xBA6D, 0x4C60,      0, 0xBA6E,      0,
- 0x5578, 0xBA6F,      0, 0xBA70, 0xBA71, 0x3646, 0xBA72,      0,
- 0xBA73, 0x3D22, 0xBA74,      0,      0, 0xBA75, 0xBA76,      0,
- 0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722,
-};
-const unsigned short utf8_to_euc_E5B1[] = {
- 0x3649, 0x557B,      0,      0,      0, 0x356F, 0x557C,      0,
- 0x367E,      0, 0x464F, 0x3230,      0, 0x3B53, 0x557D, 0x5622,
- 0x5621, 0x367D,      0, 0x557E,      0, 0x4538,      0,      0,
-      0, 0xBA77, 0xBA78,      0, 0xBA79,      0, 0x4230,      0,
- 0x454B, 0x3C48, 0xBA7A, 0xBA7B, 0x4158, 0x4D7A,      0, 0xBA7C,
- 0xBA7D, 0xBA7E,      0,      0, 0x5624, 0xBB21, 0x5625, 0x4656,
- 0xBB22, 0x3B33,      0,      0, 0xBB23, 0xBB24, 0x5627,      0,
-      0, 0x5628, 0xBB25, 0xBB26, 0xBB27, 0xBB28,      0,      0,
-};
-const unsigned short utf8_to_euc_E5B2[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xBB29,
- 0xBB2A,      0, 0xBB2B,      0, 0x5629,      0,      0, 0xBB2C,
- 0x3474, 0x562A, 0xBB2D,      0, 0x562B,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xBB2E,      0, 0xBB2F,
- 0xBB30, 0x322C, 0xBB31, 0xBB32,      0,      0, 0xBB33,      0,
- 0x413B, 0x3464, 0xBB34, 0x562D, 0x4C28,      0,      0,      0,
-      0, 0x4252, 0xBB35, 0x3359, 0xBB36, 0xBB37, 0x562F, 0x5631,
- 0x345F,      0, 0xBB38, 0x562E, 0x5630,      0, 0x5633,      0,
-};
-const unsigned short utf8_to_euc_E5B3[] = {
-      0,      0,      0,      0,      0, 0x5632,      0, 0x5634,
-      0, 0xBB39,      0, 0xBB3A,      0,      0,      0,      0,
-      0,      0, 0xBB3B,      0,      0,      0,      0, 0xBB3D,
-      0, 0x5635,      0,      0,      0, 0xBB3C,      0,      0,
- 0x463D, 0x362E,      0,      0,      0,      0,      0,      0,
- 0x3265, 0x5636, 0x563B,      0,      0, 0x5639, 0xBB3E, 0x4A77,
- 0x4A76, 0xBB3F, 0xBB40,      0, 0xBB41, 0xF43B, 0x4567,      0,
-      0,      0, 0x5638, 0x3D54,      0, 0x5637,      0,      0,
-};
-const unsigned short utf8_to_euc_E5B4[] = {
-      0, 0xBB42,      0,      0,      0,      0, 0xBB43, 0x3F72,
-      0,      0,      0, 0x563C,      0, 0xBB44, 0x3A6A,      0,
-      0, 0x5642, 0xBB45,      0, 0x5643, 0x563D, 0x3333, 0x563E,
- 0x5647, 0x5646, 0x5645, 0x5641,      0,      0,      0, 0x5640,
-      0,      0, 0x5644, 0xBB47, 0xBB48,      0, 0xBB49, 0xBB4A,
-      0, 0x4A78,      0, 0xBB46,      0,      0,      0,      0,
-      0, 0xBB4B,      0,      0, 0xBB4C,      0,      0,      0,
-      0, 0xBB4D,      0,      0,      0, 0xBB4E,      0, 0xBB4F,
-};
-const unsigned short utf8_to_euc_E5B5[] = {
-      0,      0, 0xBB50, 0xBB51,      0,      0, 0xBB52,      0,
- 0xBB53,      0, 0xBB57, 0x564B, 0x5648,      0, 0x564A,      0,
- 0x4D72, 0xBB55, 0x5649, 0xF43C,      0, 0xBB54,      0,      0,
-      0, 0xBB56,      0,      0, 0x563F,      0,      0, 0xBB58,
- 0xBB59, 0xBB5A, 0xBB5B,      0, 0xBB5C,      0,      0,      0,
-      0, 0x3F73, 0xBB5D,      0, 0x564C, 0xBB5E,      0, 0x3A37,
- 0xBB5F,      0,      0, 0x564D,      0,      0, 0x564E,      0,
-      0, 0xBB60, 0xBB61,      0,      0,      0, 0xBB62, 0xBB63,
-};
-const unsigned short utf8_to_euc_E5B6[] = {
-      0, 0xBB64, 0x5651, 0xBB65, 0x5650,      0,      0, 0x564F,
- 0xBB66,      0, 0xBB67, 0x4568, 0x563A,      0,      0,      0,
- 0x5657,      0, 0xBB68, 0xBB69, 0xBB6A, 0xBB6B,      0,      0,
-      0, 0xBB6C,      0, 0xBB6D,      0, 0x5653,      0, 0xBB6E,
- 0xBB6F,      0, 0x5652,      0,      0,      0,      0, 0xBB70,
-      0,      0,      0, 0xBB71, 0x5654,      0, 0x5655,      0,
- 0xBB72,      0, 0xE674,      0, 0xBB73,      0,      0, 0x5658,
- 0xBB74, 0xBB75, 0x4E66,      0, 0x5659, 0x5656,      0,      0,
-};
-const unsigned short utf8_to_euc_E5B7[] = {
-      0,      0,      0, 0xBB76,      0,      0,      0, 0xBB77,
-      0, 0x565A,      0, 0xBB78, 0x3460, 0x565B, 0xBB7A,      0,
- 0xBB79,      0, 0x565D, 0x565C,      0,      0, 0x565E,      0,
- 0xBB7B, 0xBB7C,      0, 0x565F,      0, 0x406E, 0x3D23,      0,
- 0xBB7D, 0x3D64,      0, 0x4163, 0xBB7E, 0x3929, 0x3A38, 0x392A,
- 0x3570, 0xBC21,      0, 0x5660,      0,      0, 0x3A39,      0,
-      0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662,      0, 0x392B,
- 0xBC22, 0xBC23,      0, 0x342C,      0, 0x4327, 0x3652,      0,
-};
-const unsigned short utf8_to_euc_E5B8[] = {
- 0xBC24,      0, 0x3B54, 0x495B,      0,      0, 0x4841, 0xBC25,
-      0,      0,      0, 0x5663, 0x3475, 0xBC26,      0,      0,
-      0, 0x5666, 0xBC27,      0, 0xBC28, 0xBC29, 0x4421,      0,
- 0xBC2A, 0x5665, 0x5664, 0x5667,      0, 0x446B,      0, 0xBC2B,
- 0xBC2C,      0,      0,      0,      0, 0x3F63,      0,      0,
- 0xBC2E,      0,      0, 0x3B55,      0, 0x404A, 0xBC2D, 0x4253,
- 0x3522,      0, 0xBC2F, 0x4422,      0, 0xBC30, 0x5668, 0x5669,
- 0x3E6F,      0,      0,      0,      0, 0x4B39, 0xBC31,      0,
-};
-const unsigned short utf8_to_euc_E5B9[] = {
- 0x566C,      0,      0, 0x566B, 0x566A, 0x497D,      0, 0x5673,
-      0, 0xBC34,      0, 0xBC32, 0x4B5A,      0, 0x566D,      0,
- 0xBC33, 0xBC35,      0,      0, 0x566F, 0x4B6B, 0xBC36, 0x566E,
- 0xBC37,      0,      0, 0xBC38, 0xBC39,      0, 0xBC3A, 0x5670,
-      0, 0x4828, 0x5671, 0x4A3E, 0x5672,      0,      0,      0,
- 0xBC3B,      0, 0xBC3C, 0xBC3D, 0xBC3E, 0xBC3F, 0xBC40,      0,
- 0xBC41,      0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675,      0,
- 0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678,
-};
-const unsigned short utf8_to_euc_E5BA[] = {
- 0xBC42, 0x4423,      0, 0x392D, 0x3E31,      0,      0, 0x485F,
-      0,      0, 0x3E32, 0xBC43,      0,      0, 0xBC44, 0x3D78,
-      0,      0,      0,      0,      0, 0x446C, 0x4A79, 0x4539,
-      0,      0, 0x392E,      0, 0x495C,      0,      0,      0,
- 0x5679,      0, 0xBC45,      0, 0xBC46, 0xBC47, 0x4559, 0x3A42,
- 0xBC48,      0, 0xBC49, 0x384B, 0xBC4A, 0x446D,      0,      0,
-      0, 0xBC4B,      0, 0xBC4C,      0, 0x3043, 0x3D6E, 0x392F,
- 0x4D47,      0,      0,      0,      0, 0xBC4D, 0xBC4E, 0xBC4F,
-};
-const unsigned short utf8_to_euc_E5BB[] = {
-      0, 0x567A, 0x567B, 0x4751,      0,      0, 0xBC50,      0,
- 0x567C, 0x4E77, 0x4F2D, 0xBC52, 0xBC51,      0, 0xBC53, 0x567E,
- 0x567D, 0xBC54, 0xBC55, 0x3347, 0xBC56, 0xBC57, 0x5721,      0,
-      0,      0, 0x5724, 0x5725, 0xBC58, 0x5723, 0xBC59, 0x4940,
- 0x3E33, 0x5727, 0x5726, 0x5722,      0, 0xBC5A,      0,      0,
- 0x5728, 0x5729,      0, 0xBC5B, 0x572A,      0,      0,      0,
- 0x572D, 0x572B,      0, 0x572C, 0x572E,      0, 0x3164, 0x446E,
- 0x572F,      0, 0x377A, 0x3276, 0x4736,      0, 0x5730, 0x467B,
-};
-const unsigned short utf8_to_euc_E5BC[] = {
-      0, 0x4A5B, 0xBC5C, 0x5731, 0x4F2E,      0, 0xBC5D, 0xBC5E,
- 0xBC5F, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xBC60, 0x3C30,
- 0x4675, 0x5736,      0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26,
- 0x3930, 0xBC61,      0, 0x4350, 0xBC62, 0xBC63,      0, 0x446F,
-      0, 0xBC64, 0xBC65, 0xBC66, 0xBC67, 0x4C6F, 0x3839, 0x384C,
- 0xBC68, 0x5738,      0, 0xBC69, 0xBC6A, 0x5739, 0xBC6B, 0x573F,
- 0xBC6C, 0x3C65,      0,      0, 0xBC6D, 0x4425, 0xBC6E, 0x362F,
- 0x573A,      0,      0, 0xBC6F, 0x492B, 0xBC70, 0x4346, 0xBC71,
-};
-const unsigned short utf8_to_euc_E5BD[] = {
- 0xBC72, 0x573B,      0,      0, 0xBC73, 0xBC74,      0, 0xBC75,
- 0x573C,      0, 0x3630,      0, 0x573D, 0xBC76, 0x573E,      0,
- 0xBC77, 0x5740,      0, 0x4576, 0xBC78,      0, 0x5741, 0x5742,
- 0xBC79, 0x5743,      0, 0xBC7A, 0x5734, 0x5733,      0,      0,
- 0xBC7B, 0x5744, 0x3741, 0xBC7C, 0xBC7D,      0, 0x4927, 0xBC7E,
-      0, 0x3A4C, 0x4937, 0x4426, 0x494B, 0x5745,      0, 0xBD21,
- 0x3E34, 0x3146, 0xBD22, 0x5746, 0xBD23, 0xBD24,      0, 0x5747,
- 0xBD25, 0x4C72, 0xBD26,      0, 0x4860, 0xBD27, 0xBD28, 0x574A,
-};
-const unsigned short utf8_to_euc_E5BE[] = {
- 0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254,      0, 0x574E,
- 0x574C, 0xBD29, 0x574B, 0x4E27, 0x3865, 0xBD2A,      0, 0xBD2B,
- 0x3D79, 0x574D, 0x454C, 0x3D3E,      0,      0, 0xBD2C, 0x4640,
- 0x5751, 0x5750,      0,      0, 0xBD2D, 0xBD2E, 0x574F,      0,
- 0x5752, 0x3866, 0xBD2F,      0, 0xBD32,      0,      0, 0xBD30,
- 0x5753, 0x497C, 0x3D5B, 0xBD31, 0xBD33, 0x5754, 0x4879, 0xBD34,
- 0xBD35, 0xBD36,      0, 0x4641, 0x4427,      0,      0, 0xF43E,
- 0xBD37, 0x4530,      0,      0, 0x5755, 0x352B,      0,      0,
-};
-const unsigned short utf8_to_euc_E5BF[] = {
-      0,      0,      0, 0x3F34, 0xBD38, 0x492C,      0, 0xBD39,
- 0xBD3A, 0xBD3B,      0, 0xBD3C, 0x3477, 0x4726,      0,      0,
- 0xBD3D, 0xBD3E, 0xBD3F, 0xBD40, 0xBD41,      0, 0x5756, 0x3B56,
- 0x4B3A, 0x4B3B,      0,      0, 0x317E, 0x575B, 0xBD42,      0,
- 0x4369, 0xBD43, 0xBD44,      0, 0x5758,      0,      0,      0,
- 0xBD45, 0xBD46, 0xBD47, 0x3277, 0xBD48, 0xBD49, 0xBD4A, 0xBD4B,
- 0x582D, 0x575A, 0xBD4C, 0xBD4D,      0, 0x4730, 0xBD4E,      0,
- 0x5759,      0, 0xBD4F, 0x5757, 0xBD50, 0x397A,      0, 0x575D,
-};
-const unsigned short utf8_to_euc_E680[] = {
-      0,      0,      0,      0,      0,      0,      0, 0xBD51,
-      0,      0, 0xBD52,      0,      0, 0xBD53, 0x5763, 0x5769,
- 0x5761,      0, 0x455C, 0xBD54, 0xBD55, 0x5766, 0x495D, 0xBD56,
- 0xBD57, 0x5760, 0xBD58, 0x5765, 0x4E67, 0x3B57,      0, 0xBD59,
- 0x4255, 0x575E,      0,      0, 0xBD5A, 0x355E, 0x5768, 0x402D,
- 0x3165, 0x5762, 0x3278, 0x5767,      0, 0xBD5B,      0, 0x3631,
-      0, 0x5764,      0, 0xBD5C,      0, 0xBD5D,      0,      0,
-      0,      0, 0x576A,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E681[] = {
- 0xBD5E, 0x576C, 0x5776, 0x5774,      0,      0, 0x5771, 0xBD5F,
- 0xBD60, 0xBD61, 0x5770, 0x4E78, 0xBD62, 0x5772,      0,      0,
- 0x3632, 0xBD63, 0x3931,      0, 0xBD64, 0x3D7A, 0xBD65, 0xBD66,
-      0, 0x5779, 0x576B,      0,      0, 0xBD67,      0, 0x576F,
- 0x575F, 0xBD68, 0x327A, 0x5773, 0x5775, 0x4351,      0, 0xBD69,
- 0x3A28, 0x3238, 0x576D, 0x5778, 0x5777, 0x3633,      0, 0x4229,
- 0x3366, 0xBD6A,      0,      0,      0, 0x3743,      0, 0x576E,
-      0,      0,      0,      0,      0,      0, 0xBD6B, 0xBD6C,
-};
-const unsigned short utf8_to_euc_E682[] = {
-      0, 0x577A, 0xBD6D, 0x577D, 0x5821, 0xF43F, 0xBD6E,      0,
- 0xBD6F, 0x3C3D, 0xBD70, 0x5827, 0x4470, 0x577B, 0xBD71,      0,
-      0, 0xBD72, 0x5825, 0xBD73, 0x3279, 0xBD74, 0x5823, 0x5824,
- 0xBD75,      0, 0x577E, 0x5822,      0, 0xBD76, 0xBD77, 0x3867,
- 0x4D2A,      0, 0xBD78, 0x3435, 0xBD79, 0xBD7A, 0x3159, 0x5826,
- 0xBD7B, 0x473A, 0x302D,      0,      0,      0,      0,      0,
- 0xBD7C, 0xBD7D, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 0xBD7E,
- 0x5829,      0,      0, 0xBE21, 0x4569, 0x582E, 0xBE22,      0,
-};
-const unsigned short utf8_to_euc_E683[] = {
-      0,      0, 0xBE23,      0, 0xBE24, 0x3E70, 0x582F, 0x4657,
- 0xBE25, 0xBE26, 0xBE27, 0xBE28,      0,      0, 0xBE29, 0xBE2A,
-      0, 0x4F47,      0, 0x582B, 0xBE2B, 0xBE2C,      0,      0,
- 0x5831, 0xBE2D, 0x397B, 0xBE2E, 0x404B, 0xBE2F, 0xBE30, 0x3054,
- 0x582A, 0x5828, 0xBE31, 0x415A,      0, 0xBE32,      0, 0x577C,
- 0x3B34,      0,      0,      0,      0,      0,      0,      0,
- 0x4246, 0x583D, 0xBE33, 0x415B, 0x5838, 0xBE34, 0x5835, 0x5836,
- 0xBE35, 0x3C66, 0x5839, 0x583C, 0xBE36, 0xBE37,      0,      0,
-};
-const unsigned short utf8_to_euc_E684[] = {
- 0x5837, 0x3D25, 0xBE38, 0x583A,      0,      0, 0x5834, 0xBE39,
- 0x4C7C, 0x4C7B, 0xBE3A,      0, 0xBE3B, 0x583E, 0x583F, 0x3055,
- 0xBE3C, 0xBE3D, 0xBE3E, 0xBE3F, 0xBE40, 0x5833, 0xBE41, 0xBE42,
-      0, 0xBE43, 0x3672, 0x3026, 0xBE44,      0, 0xBE45, 0x3436,
- 0xF440, 0x583B, 0xBE46,      0,      0,      0,      0, 0x5843,
- 0x5842,      0, 0xBE47, 0xBE48, 0x5847,      0,      0,      0,
- 0xBE49, 0xBE4A,      0,      0, 0x5848, 0xBE4B, 0xBE4C, 0xBE4D,
-      0, 0xBE4E,      0,      0, 0x5846, 0x5849, 0x5841, 0x5845,
-};
-const unsigned short utf8_to_euc_E685[] = {
-      0, 0xBE4F, 0x584A,      0, 0x584B, 0xBE50, 0xBE51, 0x5840,
- 0x3B7C, 0xBE52, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35,      0,
-      0,      0,      0, 0x5858,      0, 0x4A69,      0,      0,
- 0x584E, 0x584F, 0x5850,      0,      0, 0x5857, 0xBE53, 0x5856,
- 0xBE54,      0, 0x4B7D, 0x3437,      0, 0x5854,      0, 0x3745,
- 0x3334,      0,      0, 0x5851, 0xBE55,      0, 0x4E38, 0x5853,
- 0x3056, 0x5855, 0xBE56, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D,
- 0xBE57,      0,      0, 0xBE58, 0xBE59,      0, 0x4D5D, 0xBE5A,
-};
-const unsigned short utf8_to_euc_E686[] = {
- 0xBE5B, 0xBE5C, 0x4D2B, 0xBE5D, 0xBE5E,      0,      0, 0x585C,
-      0,      0, 0x5860, 0xBE5F,      0, 0xBE60, 0x417E,      0,
- 0x4E79, 0x5861, 0xBE61, 0xBE62, 0x585E,      0, 0x585B, 0xBE63,
- 0xBE64, 0x585A, 0x585F,      0, 0xBE65, 0xBE66,      0, 0xBE67,
- 0xBE68,      0,      0,      0, 0x4A30, 0xBE69,      0, 0x4634,
- 0xBE6A, 0x3746, 0xBE6B, 0x5862, 0x585D, 0xBE6C, 0x5863,      0,
-      0,      0, 0x377B,      0,      0,      0, 0x3231,      0,
- 0xBE6D, 0xBE6E, 0x586B,      0, 0xBE6F,      0, 0x3438,      0,
-};
-const unsigned short utf8_to_euc_E687[] = {
- 0xBE70, 0xBE71, 0xBE72, 0x5869,      0,      0, 0x586A, 0x3A29,
- 0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 0xBE73, 0xBE74,
- 0x327B,      0,      0,      0,      0, 0xBE75,      0,      0,
-      0,      0,      0,      0, 0xBE76, 0xBE77, 0xBE78, 0xBE79,
-      0, 0xBE7A, 0xBE7B, 0x5870,      0, 0xBE7E, 0x586F, 0xBE7C,
-      0, 0xBE7D,      0,      0, 0xBF21, 0xBF22,      0, 0xBF23,
-      0,      0, 0x4428,      0, 0x5873,      0, 0x5871, 0x5867,
- 0x377C,      0, 0x5872,      0, 0x5876, 0x5875, 0x5877, 0x5874,
-};
-const unsigned short utf8_to_euc_E688[] = {
- 0x5878, 0xBF24,      0, 0xBF25, 0xBF26,      0,      0, 0xBF27,
- 0x5879, 0x587A, 0x4A6A,      0, 0x587C, 0x587B, 0x3D3F,      0,
- 0x402E, 0x3266, 0x327C, 0xBF28, 0x587D, 0xBF29, 0x303F,      0,
-      0,      0, 0x404C, 0x587E, 0xBF2A, 0x6C43, 0x5921, 0x3761,
- 0xBF2B, 0x5922, 0xBF2C, 0xBF2D,      0,      0, 0x406F, 0xBF2E,
-      0, 0xBF2F, 0x5923, 0xBF30,      0,      0, 0x5924, 0x353A,
- 0x5925,      0, 0x5926, 0x5927, 0x4257,      0,      0,      0,
- 0x384D, 0xBF31,      0, 0x4C61,      0, 0xBF32,      0, 0x4B3C,
-};
-const unsigned short utf8_to_euc_E689[] = {
- 0x3D6A, 0x5928, 0xBF33, 0xBF34, 0xBF35,      0, 0xBF36, 0x4070,
- 0x6E3D, 0x4862,      0, 0x3C6A, 0xBF37, 0x3A4D, 0x5929,      0,
- 0xBF38, 0xBF39, 0xBF3A, 0x4247, 0xBF3B, 0x4A27, 0xBF3C,      0,
- 0x4271,      0, 0xBF3D, 0x592C, 0xBF3E,      0, 0x592A,      0,
- 0x592D,      0,      0, 0x592B, 0xBF3F,      0,      0,      0,
- 0x592E,      0,      0,      0,      0, 0xBF40, 0x4A31, 0xBF41,
-      0, 0x3037,      0, 0xBF42,      0,      0, 0x495E,      0,
-      0, 0x4863, 0xBF43,      0, 0x592F, 0xBF44, 0x5932, 0x3E35,
-};
-const unsigned short utf8_to_euc_E68A[] = {
- 0x353B,      0, 0x5930, 0x5937, 0x3E36,      0,      0,      0,
-      0, 0x5931, 0x4744,      0,      0, 0xBF45, 0xBF46, 0xBF47,
- 0xBF48, 0x4D5E, 0x5933, 0x5934, 0x5938, 0x456A, 0x5935, 0x3933,
- 0x405E,      0,      0, 0x5946, 0x4834,      0, 0x4272,      0,
-      0,      0,      0,      0,      0,      0, 0xBF49,      0,
- 0xBF4A,      0,      0, 0x4864, 0x5A2D,      0,      0,      0,
-      0, 0x4A7A,      0, 0xBF4B,      0, 0x4471, 0xBF4C, 0xBF4D,
-      0, 0x4B75, 0xBF4E, 0x593B, 0x3221, 0x436A, 0xBF4F, 0xBF50,
-};
-const unsigned short utf8_to_euc_E68B[] = {
-      0,      0, 0x5944,      0, 0xBF51, 0x4334, 0x593E, 0x5945,
- 0x5940, 0x5947, 0x5943,      0, 0x5942, 0x476F, 0xBF52, 0x593C,
- 0x327D, 0x593A, 0x3571, 0x4273, 0x5936, 0xBF53, 0xBF54, 0x5939,
- 0x3934, 0x405B, 0xBF55, 0x3E37, 0x5941, 0x4752,      0,      0,
- 0x3572, 0x3348,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xBF56,      0, 0x3367, 0x3F21, 0x5949, 0x594E,
-      0, 0x594A, 0xBF57, 0x377D, 0xBF58, 0x594F, 0x3B22, 0x3969,
-      0,      0,      0,      0, 0xBF59, 0xBF5A, 0x3D26, 0x593D,
-};
-const unsigned short utf8_to_euc_E68C[] = {
-      0, 0x3B7D, 0x594C, 0xBF5B, 0xBF5C,      0,      0, 0x3B58,
- 0x594D, 0x3044, 0xBF5D, 0xBF5E, 0x5948, 0xBF5F,      0,      0,
- 0xBF60, 0x4429,      0, 0xBF61,      0,      0, 0xBF62,      0,
- 0xBF63, 0x3573,      0,      0,      0,      0,      0, 0x3634,
-      0,      0,      0,      0,      0,      0,      0, 0x594B,
- 0x3027, 0xBF64, 0xBF65, 0x3A43,      0, 0xBF66,      0, 0x3F36,
-      0,      0,      0,      0,      0, 0xBF67, 0xBF68,      0,
-      0, 0xBF69, 0x4472,      0, 0xBF6A, 0x4854, 0x5951, 0x415E,
-};
-const unsigned short utf8_to_euc_E68D[] = {
-      0, 0xBF6B, 0xBF6C, 0xBF6D, 0xBF6E,      0, 0xBF6F,      0,
-      0, 0x422A, 0xBF70, 0xBF71, 0x3B2B, 0x5952, 0xBF72, 0x5954,
- 0x5950,      0, 0xBF73, 0xBF74, 0xBF75, 0x4A61,      0, 0x443D,
- 0xBF76,      0,      0, 0xBF77, 0x415C,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xBF78, 0xBF79, 0x4A7B,
- 0x3C4E, 0x5960,      0, 0x595F, 0xBF7A, 0xBF7B, 0x3F78,      0,
-      0, 0xBF7C, 0x377E,      0, 0xBF7D, 0xBF7E, 0x5959, 0x3E39,
- 0xC021,      0, 0x4668, 0x4731, 0xC022, 0xC023,      0, 0xC024,
-};
-const unsigned short utf8_to_euc_E68E[] = {
- 0x5957,      0, 0xC025, 0x415D, 0xC026,      0,      0, 0xC027,
- 0x3C78, 0x595C, 0xC028,      0, 0x3E38,      0, 0x5956, 0x595B,
- 0xC029,      0, 0x4753,      0, 0xC02A, 0xC02B, 0x5955,      0,
- 0x3721, 0xC02C, 0xC02D, 0x335D,      0,      0, 0xC02E, 0x595D,
- 0x4E2B, 0x3A4E, 0x4335, 0x595A, 0xC02F, 0x405C, 0xC030, 0x3935,
- 0x3F64, 0x3166, 0x413C, 0x5958, 0x3545, 0xC031, 0xC032, 0xC033,
-      0,      0, 0x3747,      0, 0x444F, 0x595E,      0,      0,
-      0,      0,      0, 0x415F,      0, 0xC034, 0x5961,      0,
-};
-const unsigned short utf8_to_euc_E68F[] = {
- 0x5963, 0xC035,      0, 0x4237, 0x5969, 0xC036, 0x5964,      0,
- 0xC037, 0x5966,      0,      0,      0,      0, 0xC038, 0x4941,
- 0x4473, 0xC039, 0x5967, 0xC03A, 0xC03B, 0xC03C, 0x4D2C,      0,
-      0,      0, 0x4D48, 0x3439, 0xC03D,      0,      0,      0,
- 0xC03E, 0x302E,      0, 0x5965,      0, 0xC03F,      0,      0,
-      0, 0x5962, 0xC040,      0, 0xC041,      0, 0x3478,      0,
-      0,      0, 0xC042, 0xC043, 0x3167, 0xC044, 0x5968,      0,
- 0xC045, 0xC046, 0x4D49,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E690[] = {
-      0,      0,      0,      0,      0,      0, 0x596C,      0,
-      0, 0xC047, 0xC048,      0,      0, 0x423B,      0, 0x5973,
- 0xC049,      0, 0xC04A, 0x596D, 0xC04B,      0, 0x596A, 0x5971,
- 0xC04C,      0,      0,      0, 0x5953,      0, 0xC04D,      0,
- 0xC04E,      0, 0xC04F,      0, 0xC050, 0xC051, 0x596E,      0,
- 0x5972, 0xC052, 0xC053,      0, 0x4842, 0x456B,      0, 0xC054,
- 0xC055,      0,      0,      0, 0x596B, 0xC056, 0x596F,      0,
-      0,      0, 0x3748,      0,      0, 0xC057, 0x3A71, 0xC058,
-};
-const unsigned short utf8_to_euc_E691[] = {
-      0,      0, 0x405D,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xC059,      0,      0, 0x5977, 0xC05A,
-      0, 0xC05B, 0xC05C, 0xC05D, 0xC05E,      0,      0,      0,
- 0x4526,      0, 0xC05F, 0xC060, 0xC061, 0xC062,      0, 0xC063,
- 0xC064, 0xC065,      0, 0xC066,      0,      0,      0, 0x5974,
-      0, 0x4B60,      0,      0,      0, 0xC067,      0, 0x5975,
-      0,      0,      0, 0xC068, 0xC069,      0, 0x5976,      0,
- 0x4C4E,      0, 0x4022, 0xC06A,      0, 0xC06B,      0,      0,
-};
-const unsigned short utf8_to_euc_E692[] = {
-      0,      0,      0, 0x3762,      0, 0xC06C,      0, 0xC06D,
- 0x597D,      0,      0,      0,      0,      0,      0, 0xC06E,
- 0xC06F, 0xC070, 0x3B35, 0x597A,      0, 0x5979,      0,      0,
- 0xC071, 0xC072, 0x4732, 0xC073,      0, 0xC074, 0x4635, 0xC075,
-      0, 0xC076,      0, 0xC077, 0x4531, 0x597B, 0xC078,      0,
- 0xC079, 0x597C,      0, 0x496F, 0xC07A, 0x4745, 0x3B23,      0,
- 0x4071,      0, 0x4B50, 0xC07B,      0,      0,      0,      0,
-      0, 0x3349,      0, 0x5A25, 0x597E, 0xC07C, 0xC07D, 0xC07E,
-};
-const unsigned short utf8_to_euc_E693[] = {
-      0, 0x4D4A, 0x5A27,      0, 0xC121, 0x5A23,      0, 0x5A24,
-      0, 0xC122, 0xC123, 0xC124, 0xC125, 0x4160, 0xC126,      0,
- 0xC127, 0xC128, 0x5A22,      0, 0x593F, 0xC129,      0, 0xC12A,
- 0x5A26,      0, 0x5A21,      0,      0,      0,      0,      0,
- 0x5A2B, 0x5A2C, 0x4527, 0x5A2E, 0xC12B, 0xC12C, 0x3B24, 0x5A29,
-      0, 0xC12D, 0xC12E,      0, 0x353C, 0xC12F,      0, 0x5A2F,
- 0xC130, 0x5A28, 0x5A33,      0, 0x5A32, 0xC131, 0x5A31, 0xC132,
-      0,      0, 0x5A34, 0xC133,      0, 0x5A36, 0x3E71, 0xC134,
-};
-const unsigned short utf8_to_euc_E694[] = {
- 0x5A35, 0xC135,      0,      0, 0xC136, 0x5A39,      0,      0,
- 0xC137, 0xC138, 0xC139,      0,      0,      0,      0, 0xC13A,
-      0,      0,      0, 0xC13B, 0xC13C,      0, 0xC13D,      0,
- 0x5A37, 0xC13E,      0, 0xC13F, 0x5A38, 0x5970, 0xC140, 0xC141,
-      0,      0, 0xC142, 0x5A3B, 0x5A3A,      0, 0xC143,      0,
-      0, 0xC144, 0x5978, 0x5A3C, 0x5A30,      0, 0xC145, 0x3B59,
-      0, 0xC146,      0,      0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F,
- 0x5A41, 0x327E, 0xC147, 0x3936, 0xC148, 0xC149, 0x4A7C, 0x402F,
-};
-const unsigned short utf8_to_euc_E695[] = {
-      0,      0,      0, 0xC14A,      0, 0x384E,      0, 0xC14B,
- 0x5A43, 0xC14C,      0,      0,      0, 0x5A46, 0xF441, 0x4952,
- 0xC14D, 0x355F, 0xC14E,      0, 0xC14F, 0x5A45, 0x5A44, 0x4754,
- 0x5A47, 0x3635,      0,      0,      0, 0x5A49, 0x5A48, 0xC150,
- 0xC151,      0, 0x343A, 0x3B36,      0,      0, 0x4658, 0xC152,
-      0,      0,      0, 0xC153, 0x3749,      0,      0,      0,
- 0x3F74,      0, 0x5A4A,      0, 0x4030, 0x4528,      0, 0x495F,
- 0x5A4B,      0, 0xC154,      0,      0, 0xC155,      0,      0,
-};
-const unsigned short utf8_to_euc_E696[] = {
-      0, 0xC156, 0x5A4C, 0x5A4D,      0, 0xC157,      0, 0x4A38,
- 0x555D, 0x4046, 0xC158,      0, 0x494C,      0, 0x3A58,      0,
- 0x4865, 0x4843, 0xC159,      0,      0, 0xC15A,      0, 0x454D,
- 0xC15B, 0x4E41,      0, 0x5A4F, 0x3C50, 0xC15C,      0, 0x5A50,
- 0xC15D, 0x3036,      0, 0xC15E, 0x3654, 0x404D, 0xC15F, 0x4960,
-      0,      0,      0, 0x5A51, 0x3B42, 0x4347, 0xC160, 0x3B5B,
- 0x3F37,      0, 0xC161, 0xC162, 0xC163,      0,      0, 0x5A52,
-      0, 0x4A7D,      0,      0, 0x3177, 0x3B5C,      0, 0xC164,
-};
-const unsigned short utf8_to_euc_E697[] = {
-      0, 0x5A55, 0xC165, 0x5A53, 0x5A56, 0x4E39, 0x5A54,      0,
- 0xC166, 0xC167,      0, 0x407B, 0x5A57,      0, 0xC168, 0x4232,
- 0xC169,      0, 0x5A58,      0, 0xC16A,      0, 0xC16B, 0x347A,
- 0xC16C, 0x5A5A,      0, 0x5A59,      0,      0,      0, 0xC16D,
- 0x5A5B, 0x5A5C, 0x347B,      0,      0, 0x467C, 0x4336, 0x356C,
- 0x3B5D, 0x4161,      0,      0, 0x3D5C, 0x3030,      0,      0,
- 0xC16E, 0x5A5D, 0xC16F,      0, 0xC170, 0xC171,      0,      0,
-      0, 0xC172, 0x3222, 0x5A61,      0,      0, 0xC173, 0xC174,
-};
-const unsigned short utf8_to_euc_E698[] = {
- 0xC175,      0, 0x3937, 0x5A60, 0xC176,      0, 0x3A2B, 0x3E3A,
- 0xC177, 0xC178, 0x5A5F,      0, 0x3E3B, 0xC179, 0x4C40, 0x3A2A,
-      0, 0xC17A, 0xC17B, 0x3057, 0x404E, 0xC17C, 0xC17D,      0,
-      0,      0,      0,      0, 0x5A66, 0xC17E, 0xC221, 0x4031,
- 0x3147, 0xC222, 0xC223, 0xC224, 0xC225, 0x3D55, 0xC226, 0x4B66,
- 0x3A72, 0xC227, 0xC228, 0xC229, 0xC22A, 0x3E3C, 0xC22B, 0x4027,
- 0xC22C, 0xC22D,      0, 0xC22E, 0x5A65, 0x5A63, 0x5A64, 0xC230,
-      0, 0xC22F,      0, 0xF442, 0x436B,      0,      0, 0x5B26,
-};
-const unsigned short utf8_to_euc_E699[] = {
- 0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xC232, 0xC233,      0,
-      0, 0x5A69, 0xC234, 0x3F38, 0xC235,      0, 0xC237, 0x5A67,
-      0, 0xC236, 0x3B2F,      0,      0,      0,      0, 0xC238,
- 0xC239, 0xC23A,      0, 0xC23B, 0xC23C, 0x5A6C, 0x5A6B, 0x5A70,
- 0xC23D, 0xC23E, 0x5A71,      0, 0x5A6D, 0xF443, 0x3322, 0x5A6E,
- 0x5A6F, 0x4855, 0xC240, 0xC241, 0xC242,      0, 0x4961, 0x374A,
- 0x5A72,      0,      0, 0xC244, 0x4032, 0xC245, 0x3E3D, 0xC247,
- 0xC248, 0xC249, 0x4352, 0xC24A, 0xC24C,      0, 0xC243, 0xC246,
-};
-const unsigned short utf8_to_euc_E69A[] = {
- 0xC24B, 0x3647,      0, 0x5A73, 0x5A77,      0,      0, 0x324B,
- 0x5A74, 0x5A76,      0, 0xC24D, 0xC24E, 0xC24F, 0x5A75,      0,
- 0xC250, 0x3D6B, 0xC251,      0,      0,      0, 0x4348, 0x3045,
- 0x5A78, 0xC252, 0xC253, 0xC254, 0xC255, 0x5A79,      0, 0xC256,
- 0xC257,      0, 0x442A,      0, 0xC258,      0, 0x4E71,      0,
-      0,      0,      0, 0x3B43,      0, 0xC259, 0x4A6B,      0,
-      0, 0xC25A, 0xC25B,      0, 0x4B3D, 0xC25C,      0,      0,
- 0x5B22, 0x5A7B,      0, 0xC25D, 0x5A7E,      0, 0x5A7D, 0xC25E,
-};
-const unsigned short utf8_to_euc_E69B[] = {
- 0xC25F, 0x5A7A, 0xC260, 0xC261, 0x5B21,      0,      0, 0x465E,
- 0xC262, 0x5A7C,      0,      0, 0xC263,      0, 0xC264, 0xC265,
-      0,      0,      0,      0, 0xC266,      0, 0x5B23,      0,
-      0, 0x3D6C, 0x5B24, 0xC267, 0x4D4B, 0x4778,      0, 0xC268,
- 0x5B25,      0,      0,      0,      0,      0, 0x5B27,      0,
- 0xC269, 0x5B28,      0, 0xC26A, 0xC26B,      0, 0xC26C,      0,
- 0x5B29,      0, 0x364A, 0x3148, 0x3939, 0x5B2A,      0, 0x5B2B,
- 0x3D71, 0x4162, 0xC26D, 0xC23F, 0x5258, 0x413E, 0x413D, 0x4258,
-};
-const unsigned short utf8_to_euc_E69C[] = {
- 0x3A47,      0,      0, 0x5072,      0, 0xC26E,      0, 0xC26F,
- 0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E, 0xC270, 0x5B2C,
-      0,      0,      0, 0xC271, 0x3A73, 0x443F, 0x5B2D, 0x4F2F,
-      0, 0xC272,      0, 0x4B3E, 0xC273, 0x442B, 0x5B2E, 0x347C,
- 0xC274,      0, 0xC275,      0,      0,      0, 0x5B2F, 0x5B30,
- 0x4C5A,      0, 0x4C24, 0x4B76, 0x4B5C, 0x3B25, 0x5B32,      0,
-      0, 0x3C6B,      0, 0xC276, 0x4B51,      0, 0x5B34, 0x5B37,
- 0x5B36,      0, 0x3479,      0,      0, 0x3560, 0xC277, 0x5B33,
-};
-const unsigned short utf8_to_euc_E69D[] = {
-      0, 0x5B35,      0,      0,      0, 0xC278, 0x5B38, 0xC279,
- 0xC27A, 0x3F79,      0,      0, 0xC27B,      0, 0x4D7B, 0x3049,
- 0x3A60, 0x423C,      0, 0x3C5D, 0xC27C, 0xC27D, 0x3E73,      0,
-      0, 0x5B3B,      0,      0, 0x454E, 0xC27E, 0x5B39, 0x422B,
- 0x5B3A, 0x3E72, 0x4C5D, 0x5B3C, 0x5B3D, 0x4D68, 0xC321,      0,
-      0,      0, 0x5B42,      0, 0xC322, 0x393A, 0xC323, 0x4755,
- 0x5B3F, 0x456C, 0x5A5E, 0x5A62, 0xC324, 0x354F, 0xC325, 0x4747,
-      0,      0,      0, 0xC326, 0x5B41,      0, 0x3E3E, 0x4844,
-};
-const unsigned short utf8_to_euc_E69E[] = {
-      0, 0xC327,      0,      0, 0xC328, 0x5B47,      0, 0x487A,
-      0, 0x5B3E,      0, 0x5B44, 0x5B43,      0, 0xC329, 0xC32A,
- 0x404F, 0xC32B,      0, 0xC32C,      0, 0x4B6D, 0xC32D, 0x4E53,
- 0xC32E, 0xC32F, 0x4B67, 0xC330, 0x324C, 0x3B5E,      0,      0,
- 0x4F48, 0x5B46, 0x3F75,      0,      0,      0, 0x5B45,      0,
-      0, 0x5B40,      0,      0,      0,      0,      0, 0x384F,
- 0xC331, 0xC332, 0xC333, 0x5B4C, 0x5B4A, 0xC334, 0x324D, 0x5B48,
- 0x5B4E, 0x5B54,      0, 0xC335, 0xC336, 0xC337,      0,      0,
-};
-const unsigned short utf8_to_euc_E69F[] = {
- 0xC339, 0x4248, 0xC33A, 0xC33B, 0x4A41, 0xC33C, 0x5B56,      0,
- 0xC33D, 0xC33E, 0x4922,      0,      0,      0, 0x5B55, 0x4770,
- 0x4B3F, 0x343B, 0xC33F, 0x4077, 0x3D40,      0,      0, 0xC340,
- 0x4453, 0xC341, 0x4D2E,      0, 0xC342, 0x5B51, 0x5B50,      0,
-      0, 0xC343, 0x5B52,      0, 0x5B4F,      0, 0xC344, 0x5B57,
-      0, 0x5B4D,      0,      0, 0x5B4B,      0, 0x5B53, 0x5B49,
- 0xC345, 0x436C, 0xC346, 0x4C78, 0x3C46, 0x3A74, 0xC347, 0xC348,
-      0, 0xC338,      0, 0x3A3A,      0,      0, 0x4B6F, 0x3341,
-};
-const unsigned short utf8_to_euc_E6A0[] = {
-      0, 0xF446, 0x444E, 0x464A, 0x3149,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x4072, 0xC34A,      0, 0x4034, 0x372A,
-      0, 0xC34B,      0,      0,      0, 0xC34C, 0x5B59, 0xC34D,
-      0, 0x393B, 0x337C,      0,      0,      0,      0, 0xC34F,
- 0xC34E, 0x5B5B, 0x3374, 0x5B61, 0xC350, 0xC351,      0, 0xC352,
- 0xC353, 0xC354, 0x5B5E, 0xC355, 0x4073,      0,      0,      0,
- 0x334B, 0x3A2C,      0, 0xC356, 0x334A, 0x3A4F,      0, 0xC357,
-};
-const unsigned short utf8_to_euc_E6A1[] = {
- 0x5B5C, 0x3765, 0x374B, 0x456D, 0xC358, 0xC359, 0x5B5A,      0,
- 0x3046,      0, 0xC35A,      0, 0xC35B, 0x5B5D, 0x5B5F,      0,
- 0x364D, 0x372C, 0xC349, 0x343C, 0x354B, 0xC35C,      0, 0xC35D,
- 0xC35E, 0x5B62,      0, 0xC35F, 0x3A79, 0x4B71,      0, 0x3B37,
-      0,      0,      0, 0x5B63,      0,      0,      0, 0x4930,
-      0,      0,      0, 0xC360,      0,      0, 0xC361, 0xC362,
- 0xC363, 0xC364, 0xC365,      0, 0x5B6F, 0xC366, 0x3233, 0x5B64,
-      0, 0xC367, 0xC368, 0xC369, 0xC36A,      0, 0x5B75, 0x5B65,
-};
-const unsigned short utf8_to_euc_E6A2[] = {
-      0, 0x4E42, 0xC36B, 0x5B6C, 0xC36C, 0x475F, 0xC36D,      0,
- 0xC36E,      0,      0,      0,      0, 0x5B74,      0, 0x5B67,
-      0,      0,      0, 0x3034, 0x5B69,      0, 0xC36F, 0x393C,
- 0xC370,      0, 0xC371, 0x5B6B, 0xC372, 0x5B6A,      0, 0x5B66,
- 0x5B71, 0xC373, 0x3E3F, 0xC374,      0, 0xC375, 0x546D, 0x3868,
- 0x4D7C, 0xC376, 0xC377,      0,      0, 0x5B68, 0xC378, 0x4474,
- 0x3323, 0x3A2D, 0xC379, 0x5B60,      0, 0x5B70, 0x3361,      0,
-      0, 0x5B6E, 0x5B72, 0xC37A, 0x456E,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E6A3[] = {
-      0,      0,      0,      0, 0x347E, 0xC37B, 0x5C32,      0,
- 0xC37C, 0x4C49, 0x5B77, 0x347D, 0xC37D, 0x5B7E,      0, 0xC37E,
- 0xC421, 0xC422, 0x4B40, 0xC423, 0x5C21, 0x5C23, 0xC424, 0x5C27,
- 0x5B79, 0xC425, 0x432A,      0, 0xC426, 0xC427,      0, 0x456F,
- 0x5C2B, 0x5B7C,      0, 0x5C28,      0, 0xC428,      0, 0x5C22,
- 0xC429,      0, 0xC42A, 0xC42B, 0xC42C, 0xC42D, 0x3F39, 0x5C2C,
- 0xC42E, 0xC42F, 0x4033,      0,      0, 0xC430, 0xC431,      0,
-      0, 0x5C2A, 0x343D, 0xC432, 0xC433, 0xC434,      0,      0,
-};
-const unsigned short utf8_to_euc_E6A4[] = {
- 0x4F50, 0x5B76,      0,      0, 0x5C26, 0x3058, 0xC435,      0,
- 0x5B78, 0xC436, 0xC437, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73,
- 0xC438, 0xC439, 0x5C25, 0xC43A,      0,      0, 0xC43B, 0xC43C,
-      0, 0x3F7A, 0x5C2F, 0x3371, 0x3821,      0,      0,      0,
-      0, 0x5C31, 0x5B7A, 0x5C30,      0, 0x5C29, 0x5B7B,      0,
- 0x5C2D,      0, 0x5C2E,      0,      0,      0,      0,      0,
- 0x5C3F, 0xC43D,      0, 0xC43E, 0x464E, 0xC43F, 0x5C24,      0,
- 0xC440, 0x5C3B,      0, 0xC441,      0, 0x5C3D,      0, 0x4458,
-};
-const unsigned short utf8_to_euc_E6A5[] = {
-      0,      0, 0xC442,      0,      0, 0xC443,      0,      0,
-      0, 0xC444, 0x4D4C,      0,      0,      0, 0xC445,      0,
-      0,      0,      0, 0x4976, 0x5C38, 0x424A,      0, 0xC446,
-      0, 0x5C3E, 0x413F, 0xC447, 0x5C35, 0x5C42, 0x5C41,      0,
- 0x466F, 0x5C40, 0x466A, 0xC448, 0xC449, 0xC44A, 0xC44B,      0,
- 0xC44C, 0xC44D, 0x5C44, 0x5C37, 0xC44E, 0x3648, 0x5C3A, 0x3D5D,
- 0xC44F, 0xC450, 0xC451, 0x4760, 0x5C3C, 0x364B,      0, 0x5C34,
- 0x5C36, 0x5C33, 0xC452, 0xC453, 0x4F30, 0x335A, 0x5C39, 0xC454,
-};
-const unsigned short utf8_to_euc_E6A6[] = {
- 0xC455, 0x5C43, 0x3335,      0,      0,      0,      0,      0,
-      0,      0, 0x3A67,      0,      0, 0xC456, 0x315D,      0,
-      0, 0x5C54, 0xC457,      0, 0x4F31, 0x5C57, 0xC458,      0,
- 0xC459,      0,      0, 0x3F3A, 0x5C56,      0,      0,      0,
- 0x5C55, 0xC45A,      0,      0,      0, 0xC45B, 0xC45C, 0x5C52,
- 0xC45D,      0,      0, 0xC45E,      0, 0xC45F, 0x5C46, 0xC460,
-      0, 0x5C63, 0x5C45,      0, 0x5C58,      0,      0, 0xC461,
- 0xC462,      0, 0xC463, 0x5C50, 0xC464,      0, 0x5C4B, 0x5C48,
-};
-const unsigned short utf8_to_euc_E6A7[] = {
-      0, 0x5C49,      0, 0x5C51,      0, 0xC465,      0, 0x7422,
- 0xC466,      0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C,      0,
- 0x5C47, 0xC467,      0, 0x5C4A,      0,      0, 0xC468, 0xC469,
- 0x4D4D, 0x4B6A,      0,      0,      0, 0x5C4F, 0x5C59,      0,
-      0,      0, 0xC46A,      0,      0, 0xC46B,      0, 0x5C61,
- 0x5C5A,      0,      0, 0x5C67,      0, 0x5C65, 0xC46C, 0xC46D,
-      0, 0xC46E, 0x5C60, 0xC46F,      0, 0xC470,      0,      0,
-      0, 0x5C5F,      0, 0x4450,      0, 0x4165, 0xC471, 0x5C5D,
-};
-const unsigned short utf8_to_euc_E6A8[] = {
- 0xC472, 0xC473, 0x5C5B, 0xC474,      0, 0x5C62,      0,      0,
-      0,      0, 0x5C68, 0x4875, 0x5C6E,      0,      0, 0xC475,
-      0, 0xC476, 0x5C69, 0x5C6C, 0x5C66, 0xC477,      0, 0x4374,
-      0, 0x4938, 0xC478, 0x5C5C,      0, 0xC479, 0x5C64, 0x3E40,
- 0xC47A, 0x4C4F, 0x5C78, 0x5C6B, 0xC47B,      0,      0,      0,
- 0xC47C, 0x3822, 0x3223, 0x335F,      0,      0, 0x5C53,      0,
- 0xC47D,      0, 0xC47E,      0, 0xC521, 0x3E41, 0x5C70, 0xC522,
- 0x5C77, 0x3C79, 0x3372, 0xC523,      0, 0x432E, 0xC524, 0xC525,
-};
-const unsigned short utf8_to_euc_E6A9[] = {
-      0,      0,      0,      0, 0x5C6D, 0xC526, 0xC527, 0x5C72,
- 0x5C76, 0xC528, 0xC529, 0x3636,      0,      0, 0xC52A,      0,
- 0xC52B, 0xC52C, 0xC52D,      0,      0, 0xC52E, 0xC52F,      0,
- 0x354C, 0x5C74,      0, 0xC530,      0,      0,      0, 0x3521,
-      0, 0x464B, 0x5C73,      0, 0xC531,      0, 0x5C75, 0xC532,
-      0,      0, 0xC533, 0xF449,      0,      0,      0,      0,
-      0, 0xC534, 0x5C6F, 0xC535,      0,      0,      0,      0,
- 0x5C71,      0,      0,      0,      0,      0, 0xC536, 0x3360,
-};
-const unsigned short utf8_to_euc_E6AA[] = {
- 0x4349, 0xC537,      0, 0xC538, 0x5C7C,      0, 0xC539, 0xC53A,
-      0, 0xC53B,      0, 0xC53C,      0, 0x5C7A, 0x3869,      0,
- 0x5C79, 0xC53D,      0,      0,      0,      0,      0, 0x5D21,
-      0,      0,      0, 0xC53E, 0x5B58, 0xC53F, 0xC540, 0xC541,
- 0x5C7B,      0, 0x5C7D, 0x5C7E,      0, 0xC542,      0,      0,
-      0,      0, 0x5D2C, 0xC543, 0x5D28,      0, 0x5B6D, 0xC544,
- 0xC545, 0xC546,      0, 0x5D27, 0xC547,      0,      0,      0,
- 0x5D26,      0,      0, 0x5D23,      0, 0xC548, 0xC549, 0xC54A,
-};
-const unsigned short utf8_to_euc_E6AB[] = {
-      0, 0x5C6A, 0x5D25, 0x5D24,      0,      0, 0xC54B,      0,
- 0xC54D, 0xC54C,      0,      0, 0xC54E,      0,      0,      0,
- 0xC54F, 0x5D2A,      0, 0x4F26, 0xC550, 0xC551, 0xC552,      0,
-      0,      0, 0x5D2D, 0x367B, 0xC553, 0xC554, 0x5D29, 0x5D2B,
-      0,      0, 0xF44A,      0, 0xC555,      0,      0, 0xC556,
- 0x4827,      0, 0x5D2E,      0, 0xC557,      0,      0,      0,
- 0xC558, 0xC559, 0xC55A,      0,      0,      0,      0,      0,
-      0,      0, 0x5D32, 0x5D2F, 0xC55B, 0xC55C,      0,      0,
-};
-const unsigned short utf8_to_euc_E6AC[] = {
-      0,      0, 0xC55D, 0xC55E, 0x4D73, 0x5D30, 0xC55F, 0xC560,
-      0, 0xC561, 0x5C5E,      0,      0,      0,      0, 0xC562,
- 0xC563, 0xC564, 0x5D33,      0,      0,      0, 0x5D34, 0xC565,
-      0,      0,      0, 0xC566,      0, 0x3135, 0xC567, 0x5D36,
- 0x3767, 0x3C21,      0, 0x3655, 0xC568,      0,      0, 0x3224,
- 0xC569,      0,      0, 0xC56A, 0xC56B,      0,      0, 0xC56C,
-      0,      0, 0x4D5F,      0,      0, 0xC56D, 0xC56E, 0x5D38,
- 0x5D37, 0x5D3A, 0x353D, 0xC56F,      0, 0x3656, 0x343E, 0xC570,
-};
-const unsigned short utf8_to_euc_E6AD[] = {
-      0,      0,      0, 0x5D3D,      0,      0, 0xC571, 0x5D3C,
-      0, 0x5D3E, 0xC572,      0, 0x324E, 0xC573, 0x4337,      0,
- 0x5D3F,      0, 0xC574, 0x343F, 0x5D41,      0, 0xC575,      0,
- 0xC576, 0x5D40,      0, 0x5D42,      0, 0xC577,      0, 0x5D43,
- 0xC578, 0x5D44, 0x3B5F, 0x4035, 0x3A21,      0, 0x4970, 0xC579,
-      0, 0x4A62, 0x4F44, 0xC57A,      0,      0, 0xC57B, 0x3B75,
- 0xC57C,      0,      0, 0x3A50, 0x4E72, 0xC57D,      0,      0,
- 0x5D45, 0x5D46,      0, 0x3B60,      0, 0xC57E, 0xC621, 0x5D47,
-};
-const unsigned short utf8_to_euc_E6AE[] = {
- 0x5D48,      0, 0xC622, 0x5D4A, 0x5D49, 0xC623, 0x4B58,      0,
-      0, 0x3D5E, 0x3C6C, 0x3B44,      0, 0x5D4B,      0,      0,
-      0,      0,      0,      0,      0, 0x5D4D, 0x3F23, 0xC624,
- 0x5D4C,      0,      0, 0xC625,      0,      0, 0x5D4E, 0xC626,
- 0xC627,      0, 0xC628, 0xC629, 0x5D4F,      0,      0,      0,
- 0xC62A, 0xC62B, 0x5D50, 0x5D51, 0xC62C, 0xC62D, 0xC62E, 0x5D52,
- 0xC62F, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A,      0, 0x5D56,
- 0xC630, 0xC631, 0x3B26, 0x334C, 0x5D57, 0xC632, 0xC633, 0x4542,
-};
-const unsigned short utf8_to_euc_E6AF[] = {
- 0x544C,      0,      0, 0xC634, 0xC635, 0x3523, 0x5D58,      0,
-      0, 0xC636,      0, 0x5D59, 0xC637, 0x4A6C, 0x4B68,      0,
-      0,      0, 0x4647, 0x5D5A, 0x4866,      0, 0xC638,      0,
- 0x487B,      0, 0xC639, 0x4C53,      0,      0,      0, 0x5D5B,
-      0, 0xC63A,      0, 0xC63B,      0,      0, 0xC63C, 0xC63D,
-      0,      0,      0, 0x5D5D, 0x5D5C,      0, 0xC63E, 0x5D5F,
-      0, 0xC63F,      0, 0x5D5E,      0,      0,      0, 0xC640,
-      0, 0xC641,      0,      0,      0,      0,      0, 0xC642,
-};
-const unsigned short utf8_to_euc_E6B0[] = {
-      0,      0, 0xC643,      0, 0xC644, 0xC645,      0,      0,
- 0x5D61, 0xC646,      0,      0,      0, 0xC647, 0xC648, 0x3B61,
- 0xC649, 0x4C31, 0xC64A, 0x5D62, 0x5D63,      0,      0, 0x3524,
-      0, 0xC64B,      0, 0x5D64,      0,      0,      0, 0xC64C,
-      0,      0,      0, 0x5D66, 0x5D65,      0, 0xC64D, 0xC64E,
- 0xC64F,      0,      0,      0, 0xC650,      0, 0xC651,      0,
-      0,      0,      0, 0xC652, 0x3F65, 0xC653, 0xC654, 0x4939,
- 0x314A,      0, 0xC655, 0xC656,      0,      0, 0x4845, 0xC657,
-};
-const unsigned short utf8_to_euc_E6B1[] = {
- 0x4475, 0x3D41, 0x3561,      0,      0,      0,      0,      0,
-      0,      0, 0xC658, 0xC659,      0, 0xC65A, 0x4846, 0xC65B,
- 0x3C2E,      0, 0xC65C,      0, 0xC65D, 0x5D68,      0, 0x3440,
-      0, 0xC65E, 0x3178, 0xC65F, 0xC660, 0x4672, 0x5D67, 0x393E,
- 0x4353,      0, 0x5D69,      0,      0,      0,      0, 0xC736,
- 0x5D71,      0, 0x5D6A, 0xC661,      0, 0xC662,      0, 0xC663,
- 0x4241,      0, 0x3562, 0x5D72, 0xC664,      0, 0xC665,      0,
- 0xC666, 0xC667, 0x3768, 0xC668,      0, 0x3525, 0x5D70,      0,
-};
-const unsigned short utf8_to_euc_E6B2[] = {
-      0, 0x5D6E, 0x5D6B, 0x4D60,      0, 0xC669, 0xC66A, 0xC66B,
- 0x4440, 0xC66C,      0,      0, 0x4659, 0x5D6C,      0,      0,
- 0x5D74,      0, 0x5D73, 0x3723, 0xC66D, 0xC66E, 0x322D, 0xC66F,
- 0xC670, 0x3A3B, 0x5D6D, 0x5D6F, 0xC671,      0,      0, 0xC672,
-      0, 0x4B57, 0x4274,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x4B77,      0,      0, 0x5D7C,      0,
- 0xC673, 0x5D7D, 0xC674, 0x324F, 0xC675,      0,      0,      0,
- 0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168,
-};
-const unsigned short utf8_to_euc_E6B3[] = {
-      0, 0x3637, 0xC676,      0, 0x5D75, 0x5D7A, 0xC677,      0,
-      0, 0x4074, 0x4771,      0, 0x4867, 0xC678,      0, 0xC679,
- 0xC67A, 0xC67B, 0xC67C, 0x5D77, 0xC67D, 0x4B21, 0xC67E, 0x5D79,
-      0, 0x5E24, 0xC721, 0x5E22, 0xC722, 0x5D7B,      0,      0,
- 0xC723, 0x4B22, 0x4748, 0x3563,      0, 0x4525,      0, 0xC724,
- 0x436D, 0xC725, 0x5E25, 0xC726, 0xC727,      0, 0xC728, 0x5E23,
- 0x4259, 0x5D76, 0xC729, 0x314B, 0xC72A,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E6B4[] = {
-      0,      0,      0,      0, 0xC72B,      0,      0, 0xC72C,
-      0,      0, 0xC72D, 0x4D4E, 0x5E30,      0, 0xC72E, 0xC72F,
-      0, 0xC730, 0x5E2F, 0xC731,      0,      0,      0, 0x4076,
-      0, 0x5E2C, 0xC732, 0x4D6C,      0,      0, 0x4636, 0x5E26,
-      0,      0,      0,      0,      0, 0x4445, 0xC733, 0xC734,
- 0xC735, 0x314C, 0x393F, 0x5E29,      0,      0, 0xC737, 0xC738,
-      0, 0xC739, 0x3D27, 0x5E2E,      0, 0x5E2D, 0x5E28,      0,
- 0x5E2B, 0xC73A,      0, 0x3368, 0xC73B, 0x5E2A, 0x4749, 0xC73C,
-};
-const unsigned short utf8_to_euc_E6B5[] = {
-      0, 0x4E2E,      0,      0, 0x3E74, 0x4075,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xC73D,
-      0, 0x5E36, 0x5E34,      0, 0x494D,      0, 0xC73E, 0xC73F,
-      0, 0xC740,      0, 0x5E31, 0x5E33, 0xC741, 0x313A, 0xC742,
-      0, 0x3940, 0x4F32,      0, 0x333D,      0, 0x4962, 0xC743,
- 0xC744,      0,      0,      0, 0x4D61,      0,      0, 0x3324,
- 0x3F3B, 0x5E35,      0,      0, 0xC745,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E6B6[] = {
-      0,      0, 0xC746,      0,      0, 0x5E3A,      0, 0xC747,
- 0x3E43,      0,      0,      0, 0x4D30,      0, 0x5E37,      0,
-      0, 0xC748, 0xC749, 0x5E32, 0xC74A, 0x5E38, 0xC74B, 0xC74C,
- 0xC74D, 0x4E5E,      0, 0x4573, 0x4642,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xC74E,      0, 0xC74F,      0,      0, 0x3336,
-      0,      0, 0x3155,      0, 0xC750, 0x5E3E,      0, 0xC751,
- 0x5E41, 0xC752,      0,      0, 0x4E43, 0xC753,      0, 0xC754,
-};
-const unsigned short utf8_to_euc_E6B7[] = {
- 0x4D64,      0,      0,      0, 0xC755, 0x5E48, 0x5E42, 0x5E3F,
- 0xC756,      0, 0xC757, 0x4E54, 0x5E45,      0, 0xC758, 0xC759,
-      0, 0x3D4A, 0x5E47,      0,      0, 0x5E4C, 0xC75A,      0,
- 0x4571, 0x5E4A,      0, 0xC75B,      0, 0xC75C, 0x5E44, 0xC75D,
- 0xC75E, 0x4338, 0xC75F,      0, 0x5E4B, 0xC760, 0x5E40,      0,
- 0x5E46, 0xC761, 0x5E4D, 0x307C, 0x5E43,      0, 0x5E4E, 0xC762,
- 0xC763, 0x3F3C, 0xF44C, 0x3D5F, 0xC764, 0x4A25, 0xC765, 0x3A2E,
- 0xF44B, 0x5E3B, 0x5E49, 0x453A, 0xC766,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E6B8[] = {
- 0xC767,      0,      0,      0, 0xC768, 0x4036,      0, 0x3369,
- 0x3A51, 0x3E44, 0x5E3D, 0x3D42,      0,      0,      0,      0,
-      0,      0,      0, 0x374C,      0, 0x5E3C,      0,      0,
-      0, 0x5E52, 0x3D6D, 0x383A,      0, 0x5E61, 0xC769, 0x5E5B,
- 0x3574, 0x454F, 0xC76A, 0x5E56, 0x5E5F, 0x302F, 0x3132, 0xC76B,
-      0, 0x3239,      0, 0x5E58, 0x422C, 0x5E4F, 0x5E51, 0x3941,
-      0,      0, 0xC76C,      0,      0,      0, 0xC76D,      0,
- 0x5E62, 0xC76E, 0x5E5D, 0xC76F, 0xC770,      0, 0x5E55,      0,
-};
-const unsigned short utf8_to_euc_E6B9[] = {
-      0,      0,      0, 0x5E5C, 0xC771, 0xC772,      0,      0,
- 0xC773, 0xC774, 0x4C2B, 0xC775,      0, 0x5E5A, 0x5E5E, 0xC776,
-      0, 0xC777, 0xC778, 0xC779, 0xC77A,      0, 0x3850, 0xC77B,
- 0x3E45,      0,      0, 0x4339, 0xC77C, 0xC77D, 0xC77E, 0x5E54,
-      0,      0, 0xC821, 0xC822,      0,      0,      0, 0x4D2F,
- 0xC823,      0,      0, 0x5E57,      0,      0, 0x5E50, 0x4572,
-      0,      0, 0x5E53, 0xC824,      0,      0, 0x5E59,      0,
-      0,      0,      0, 0xC825,      0, 0xC826, 0x4F51, 0x3C3E,
-};
-const unsigned short utf8_to_euc_E6BA[] = {
- 0x4B7E,      0, 0x5E63,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x482E, 0xC827,      0, 0x5E6F,
- 0x383B,      0,      0, 0xC828,      0,      0, 0x3D60,      0,
- 0x5E65, 0xC829,      0,      0, 0x4E2F, 0x3942,      0, 0x5E72,
- 0xC82A,      0, 0x306E,      0,      0, 0x5E70,      0, 0xC82B,
-      0,      0, 0x5E64,      0,      0, 0xC82C, 0xC82D, 0x5E6A,
-      0, 0xC82E, 0x5E6C, 0xC82F,      0,      0, 0x4D4F, 0x5E67,
-      0,      0, 0x452E, 0xC830,      0, 0x5E69,      0, 0xC831,
-};
-const unsigned short utf8_to_euc_E6BB[] = {
- 0xC832, 0xC833, 0x5E71, 0xC834, 0x5E6B, 0x4C47,      0, 0xC835,
- 0xC836, 0x5E66, 0xC837, 0x3C22, 0x5E7E, 0xC838, 0xC839, 0xC83A,
-      0, 0x336A,      0, 0x5E68, 0x5E6D, 0x5E6E,      0,      0,
-      0,      0,      0,      0,      0, 0x426C, 0x425A,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xC83B, 0x5E76, 0xC83C, 0xC83D, 0x5E7C,
-      0,      0, 0x5E7A,      0, 0x4529,      0,      0, 0x5F23,
- 0x5E77, 0xC83E,      0, 0xC83F,      0, 0xC840, 0x5E78, 0x5E60,
-};
-const unsigned short utf8_to_euc_E6BC[] = {
-      0, 0x3579, 0x493A,      0, 0xC841,      0, 0x3C3F,      0,
- 0xC842, 0x3977, 0xC843,      0, 0xC844, 0xC845,      0, 0x4F33,
-      0, 0x5E74,      0, 0x5F22, 0x3169, 0x4166, 0xC846,      0,
- 0xC847,      0, 0xC848, 0xC849,      0,      0,      0,      0,
- 0x4779,      0, 0x3441, 0x4E7A,      0,      0, 0xC84A,      0,
-      0, 0xC84B, 0xC84C, 0x4C21, 0x4452, 0xC853,      0, 0xC84D,
- 0xC84E, 0x5E7B, 0x5E7D, 0xC84F,      0,      0, 0xC850,      0,
- 0x4132,      0,      0, 0xC851, 0xC852,      0, 0x5F21, 0x5E79,
-};
-const unsigned short utf8_to_euc_E6BD[] = {
-      0, 0x5E73,      0,      0,      0, 0x3443,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xC854,
-      0, 0xC855, 0xC856, 0xC857, 0x3769,      0,      0, 0xC858,
- 0x5F2F, 0xC859, 0xC85A, 0x5F2A, 0x4078, 0xC85B, 0xC85C, 0x3363,
-      0, 0xC85D, 0xC85E,      0, 0x3D61,      0, 0x5F33,      0,
- 0xC85F,      0,      0,      0, 0xC860, 0x5F2C, 0x442C, 0x5F29,
- 0x4459,      0,      0,      0, 0x5F4C,      0,      0,      0,
- 0x5F26,      0, 0x5F25,      0, 0x5F2E, 0xC861, 0xC862,      0,
-};
-const unsigned short utf8_to_euc_E6BE[] = {
- 0x5F28, 0x5F27, 0x5F2D, 0xC863, 0x4021,      0, 0x5F24, 0xC864,
- 0xC865,      0,      0, 0xC866, 0xC867, 0xC868, 0x5F30,      0,
- 0xC869, 0x5F31, 0xC86A, 0xC86B, 0xC86C,      0, 0xC86D, 0x3442,
-      0,      0, 0xC86E,      0,      0,      0,      0, 0xC86F,
- 0xC870, 0x5F36,      0, 0x5F35, 0x5F37, 0xC871, 0xC872, 0xC873,
- 0xC874,      0, 0x5F3A,      0,      0,      0, 0xC875, 0xC876,
- 0xC877, 0x4543,      0, 0x5F34,      0, 0xC878, 0xC879,      0,
-      0, 0x5F38,      0,      0, 0xC87A,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E6BF[] = {
- 0x3763, 0x4279, 0x5F32, 0x473B,      0, 0xC87B, 0x5F39, 0xC87C,
- 0xC87D,      0, 0xC87E,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x5F3E, 0x5F3C,      0,      0,
- 0x5F3F,      0, 0xC921, 0x5F42,      0,      0, 0xC922, 0x5F3B,
- 0x396A, 0x4728,      0,      0, 0x5E39,      0,      0,      0,
- 0xC923, 0xC924,      0, 0x4D74, 0x5F3D,      0, 0x5F41, 0x4275,
- 0xC925, 0x5F40,      0, 0x5F2B,      0, 0xC926, 0x6F69,      0,
-      0, 0xC927, 0x5F45,      0, 0xC928, 0xC929, 0x5F49,      0,
-};
-const unsigned short utf8_to_euc_E780[] = {
- 0xC92A, 0x5F47,      0,      0,      0, 0xC92B, 0xC92C, 0xC92D,
-      0, 0x5F43,      0, 0x5F44,      0, 0xC92E,      0, 0x5F48,
-      0, 0x5F46,      0,      0,      0, 0x494E,      0, 0xC92F,
- 0x5F4E,      0, 0x5F4B, 0x5F4A,      0, 0x5F4D, 0x4654, 0x5F4F,
- 0xC930,      0,      0, 0xC931,      0,      0, 0x4375, 0x426D,
- 0xF44D,      0,      0,      0, 0x4025,      0,      0, 0xC932,
- 0x5F50,      0, 0x5F52,      0, 0xC933,      0,      0, 0xC934,
-      0, 0xC935,      0,      0, 0xC936,      0, 0x5F51,      0,
-};
-const unsigned short utf8_to_euc_E781[] = {
-      0,      0,      0, 0xC937, 0xC938,      0,      0,      0,
- 0xC939, 0xC93A, 0xC93B, 0xC93C, 0x5E75,      0, 0xC941,      0,
-      0, 0x5F53,      0,      0, 0xC93D, 0xC93E,      0,      0,
- 0x4667,      0,      0,      0,      0, 0xC93F, 0xC940,      0,
-      0,      0,      0, 0x5F54, 0xC942, 0xC943,      0,      0,
-      0,      0,      0, 0x3250, 0xC944,      0, 0xC945, 0x4574,
- 0x3325,      0,      0,      0,      0, 0xC946, 0xC947,      0,
- 0x3564,      0,      0,      0, 0x3C5E, 0x3A52, 0xC948,      0,
-};
-const unsigned short utf8_to_euc_E782[] = {
-      0, 0xC949,      0,      0,      0, 0xC94A, 0xC94B,      0,
-      0, 0x4F27, 0x3F66,      0,      0,      0, 0x316A,      0,
-      0,      0, 0x5F56,      0, 0xC94C, 0xC94D, 0xC94E, 0xC94F,
- 0xC950, 0x5F55,      0, 0xC951,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xC952,      0,      0,      0,
-      0,      0,      0, 0xC953, 0x5F59, 0x433A, 0x5F5C, 0x5F57,
- 0xC954, 0xC955,      0, 0x5F5B, 0xC956,      0,      0, 0xC957,
- 0x5F5A, 0x4540, 0x3059, 0xF42E,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E783[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x4E75,      0, 0xC958, 0x5F5E,      0,      0,      0, 0x3128,
-      0, 0xC959,      0, 0xC95A, 0xC95B, 0xC95C, 0xC95D,      0,
- 0xC95E, 0x5F60,      0,      0, 0xC95F, 0x5F5F,      0, 0x5F5D,
-      0,      0,      0,      0, 0xC960,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x5F58,      0,      0,      0,      0,      0,      0,
-      0, 0x4B23, 0xC961,      0,      0, 0x5F62,      0,      0,
-};
-const unsigned short utf8_to_euc_E784[] = {
-      0,      0,      0, 0xC962, 0xC963, 0xC964, 0xC965, 0xC966,
-      0, 0x5F61,      0, 0xC967, 0xC968,      0,      0, 0xC969,
-      0,      0,      0,      0, 0x316B,      0,      0,      0,
-      0, 0x5F64, 0x4A32,      0, 0x5F63,      0, 0xC96A,      0,
- 0xC96B, 0x4C35,      0,      0,      0,      0, 0x3E47,      0,
-      0,      0,      0, 0xC96C,      0, 0xC96D,      0, 0xC96E,
- 0xC96F, 0xC970,      0,      0,      0,      0, 0x4133,      0,
- 0xC971,      0,      0,      0, 0x3E46,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E785[] = {
-      0, 0xC972,      0,      0,      0, 0xC973, 0xC974, 0xC975,
-      0, 0x4E7B, 0xC976, 0xC977, 0x5F6A,      0, 0x4079,      0,
- 0xC978,      0, 0xC979,      0,      0, 0x5F66, 0x5F6B, 0xC97A,
-      0, 0x316C, 0xC97B,      0, 0xC97C,      0, 0xC97D,      0,
- 0xC97E,      0, 0x5F69,      0, 0x4761, 0x5F65, 0x5F68, 0x3E48,
- 0xCA21, 0x4851,      0,      0, 0x5F6C,      0, 0x3C51,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xCA22,      0,      0,      0, 0x407A,      0,      0,
-};
-const unsigned short utf8_to_euc_E786[] = {
- 0xCA23,      0,      0,      0, 0x5F6F, 0xCA24,      0, 0xCA25,
- 0x5F67,      0, 0x3727,      0, 0xCA26,      0,      0, 0x5F6D,
-      0,      0, 0xCA27,      0, 0x4D50, 0x5F70,      0,      0,
-      0, 0x7426, 0xCA28, 0xCA29,      0,      0,      0, 0x3D4F,
- 0xCA2A,      0, 0xCA2B,      0,      0,      0,      0,      0,
- 0x5F71,      0,      0,      0, 0x5F72,      0,      0, 0xCA2C,
- 0xCA2D, 0x472E, 0xCA2E, 0xCA2F,      0,      0,      0,      0,
-      0, 0x5F74, 0xCA30,      0,      0,      0, 0x5F75, 0xCA31,
-};
-const unsigned short utf8_to_euc_E787[] = {
- 0xCA32, 0xCA33,      0, 0x4733, 0xCA34,      0,      0,      0,
- 0x4575, 0x5F77,      0, 0xCA35, 0xCA36,      0, 0x5F79,      0,
- 0x4E55,      0, 0x5F76, 0xCA37, 0x5F78, 0x316D, 0xCA38, 0x5F73,
-      0, 0xCA39, 0xCA3A,      0, 0xCA3B,      0,      0, 0x535B,
- 0x5F7A,      0,      0,      0,      0, 0x4167, 0x3B38, 0x5F7C,
-      0,      0,      0,      0, 0x5F7B, 0x3F24, 0x5259,      0,
-      0,      0,      0,      0,      0, 0x5F7D,      0,      0,
- 0xCA3C, 0x6021,      0, 0x5F6E, 0x5F7E,      0, 0xCA3D, 0x6022,
-};
-const unsigned short utf8_to_euc_E788[] = {
- 0xCA3E,      0,      0,      0,      0,      0, 0x477A, 0xCA3F,
- 0xCA40, 0xCA41,      0,      0,      0, 0x6023,      0,      0,
- 0x6024,      0,      0, 0xCA42,      0,      0,      0, 0xCA43,
-      0,      0, 0xCA44, 0x6025,      0, 0xCA45,      0, 0xCA46,
-      0,      0,      0,      0, 0xCA47,      0,      0,      0,
- 0x6026,      0, 0x445E, 0xCA48, 0x6028, 0x6027,      0, 0xCA49,
- 0x6029,      0, 0x602A,      0, 0xCA4A, 0x3C5F, 0x4963,      0,
- 0xCA4B, 0xCA4C, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D,
-};
-const unsigned short utf8_to_euc_E789[] = {
- 0x602E, 0xCA4D, 0xCA4E, 0xCA4F,      0, 0xCA50, 0x602F, 0x4A52,
- 0x4847,      0,      0, 0x6030, 0x4757,      0, 0xCA51, 0xCA52,
- 0xCA53,      0, 0x442D, 0xCA54,      0, 0xCA55, 0xCA56,      0,
- 0x6031, 0x3267, 0xCA57, 0x356D, 0xCA58, 0x4C46, 0xCA59, 0x4C36,
- 0xCA5A, 0x3234, 0x4F34, 0xCA5B,      0,      0,      0, 0x4B52,
- 0xCA5C, 0x4A2A,      0, 0xCA5D,      0,      0, 0xCA5E, 0xCA5F,
-      0, 0xCA60, 0x4037,      0, 0x6032,      0,      0, 0xCA61,
- 0xCA62, 0x4643,      0, 0xCA63, 0xCA64, 0x3823, 0x6033, 0xCA65,
-};
-const unsigned short utf8_to_euc_E78A[] = {
- 0x3A54, 0x6035, 0x6034,      0, 0xCA66,      0,      0, 0x6036,
-      0, 0xCA67,      0,      0,      0, 0xCA68, 0xCA69,      0,
-      0,      0, 0x6037, 0xCA6A,      0,      0, 0x6038,      0,
-      0,      0,      0, 0xCA6B,      0,      0,      0,      0,
- 0x353E,      0, 0x6039,      0,      0,      0,      0, 0x603A,
- 0xCA6C,      0,      0,      0, 0x3824, 0xCA6D, 0xCA6E, 0x4848,
-      0, 0xCA6F, 0x603C,      0, 0xCA70,      0, 0x3E75,      0,
-      0, 0x603B,      0,      0,      0,      0, 0xCA71,      0,
-};
-const unsigned short utf8_to_euc_E78B[] = {
-      0, 0xCA72, 0x3638, 0x603D, 0x603F,      0, 0x603E, 0xCA73,
-      0, 0xCA74,      0,      0, 0xCA75,      0, 0x6040,      0,
- 0x3851,      0, 0x6041,      0,      0, 0xCA76, 0xCA77, 0x3669,
- 0xCA78, 0x4140,      0, 0x397D,      0,      0,      0, 0xCA79,
- 0x6043, 0x6044, 0x6042,      0,      0, 0xCA7A,      0,      0,
-      0, 0x3C6D,      0,      0, 0x4648, 0x3639,      0,      0,
-      0,      0,      0, 0xCA7B, 0xCA7C,      0,      0, 0x6046,
- 0x432C, 0x6045, 0xCA7D, 0xCA7E, 0x4F35, 0x4762, 0xCB21,      0,
-};
-const unsigned short utf8_to_euc_E78C[] = {
-      0,      0, 0xCB22,      0, 0xCB23, 0xCB24,      0, 0xCB25,
-      0,      0, 0x6049, 0xCB26,      0, 0xCB27,      0,      0,
-      0,      0, 0xCB28, 0xCB29,      0,      0, 0x604B, 0x6048,
- 0xCB2A, 0xCB2B,      0, 0x4C54, 0x604A, 0x604C, 0xCB2C, 0x4E44,
-      0,      0, 0xCB2D,      0, 0xCB2E, 0x6050,      0, 0xCB2F,
- 0xCB30, 0x604F, 0x4376, 0x472D, 0xCB31,      0, 0x3825, 0x604E,
-      0, 0xCB32, 0xCB33,      0, 0x604D, 0xCB34, 0x4D31, 0x4D32,
-      0,      0, 0xCB35, 0xCB36,      0, 0xCB37, 0x6051, 0x316E,
-};
-const unsigned short utf8_to_euc_E78D[] = {
-      0,      0,      0, 0xCB38, 0x3976, 0x3B62,      0,      0,
-      0,      0,      0,      0,      0, 0xCB39, 0x6052, 0x6053,
- 0xCB3A,      0, 0xCB3B,      0,      0,      0, 0xCB3C, 0x6055,
- 0xCB3D,      0,      0,      0,      0, 0xCB3E, 0xCB3F, 0xCB40,
- 0xCB41,      0,      0, 0x3D43,      0,      0, 0xCB42, 0xCB43,
- 0x6057, 0xCB44, 0x6056, 0xCB45, 0xCB46,      0, 0xCB47, 0xCB48,
- 0x6058, 0xCB49, 0x334D,      0,      0, 0x605A,      0, 0xCB4A,
- 0x6059, 0xCB4B, 0x605C, 0x605B, 0xCB4C,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E78E[] = {
- 0xCB4D, 0xCB4E,      0, 0xCB4F, 0x383C, 0xCB50, 0xCB51, 0x4E28,
-      0, 0x364C,      0, 0x3226,      0,      0, 0xCB52,      0,
- 0xCB53,      0,      0, 0xCB54,      0, 0xCB55, 0x366A, 0xCB56,
- 0xCB57,      0,      0,      0, 0xCB58,      0, 0xCB59, 0xCB5A,
- 0xCB5B,      0, 0xCB5C,      0,      0, 0xCB5D, 0xCB5E,      0,
-      0, 0x3461, 0xCB5F, 0xCB60,      0, 0xCB61,      0,      0,
-      0,      0, 0x4E68, 0x605E,      0, 0xCB62,      0, 0xCB63,
-      0, 0xCB64,      0, 0x6060, 0xCB65, 0xCB66,      0, 0xCB67,
-};
-const unsigned short utf8_to_euc_E78F[] = {
- 0x6061,      0, 0x3251,      0,      0, 0xCB68, 0xCB69,      0,
- 0x605D, 0xCB6A, 0x3B39, 0xCB6B, 0xCB6C, 0x4441, 0x605F, 0xCB6D,
-      0,      0, 0xCB6E, 0xCB6F,      0,      0, 0xCB70,      0,
-      0, 0xCB71,      0,      0,      0, 0xCB72, 0x6064,      0,
- 0x3C6E, 0xCB73,      0, 0xCB74,      0, 0x6062, 0xCB75, 0xCB76,
-      0, 0xCB77, 0x373E,      0,      0, 0x4849, 0x6063,      0,
-      0, 0x607E,      0,      0, 0xCB78, 0xCB79,      0, 0xCB7A,
- 0x6069, 0xCB7B, 0xCB7C, 0xCB7D,      0, 0xCB7E, 0x383D, 0xCC21,
-};
-const unsigned short utf8_to_euc_E790[] = {
- 0xCC22, 0xCC23,      0, 0x3565, 0xCC24, 0x6066, 0x4D7D, 0xCC25,
-      0, 0x4E30, 0xCC26,      0,      0,      0,      0,      0,
-      0, 0xCC27,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xCC28, 0xCC29,      0,      0,      0,      0,
-      0,      0, 0x4276,      0, 0xCC2A, 0x6068, 0xCC2B,      0,
- 0xCC2C, 0xCC2D, 0xCC2E, 0xCC2F, 0xCC30, 0xCC31, 0xCC32, 0xCC33,
- 0xCC34, 0xCC35, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A,      0,
-      0, 0xCC36, 0x606B,      0,      0,      0,      0, 0x606D,
-};
-const unsigned short utf8_to_euc_E791[] = {
- 0xCC37, 0x6070,      0, 0xCC38, 0xCC39,      0, 0xCC3A, 0xCC3B,
-      0,      0,      0, 0xCC3C,      0, 0xCC3D,      0,      0,
-      0, 0xCC3E, 0xCC3F,      0,      0, 0x606C,      0, 0xCC40,
-      0, 0x606F, 0x386A, 0x314D, 0x6071, 0xCC41, 0x3F70, 0x606E,
- 0x4E5C,      0, 0xCC42, 0x6074, 0x7424,      0, 0xCC43, 0xCC44,
- 0xCC45, 0x6072, 0x6075, 0xCC46,      0, 0xCC47, 0xCC48, 0x6067,
- 0x6073, 0xCC49, 0xCC4A, 0x3A3C,      0,      0, 0x6076,      0,
-      0,      0,      0,      0,      0,      0, 0x6077,      0,
-};
-const unsigned short utf8_to_euc_E792[] = {
- 0xCC4B, 0xCC4C,      0, 0x4D7E,      0, 0xCC4D, 0xCC4E, 0xCC4F,
-      0, 0xCC50,      0, 0x6078,      0,      0,      0, 0xCC51,
- 0xCC52, 0xCC53, 0xCC54,      0,      0,      0,      0,      0,
- 0xCC55, 0xCC56, 0xCC57,      0, 0xCC58,      0, 0x6079, 0xCC59,
- 0xCC5A, 0xCC5B, 0x6065, 0xCC5C,      0,      0, 0xCC5D, 0x607A,
- 0xCC5E, 0xCC5F, 0xCC60, 0xCC61,      0,      0, 0xCC62, 0xCC63,
- 0x3444, 0xCC64, 0xCC65,      0,      0, 0xCC66,      0,      0,
-      0, 0xCC67,      0, 0xCC68,      0, 0x3C25,      0, 0xCC69,
-};
-const unsigned short utf8_to_euc_E793[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xCC6A, 0xCC6B, 0x607B,      0, 0xCC6C,      0,      0, 0x607C,
- 0xCC6D,      0,      0, 0xCC6E, 0x607D,      0,      0,      0,
- 0xCC6F,      0, 0xCC70, 0xCC71, 0x313B,      0, 0xCC72, 0xCC73,
- 0x6121,      0, 0x493B, 0x6122, 0xCC74,      0, 0x3424, 0x6123,
- 0xCC75, 0x6124, 0xCC76, 0xCC77,      0,      0, 0x6125, 0xCC78,
- 0x6127, 0x6128, 0x6126,      0, 0xCC79,      0, 0x4953, 0x612A,
- 0x6129,      0, 0xCC7A, 0xCC7B, 0xCC7C,      0,      0, 0xCC7D,
-};
-const unsigned short utf8_to_euc_E794[] = {
-      0, 0xF450,      0, 0x612C, 0x612B, 0x612D, 0xCC7E,      0,
-      0,      0,      0,      0, 0x612E, 0x6130, 0x612F,      0,
-      0, 0x3979, 0xCD21, 0x6132,      0, 0x6131, 0xCD22, 0xCD23,
- 0x3445,      0, 0x3F53,      0, 0x453C,      0, 0x6133, 0x4038,
- 0xCD24, 0xCD25,      0, 0x3B3A, 0xCD26, 0x3179, 0x6134, 0xCD27,
- 0x4D51, 0xCD28, 0xCD29, 0x4A63, 0x6135,      0,      0, 0xCD2A,
- 0x4544, 0x4D33, 0x3943, 0x3F3D,      0,      0, 0xCD2B, 0x434B,
- 0x5234, 0xCD2C, 0x442E, 0x3268, 0x6136, 0xCD2D, 0xCD2E, 0xCD2F,
-};
-const unsigned short utf8_to_euc_E795[] = {
- 0xCD30,      0,      0, 0xCD31, 0x6137,      0, 0x613C, 0xCD32,
- 0xCD33, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 0xCD34, 0x305A,
- 0xCD35, 0x482A, 0xCD36,      0, 0x484A,      0,      0, 0xCD37,
-      0, 0x4E31, 0x613D, 0x613B, 0x435C, 0x4026, 0xCD38, 0xCD39,
- 0x482B, 0xCD3A, 0x492D,      0, 0x613F, 0x4E2C, 0x374D, 0x6140,
-      0, 0x613E, 0x4856, 0x6141,      0, 0x6142,      0, 0xCD3B,
- 0x305B, 0xCD3C,      0, 0x3E76, 0x6147,      0, 0x6144, 0x466D,
- 0x6143, 0xCD3D, 0xCD3E, 0xCD3F, 0xCD40, 0xCD41, 0xCD42, 0x3526,
-};
-const unsigned short utf8_to_euc_E796[] = {
-      0, 0xCD43, 0x614A,      0,      0, 0xCD44, 0x6145, 0x6146,
-      0, 0x6149, 0x6148, 0x4925,      0,      0, 0x4142, 0x4141,
- 0xCD45, 0x353F, 0xCD46, 0xCD47, 0x614B, 0xCD48,      0,      0,
-      0, 0xCD49, 0x614C,      0, 0xCD4A, 0x614D,      0,      0,
-      0,      0, 0xCD4B, 0x614F, 0xCD4C, 0x614E,      0,      0,
-      0,      0,      0, 0x3156,      0,      0,      0,      0,
-      0, 0x6157, 0x4868, 0x6151, 0xCD4D, 0x6153,      0,      0,
- 0x6155, 0x3F3E, 0xCD4E,      0, 0x6156, 0x6154, 0x3C40, 0xCD4F,
-};
-const unsigned short utf8_to_euc_E797[] = {
- 0xCD50, 0xCD51, 0x6150, 0x6152, 0xCD52, 0x4942, 0xCD53, 0x3E49,
-      0,      0, 0x6159,      0, 0xCD54, 0x6158, 0xCD55, 0xCD56,
-      0,      0, 0x615A,      0, 0x3C26, 0x3A2F,      0, 0xCD57,
- 0x4577, 0x615B,      0, 0x444B, 0xCD58,      0, 0x615D, 0xCD59,
- 0xCD5A, 0xCD5B, 0x4E21, 0x615C, 0xCD5C,      0,      0, 0xCD5D,
-      0, 0x4169,      0,      0, 0xCD5E,      0, 0xCD5F, 0xCD60,
- 0x6162, 0xCD61, 0x6164, 0x6165, 0x4354,      0,      0,      0,
-      0, 0xCD62, 0x6163,      0, 0x6160,      0, 0x615E, 0x615F,
-};
-const unsigned short utf8_to_euc_E798[] = {
- 0xCD63, 0x6161, 0xCD64, 0xCD65, 0xCD66,      0,      0, 0xCD67,
- 0xCD68, 0x6168, 0xCD69, 0x6166, 0xCD6A, 0x6167,      0, 0xCD6B,
-      0,      0, 0xCD6C, 0xCD6D,      0, 0xCD6E, 0xCD6F,      0,
-      0, 0xCD70,      0, 0xCD71, 0xCD72, 0xCD73, 0xCD74, 0x6169,
- 0x616B, 0x616C, 0x616D, 0xCD75, 0x616E, 0xCD76, 0xCD77, 0x616A,
-      0, 0xCD78,      0,      0,      0, 0xCD79,      0,      0,
- 0x6170,      0, 0xCD7A, 0xCD7B, 0x616F, 0xCD7C,      0,      0,
- 0xCD7D, 0xCD7E, 0xCE21, 0x6171, 0xCE22,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E799[] = {
- 0xCE24, 0xCE25, 0x4E45, 0xCE26, 0xCE27, 0xCE28, 0x6174, 0x6172,
- 0x6173, 0xCE29, 0xCE23, 0xCE2A, 0x3462,      0,      0,      0,
-      0,      0, 0x4C7E,      0,      0, 0xCE2B, 0x4A4A,      0,
- 0x6176, 0xCE2C,      0,      0, 0x6175,      0,      0, 0xCE2D,
-      0, 0x6177, 0x6178,      0, 0xCE2E, 0xCE2F,      0, 0x617C,
- 0x6179, 0x617A, 0x617B,      0, 0x617D, 0xCE30, 0xCE31, 0xCE32,
- 0x617E, 0xCE33, 0x6221,      0, 0xCE34,      0, 0x6222,      0,
- 0x6223,      0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934,      0,
-};
-const unsigned short utf8_to_euc_E79A[] = {
- 0x6225, 0xCE35, 0xF451, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
- 0x6227,      0,      0, 0x6228, 0xCE37, 0xCE38, 0x6229,      0,
- 0x3B29,      0,      0, 0x622B,      0, 0xCE39, 0x622A,      0,
-      0, 0x622C, 0x622D, 0xCE3A, 0xCE3B, 0xCE3C, 0xF452, 0xCE3D,
- 0xCE3E,      0, 0xCE3F, 0xCE40, 0xCE41, 0xCE42, 0xCE43, 0xCE44,
- 0xCE45,      0, 0xCE46,      0,      0, 0xCE47, 0x4869,      0,
- 0x622E,      0,      0,      0, 0x622F,      0,      0, 0x7369,
- 0x6230, 0x6231, 0x6232,      0,      0, 0xCE48,      0, 0x3B2E,
-};
-const unsigned short utf8_to_euc_E79B[] = {
-      0, 0xCE49, 0x6233, 0x4756,      0, 0xCE4A, 0x4B5F,      0,
- 0x314E, 0xCE4B, 0x3157, 0xCE4C, 0xCE4D, 0x6234, 0xCE4E,      0,
-      0,      0, 0x6236,      0, 0xCE4F,      0, 0x6235, 0x4570,
-      0, 0xCE50,      0, 0x4039, 0x5D39,      0, 0x6237, 0x4C41,
- 0xCE51, 0x6238,      0, 0x3446, 0x4857, 0x6239, 0xCE52, 0x623A,
- 0xCE53,      0, 0x623B,      0, 0xCE54,      0, 0x4C5C,      0,
- 0xCE55, 0xCE56, 0x4C55,      0, 0x443E,      0, 0xCE57,      0,
- 0x416A, 0xCE58,      0, 0x623D, 0xCE59,      0, 0x3D62,      0,
-};
-const unsigned short utf8_to_euc_E79C[] = {
- 0xCE5A, 0x3E4A,      0,      0, 0x6240,      0, 0xCE5B, 0x623F,
- 0x623E, 0x487D, 0xCE5C, 0x3447, 0x3829,      0, 0xCE5D,      0,
-      0,      0, 0xCE5E,      0, 0xCE5F, 0xCE60,      0, 0xCE61,
-      0, 0xCE62, 0xCE63, 0x6246, 0xCE64,      0, 0x6243, 0x3F3F,
- 0x4C32,      0, 0xCE65,      0, 0x6242, 0x6244, 0x6245,      0,
- 0xCE66, 0x6241,      0,      0,      0, 0xCE67, 0xCE68, 0xCE69,
-      0,      0,      0,      0, 0xCE6A, 0xCE6B, 0xCE6C, 0x6247,
- 0x6248, 0xCE6D, 0x442F,      0, 0x3463, 0xCE6E, 0xCE6F,      0,
-};
-const unsigned short utf8_to_euc_E79D[] = {
- 0x4365,      0, 0xCE70,      0,      0, 0xCE71, 0xCE72, 0x6249,
-      0,      0, 0xCE73,      0,      0, 0xCE74, 0xCE75, 0xCE76,
-      0,      0, 0xCE77,      0,      0,      0, 0xCE78, 0xCE79,
-      0,      0, 0x624A, 0x624D, 0xCE7A,      0, 0xCE7B, 0xCE7C,
- 0xCE7D, 0x3F67, 0xCE7E, 0x4644, 0xCF21, 0x624E, 0x4B53, 0xCF22,
- 0x624B,      0, 0xCF23, 0x624C, 0xCF24,      0,      0,      0,
- 0xCF25,      0, 0xCF26, 0xCF27, 0xCF28,      0,      0,      0,
-      0, 0x6251, 0xCF29,      0,      0, 0xCF2A, 0x6250, 0x624F,
-};
-const unsigned short utf8_to_euc_E79E[] = {
- 0xCF2B,      0,      0,      0, 0xCF2C,      0,      0,      0,
-      0,      0,      0, 0x6253, 0xCF2D, 0xCF2E, 0x6252,      0,
-      0, 0x6254,      0,      0, 0xCF2F, 0xCF30, 0xCF31,      0,
-      0,      0, 0xCF32,      0,      0,      0, 0x6256, 0xCF33,
- 0x6255,      0, 0xCF34,      0,      0, 0x4A4D,      0, 0xCF35,
-      0,      0, 0xCF36,      0, 0x3D56, 0x4E46, 0xCF37, 0xCF38,
- 0x6257, 0xCF39,      0, 0x4637,      0, 0xCF3A, 0x6258,      0,
-      0, 0x6259,      0, 0x625D, 0x625B, 0x625C, 0xCF3B, 0x625A,
-};
-const unsigned short utf8_to_euc_E79F[] = {
-      0,      0,      0, 0xCF3C,      0,      0,      0, 0x625E,
-      0, 0xCF3D,      0,      0,      0, 0x625F,      0,      0,
-      0, 0xCF3E, 0xCF3F,      0,      0, 0xCF40,      0, 0x6260,
-      0, 0xCF41, 0x6261, 0x4C37, 0x6262,      0, 0xCF42, 0xCF43,
- 0xCF44,      0, 0x4C70, 0x6263, 0xCF45, 0x434E, 0xCF46, 0x476A,
-      0, 0x366B, 0xCF47,      0, 0xCF48, 0x433B, 0x6264, 0x363A,
- 0xCF49, 0xCF4A,      0, 0x4050, 0xCF4B,      0,      0,      0,
- 0xCF4C,      0,      0, 0xCF4D, 0x6265,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E7A0[] = {
-      0,      0, 0x3A3D,      0,      0, 0xCF4E, 0xCF4F,      0,
-      0, 0xCF50,      0,      0, 0x6266, 0xCF51, 0xCF52,      0,
-      0, 0xCF53, 0x6267,      0, 0x3826, 0x3A55,      0,      0,
-      0,      0,      0,      0,      0, 0xCF54,      0,      0,
- 0x6269, 0xCF55, 0xCF56, 0xCF57,      0, 0x4556, 0x3A56, 0x354E,
-      0,      0,      0,      0,      0, 0xCF58, 0xCF59,      0,
- 0xCF5A,      0, 0x4B24,      0, 0x474B, 0xCF5B,      0, 0xCF5C,
-      0,      0, 0x4557,      0,      0,      0,      0, 0x395C,
-};
-const unsigned short utf8_to_euc_E7A1[] = {
-      0,      0,      0, 0xCF5D, 0xCF5E, 0x626B,      0, 0xCF5F,
- 0xCF60,      0,      0,      0, 0xCF61,      0, 0xCF62,      0,
-      0,      0, 0xCF63,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xCF64, 0x3E4B, 0xCF65,      0,
- 0xCF66, 0xCF67,      0, 0xCF68, 0xCF69,      0,      0,      0,
- 0xCF6A,      0, 0xCF6B, 0x4E32, 0x3945,      0, 0xCF6C, 0x3827,
-      0,      0, 0x4823,      0, 0x626D,      0,      0,      0,
-      0,      0, 0xCF6D,      0, 0x626F,      0, 0xCF6E,      0,
-};
-const unsigned short utf8_to_euc_E7A2[] = {
-      0, 0x386B,      0,      0,      0,      0, 0x626E, 0x4476,
-      0,      0, 0xCF6F,      0, 0x6271, 0x3337, 0x626C, 0xCF70,
-      0, 0x486A,      0, 0x3130, 0xCF71, 0x3A6C,      0, 0x4F52,
- 0xCF72,      0, 0x6270,      0,      0, 0xCF74, 0xCF75, 0xCF76,
-      0, 0xCF73,      0, 0x6272, 0xCF77,      0,      0, 0x4A4B,
- 0xCF78, 0x4059, 0x6274,      0, 0xCF79, 0xCF7A,      0, 0x6275,
- 0xCF7B, 0xCF7C, 0xCF7D, 0xCF7E,      0, 0x6273,      0,      0,
-      0,      0, 0x334E, 0xD021, 0x627B, 0xD022, 0x627A, 0xD023,
-};
-const unsigned short utf8_to_euc_E7A3[] = {
-      0, 0x3C27,      0,      0,      0, 0x627C, 0x6277, 0xD024,
- 0xD025, 0xD026, 0x627D, 0x6278, 0xD027,      0, 0xD028,      0,
- 0x4858, 0x6276, 0xD029, 0xD02A, 0x6279, 0xD02B, 0xD02C,      0,
-      0,      0, 0x6322, 0xD02E,      0,      0,      0, 0xD02F,
- 0xD030, 0xD031,      0,      0, 0xD02D,      0, 0xD032, 0x6321,
- 0x4B61,      0, 0xD033,      0, 0x627E,      0,      0, 0x306B,
-      0,      0, 0xD034, 0xD035, 0x6324,      0, 0xD037, 0xD038,
-      0,      0, 0xD039, 0xD03A,      0, 0x6323,      0, 0xD03B,
-};
-const unsigned short utf8_to_euc_E7A4[] = {
- 0xD036, 0x3E4C,      0,      0,      0,      0, 0xD03C, 0x6325,
-      0,      0,      0,      0, 0xD03D,      0, 0x4143,      0,
- 0xD03E, 0x6327, 0x6326,      0,      0,      0,      0,      0,
-      0, 0x6328, 0xD03F,      0, 0xD040,      0, 0xD041, 0xD042,
- 0xD043,      0,      0,      0,      0, 0xD044, 0x6268, 0xD045,
-      0, 0xD046, 0x626A, 0x632A, 0x6329, 0xD047,      0,      0,
- 0xF454, 0xD048,      0,      0, 0xD049, 0xD04A,      0,      0,
-      0,      0, 0x3C28, 0xD04B, 0x4E69, 0xD04C, 0x3C52, 0xD04D,
-};
-const unsigned short utf8_to_euc_E7A5[] = {
- 0x632B, 0x3737,      0,      0, 0xD04E, 0xD04F, 0xD050, 0x3540,
- 0x3527, 0x3B63, 0xD051, 0xD052,      0,      0,      0, 0xD053,
- 0x4D34, 0xD054,      0, 0x6331, 0xD055, 0x6330, 0x4144, 0x632D,
- 0xD056,      0, 0x632F, 0xD057, 0xD058, 0x3D4B, 0x3F40, 0x632E,
- 0x632C,      0, 0x472A,      0,      0, 0x3E4D,      0, 0xD059,
- 0x493C, 0xD05A,      0, 0xD05B,      0, 0x3A57,      0,      0,
-      0,      0, 0xD05C,      0,      0,      0,      0, 0x4578,
-      0, 0xD05D, 0x6332, 0xD05E, 0xD05F,      0, 0xD060, 0x6333,
-};
-const unsigned short utf8_to_euc_E7A6[] = {
- 0x6349, 0x3658,      0,      0, 0x4F3D, 0x4135,      0,      0,
-      0,      0, 0x6334, 0xD061, 0xD062, 0x3252, 0x4477, 0x4A21,
-      0, 0xD063,      0, 0xD064, 0xD065, 0xD066, 0xD067,      0,
- 0xD068,      0,      0, 0xD069, 0xD06A, 0x6335,      0,      0,
-      0, 0xD06B,      0,      0,      0,      0, 0x357A, 0x6336,
- 0xD06C, 0xD06D, 0x6338, 0xD06E,      0,      0, 0x6339, 0xD06F,
- 0x4729, 0xD070,      0, 0x633A, 0xD071,      0,      0,      0,
- 0xD072, 0x633B, 0x633C, 0xD073,      0, 0x3659, 0x3253, 0x4645,
-};
-const unsigned short utf8_to_euc_E7A7[] = {
- 0x3D28, 0x3B64, 0xD074,      0, 0xD075,      0,      0, 0xD076,
- 0xD077, 0x633D, 0xD078, 0x3D29,      0,      0,      0, 0xD079,
-      0, 0x324A, 0x4943,      0, 0xD07A, 0x633E, 0xD07B,      0,
- 0x486B,      0, 0xD07C,      0,      0, 0xD07D, 0xD07E, 0x4145,
- 0xD121, 0x6341, 0xD122, 0x6342, 0x4769, 0xD123, 0x3F41, 0x633F,
-      0, 0x4361, 0xD124, 0xD125, 0x6340, 0xD126,      0,      0,
- 0x3E4E, 0xD127,      0,      0,      0,      0,      0,      0,
- 0xD128,      0,      0, 0x305C, 0xD129,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E7A8[] = {
- 0x3529,      0, 0xD12A, 0xD12B,      0,      0,      0, 0xD12C,
- 0x6343, 0xD12D, 0xD12E, 0x4478, 0xD12F, 0x6344, 0x4047,      0,
-      0, 0xD130,      0,      0, 0x4C2D, 0xD131,      0, 0x4923,
- 0x6345, 0x6346, 0x4355, 0xD132, 0x4E47,      0, 0xD133, 0x6348,
- 0x6347, 0xD134,      0,      0,      0,      0,      0, 0xD135,
-      0,      0,      0, 0xD136,      0, 0xD137, 0x3C6F, 0xD138,
- 0xD139, 0x634A, 0x3070,      0, 0xD13A, 0xD13B,      0, 0x634D,
- 0xD13C, 0xD13D, 0xD13E, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946,
-};
-const unsigned short utf8_to_euc_E7A9[] = {
- 0x3972,      0, 0x4A66, 0x634E, 0xD13F, 0xD140, 0x4B54, 0xD141,
- 0xD142, 0x6350,      0,      0, 0xD143, 0x4051, 0x314F, 0x323A,
- 0x302C,      0,      0,      0,      0, 0xD144, 0xD145, 0x634F,
-      0, 0xD146,      0,      0, 0xD147, 0xD148,      0, 0xD149,
- 0xD14A, 0x6351, 0x6352, 0x3E77,      0, 0xD14B,      0, 0xD14C,
-      0, 0x6353, 0xD14D, 0x334F,      0, 0xD14E,      0,      0,
- 0x6355,      0,      0,      0, 0x376A, 0xD14F, 0x3566,      0,
- 0xD150, 0x6356, 0x3675,      0,      0, 0x6357, 0xD151, 0x407C,
-};
-const unsigned short utf8_to_euc_E7AA[] = {
- 0xD152, 0x464D, 0xD153, 0x4060, 0x3A75, 0xD154, 0xD155,      0,
- 0x6358,      0, 0xD156, 0xD157,      0,      0,      0,      0,
- 0xD158, 0xD159, 0x4362, 0x416B, 0xD15A, 0x635A, 0x635C, 0x6359,
- 0x635B,      0,      0,      0,      0,      0, 0xD15B, 0x3722,
- 0xD15C,      0,      0, 0xD15D,      0,      0,      0,      0,
-      0, 0x635D, 0x3726,      0, 0xD15E,      0, 0x3567, 0x4D52,
- 0x635F,      0,      0, 0xD15F,      0, 0xD160, 0x6360,      0,
-      0, 0xD161, 0x312E, 0xD162, 0xD163,      0,      0, 0x6363,
-};
-const unsigned short utf8_to_euc_E7AB[] = {
-      0,      0,      0, 0x3376, 0x6362, 0x6361, 0xD164, 0x6365,
- 0x635E, 0xD165, 0x6366, 0x4E29, 0xD166, 0x6367, 0xD167, 0x6368,
-      0, 0xD168, 0x5474, 0x636A,      0, 0x6369,      0,      0,
-      0, 0x636B, 0x636C, 0xD169, 0x4E35, 0x636D,      0, 0x706F,
- 0x3E4F, 0x636E, 0x636F, 0x3D57,      0, 0x4638, 0x6370, 0xF459,
- 0xD16A, 0xD16B, 0x4328, 0xD16C, 0xD16D, 0x6371,      0, 0x433C,
- 0x6372, 0xD16E,      0,      0, 0xD16F,      0, 0x3625,      0,
- 0x513F, 0x435D, 0x3C33, 0xD170,      0, 0xD171, 0xD172, 0x3448,
-};
-const unsigned short utf8_to_euc_E7AC[] = {
-      0,      0, 0x6373,      0, 0x6422,      0, 0x6376, 0xD173,
- 0x3568,      0, 0x6375, 0x6424,      0,      0,      0, 0x6374,
-      0, 0x3E50,      0,      0, 0xD174,      0,      0,      0,
- 0x6378, 0x6379,      0, 0x452B,      0,      0, 0x637A, 0xD175,
- 0x335E,      0,      0, 0xD176,      0, 0x3F5A, 0x4964, 0xD177,
- 0x637C, 0xD178, 0xD179, 0xD17A, 0x4268, 0xD17B, 0xD17C, 0xD17D,
- 0xD17E, 0xD221,      0, 0x6377, 0xD222, 0x637B, 0x637D,      0,
-      0, 0x3A7B,      0,      0,      0, 0xD223,      0, 0xD224,
-};
-const unsigned short utf8_to_euc_E7AD[] = {
- 0xD225, 0xD226,      0,      0,      0, 0x6426, 0x492E, 0xD227,
- 0x4826, 0x4579,      0, 0x365A, 0x6425, 0x6423, 0xD228, 0x4835,
- 0x637E, 0x435E, 0x457B,      0, 0x457A, 0xD229, 0x3A76,      0,
-      0,      0,      0,      0,      0, 0x6438,      0,      0,
- 0xD22A,      0,      0,      0, 0xD22B, 0x6428, 0xD22C, 0x642A,
-      0, 0xD22D, 0xD22E,      0, 0x642D, 0xD22F, 0x642E, 0xD230,
- 0x642B, 0x642C, 0xD231, 0xD232, 0x6429, 0x6427,      0, 0xD233,
-      0,      0, 0x6421,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E7AE[] = {
-      0,      0,      0,      0, 0xD234,      0, 0x4A4F, 0x3255,
-      0, 0xD235,      0, 0x6435,      0, 0x6432, 0xD236, 0x6437,
- 0xD237, 0xD238, 0x6436,      0, 0x4773, 0x4C27, 0xD239, 0x3B3B,
- 0x6430, 0x6439, 0x6434, 0xD23A, 0x6433, 0x642F, 0xD23B, 0x6431,
- 0xD23C, 0x3449,      0,      0,      0, 0xD23D,      0,      0,
-      0,      0, 0x433D,      0, 0xD23E, 0x407D,      0, 0xD23F,
- 0xD240, 0x4822, 0xD241,      0, 0x643E, 0xD242, 0xD243,      0,
- 0x4824,      0, 0xD244, 0xD245, 0xD246, 0xD247,      0,      0,
-};
-const unsigned short utf8_to_euc_E7AF[] = {
- 0x4061, 0x643B, 0xD248,      0, 0x484F, 0xD249, 0x643F, 0x4A53,
- 0xD24A, 0x435B, 0xD24B, 0x643A, 0x643C,      0,      0, 0x643D,
-      0,      0,      0,      0, 0xD24C,      0, 0xD24D, 0xD24E,
-      0, 0xD24F, 0xD250, 0xD251,      0, 0x6440,      0,      0,
- 0x3C44,      0,      0,      0, 0x4646, 0x6445, 0x6444,      0,
- 0xD252, 0x6441, 0xD253,      0,      0, 0x4F36,      0,      0,
-      0,      0, 0xD254, 0x644A, 0xD255, 0xD256, 0x644E, 0x644B,
- 0xD257, 0xD258, 0xD259,      0, 0xD25A,      0, 0xD25B,      0,
-};
-const unsigned short utf8_to_euc_E7B0[] = {
- 0x6447, 0xD25C, 0xD25D, 0xD25E, 0xD25F,      0, 0xD260, 0x6448,
-      0, 0xD261,      0, 0xD262, 0xD263, 0x644D, 0xD264, 0xD265,
-      0, 0x6442, 0x5255, 0x6449, 0x6443,      0,      0, 0x644C,
-      0, 0xD266,      0, 0xD267,      0,      0,      0, 0x6452,
- 0xD268, 0x344A,      0, 0x644F,      0, 0xD269, 0xD26A, 0x6450,
- 0xD26B,      0, 0x6451, 0x6454, 0xD26C,      0,      0,      0,
-      0, 0xD26D,      0, 0xD26E, 0xD26F,      0, 0xD270, 0x6453,
- 0x4876, 0xD271, 0xD272,      0,      0, 0x6455, 0x4E7C, 0x4A6D,
-};
-const unsigned short utf8_to_euc_E7B1[] = {
- 0x645A,      0,      0, 0x6457,      0,      0, 0xD273,      0,
-      0,      0, 0xD274,      0, 0x6456, 0x4052,      0, 0x6459,
- 0x645B, 0xD276, 0xD277, 0xD278, 0x6458, 0xD275, 0x645F,      0,
- 0x645C, 0xD279, 0xD27A, 0xD27B, 0xD27C, 0xD27D, 0xD27E, 0x645D,
- 0x6446, 0xD321,      0, 0xD322, 0x645E, 0x6460,      0, 0xD323,
-      0, 0xD324,      0,      0, 0x6461, 0xD325, 0xD326,      0,
- 0xD327,      0, 0xD328, 0x4A46,      0, 0x6462,      0,      0,
-      0, 0xD329,      0,      0, 0xD32A, 0xD32B, 0x4C62,      0,
-};
-const unsigned short utf8_to_euc_E7B2[] = {
-      0, 0x364E, 0x3729, 0x6463,      0,      0, 0xD32C, 0xD32D,
-      0, 0x4A34,      0, 0x3F68,      0, 0x4C30,      0, 0xD32E,
- 0x6464,      0, 0x4E33,      0, 0xD32F, 0x4774,      0, 0x4146,
- 0x4734,      0,      0, 0x3D4D,      0,      0, 0xD330, 0x3040,
- 0xD331, 0x6469, 0x6467,      0, 0x6465, 0x3421, 0xD332, 0x3E51,
- 0x646A,      0,      0, 0x6468,      0, 0x6466, 0x646E,      0,
- 0xD333, 0x646D, 0x646C, 0x646B,      0,      0, 0xD334, 0xD335,
-      0, 0x646F, 0xD336, 0xD337, 0xD338, 0x6470, 0x403A, 0xD339,
-};
-const unsigned short utf8_to_euc_E7B3[] = {
- 0x6471,      0, 0x6473,      0, 0xD33A, 0x6472,      0, 0xD33B,
- 0xD33C, 0xD33D, 0x3852,      0,      0, 0xD33E, 0x4138, 0xD33F,
-      0,      0, 0x6475, 0xD340, 0xD341, 0xD342, 0x457C, 0xD343,
- 0x6474, 0xD344, 0xD345,      0, 0x6476, 0xD346, 0x4A35, 0x416C,
- 0x3947,      0, 0x6477,      0,      0,      0, 0xD347, 0x4E48,
-      0, 0xD348,      0, 0xD349,      0,      0,      0, 0x6479,
-      0,      0, 0x647A,      0, 0x647B, 0xD34A, 0x647C,      0,
- 0x3B65,      0, 0x647D, 0x374F,      0,      0, 0x356A,      0,
-};
-const unsigned short utf8_to_euc_E7B4[] = {
- 0x352A,      0, 0x6521, 0xD34B, 0x4C73, 0x3948, 0x647E, 0xD34C,
- 0xD34D, 0xD34E, 0x6524, 0x4C66,      0, 0x473C,      0, 0xD34F,
- 0x4933, 0xD350, 0xD351, 0xD352, 0x3D63, 0x6523, 0xD353, 0x3C53,
- 0x3949, 0x3B66, 0x3569, 0x4A36, 0x6522, 0xD354, 0xD355,      0,
- 0x4147, 0x4B42, 0x3A77, 0xD356,      0,      0, 0xD357,      0,
-      0,      0, 0xD358, 0x3B67, 0x445D, 0xD359, 0x6527, 0x4E5F,
- 0x3A59, 0xD35A, 0x6528, 0x3F42,      0, 0x652A,      0,      0,
-      0, 0x3E52, 0x3A30,      0, 0xD35B, 0xD35C, 0xD35D, 0x6529,
-};
-const unsigned short utf8_to_euc_E7B5[] = {
- 0xD35E, 0xD35F, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 0xD360,
- 0xD361,      0,      0, 0x6526, 0x3750, 0xD362, 0x652E, 0x6532,
- 0x376B, 0xD363,      0, 0xD364,      0,      0, 0x652D, 0xD365,
-      0, 0xD366, 0xD367, 0x6536, 0xD368, 0xD369, 0x394A,      0,
-      0, 0x4D6D, 0x303C, 0x6533,      0, 0xD36A, 0x356B, 0xD36B,
- 0x6530,      0, 0xD36C,      0,      0,      0, 0x6531,      0,
- 0xD36D, 0x457D, 0x652F, 0x652C,      0, 0x3328, 0x4064,      0,
- 0xD36E, 0x3828, 0xD36F, 0xD370,      0, 0x6538,      0, 0xD371,
-};
-const unsigned short utf8_to_euc_E7B6[] = {
-      0, 0xD372, 0xD373, 0xD374,      0, 0xD375, 0xD376,      0,
- 0xD377, 0x6535,      0, 0xD378, 0xD379, 0xD37A,      0, 0x6537,
-      0, 0xD37B,      0, 0x6534,      0,      0, 0xD37C, 0xD37D,
-      0, 0x3751, 0x4233, 0x6539, 0x416E, 0xD37E, 0xD421, 0x6546,
- 0xF45C,      0, 0x6542, 0x653C,      0,      0, 0xD422, 0xD423,
-      0,      0, 0xD424, 0x6540, 0x3C7A, 0x305D, 0x653B, 0x6543,
- 0x6547, 0x394B, 0x4C56, 0xD425, 0x4456, 0x653D, 0xD426, 0xD427,
- 0x6545, 0xD428, 0x653A, 0x433E,      0, 0x653F, 0x303D, 0x4C4A,
-};
-const unsigned short utf8_to_euc_E7B7[] = {
-      0,      0, 0xD429, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0x653E,
-      0,      0, 0x365B, 0x486C, 0xD42E, 0xD42F, 0xD430, 0x416D,
-      0, 0x4E50, 0x3D6F,      0,      0, 0x656E, 0xF45D, 0xD431,
- 0x6548, 0xD432, 0x407E,      0, 0x6544, 0x6549, 0x654B,      0,
- 0x4479, 0x654E, 0xD434,      0, 0x654A, 0xD435, 0xD436,      0,
- 0x4A54, 0x344B, 0xD437, 0xD438, 0x4C4B, 0xD439,      0, 0x305E,
-      0, 0xD43A, 0x654D,      0, 0x4E7D, 0xD43B, 0xD43C,      0,
-      0, 0xD43D, 0xD43E, 0x654C,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E7B8[] = {
- 0xD433, 0x316F,      0,      0, 0x466C, 0x654F,      0,      0,
- 0xD43F, 0x6556, 0x6550, 0x6557,      0,      0,      0,      0,
- 0xD440, 0xD441, 0x6553,      0,      0, 0xD442,      0, 0xD443,
-      0,      0,      0, 0x477B, 0xD444, 0xD445, 0x3C4A, 0x6555,
- 0xD446, 0x6552, 0x6558, 0x6551,      0,      0, 0x3D44, 0xD447,
- 0xD448,      0,      0, 0x4B25, 0xD449, 0xD44A, 0x3D4C, 0xD44B,
-      0, 0x6554, 0x6560, 0xD44C,      0, 0x655C, 0xD44D, 0x655F,
-      0, 0x655D, 0x6561, 0x655B,      0, 0x6541, 0x4053, 0xD44E,
-};
-const unsigned short utf8_to_euc_E7B9[] = {
-      0, 0x484B,      0, 0x655E, 0xD44F, 0xD450, 0x6559, 0xD451,
-      0,      0, 0x4121, 0x3752,      0, 0x3D2B, 0xD452,      0,
- 0xD453,      0, 0xD454,      0, 0x3F25, 0x4136, 0x6564,      0,
- 0xD455, 0x6566, 0x6567,      0,      0, 0x6563, 0x6565, 0xD456,
-      0, 0xD457, 0xD458,      0,      0, 0xD459, 0x655A, 0x6562,
-      0, 0x656A, 0x6569, 0xD45A,      0, 0x4B7A, 0xD45B, 0xD45C,
- 0x372B,      0,      0, 0xD45D,      0,      0,      0,      0,
- 0xD45E, 0x6568,      0, 0x656C, 0x656B, 0x656F, 0xD45F, 0x6571,
-};
-const unsigned short utf8_to_euc_E7BA[] = {
-      0, 0xD460, 0x3B3C, 0x656D,      0,      0, 0xD461, 0xD462,
- 0x6572, 0x6573, 0xD463,      0, 0x6574, 0xD464, 0x657A, 0x453B,
- 0x6576, 0xD465, 0x6575, 0x6577, 0x6578, 0xD466, 0x6579,      0,
- 0xD467,      0, 0xD468, 0x657B, 0x657C, 0xD469, 0xD46A,      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,
-};
-const unsigned short utf8_to_euc_E7BC[] = {
-      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, 0x344C,      0,
- 0x657D,      0, 0x657E, 0xD46C, 0xD46B, 0xD46D, 0xD46E, 0xD46F,
-};
-const unsigned short utf8_to_euc_E7BD[] = {
-      0,      0,      0, 0xD470, 0xD471, 0x6621,      0, 0xD472,
-      0,      0,      0,      0, 0x6622, 0x6623, 0x6624, 0xD473,
- 0x6625, 0x6626, 0xD474, 0xD475, 0x6628, 0x6627,      0,      0,
- 0x6629,      0,      0, 0xD476, 0xD477, 0xD478,      0, 0x662A,
- 0x662B, 0xD479,      0, 0xD47A, 0xD47B, 0xD47C, 0xD47D, 0x662E,
- 0x662C, 0x662D, 0x3A61, 0x3753,      0, 0xD47E, 0x4356,      0,
- 0x4833, 0xD521, 0x3D70,      0,      0, 0x474D,      0, 0x486D,
- 0x662F, 0x586D,      0,      0,      0, 0xD522, 0xD523, 0xD524,
-};
-const unsigned short utf8_to_euc_E7BE[] = {
- 0xD525,      0, 0x6630, 0x6632,      0, 0x4D65, 0x6631, 0x6634,
- 0x6633,      0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
- 0xD529, 0xD52A,      0,      0, 0x6636,      0, 0xD52B, 0xD52C,
-      0,      0, 0x6639,      0, 0xD52D, 0x6638, 0x6637,      0,
-      0, 0xD52E, 0xD52F, 0x663A, 0x3732,      0, 0xD530,      0,
- 0x4122, 0x3541, 0xD531,      0,      0, 0xD532, 0x663E, 0x663B,
-      0,      0, 0x663C,      0, 0xD533,      0, 0x663F,      0,
- 0x6640, 0x663D,      0,      0, 0xD534, 0x3129,      0, 0xD535,
-};
-const unsigned short utf8_to_euc_E7BF[] = {
- 0xD536, 0x3227,      0, 0xD537,      0, 0x6642, 0x6643,      0,
- 0xD538,      0, 0x6644,      0, 0x4D62,      0, 0xD539, 0xD53A,
-      0,      0, 0x3D2C,      0, 0x6646, 0x6645,      0,      0,
-      0,      0,      0, 0xD53B,      0,      0,      0, 0xD53C,
- 0x3F69, 0x6647,      0, 0xD53D,      0, 0xD53E, 0x6648,      0,
- 0xD53F, 0x6649,      0, 0x3465, 0xD540,      0, 0xD541, 0xD542,
- 0x344D,      0, 0xD543, 0x664A,      0,      0,      0,      0,
-      0, 0x664B, 0xD544, 0x4B5D, 0x4D63, 0xD545, 0xD546, 0xD547,
-};
-const unsigned short utf8_to_euc_E880[] = {
- 0x4D54, 0x4F37,      0, 0x394D, 0x664E, 0x3C54, 0x664D, 0xD548,
- 0xD549,      0, 0xD54A, 0x664F, 0x3C29, 0xD54B, 0xD54C, 0xD54D,
- 0x4251, 0xD54E, 0x6650, 0xD54F, 0xD550, 0x394C, 0xD551, 0x4C57,
- 0x6651, 0x6652,      0,      0, 0x6653, 0xD552, 0xD553, 0xD554,
- 0xD555, 0x6654,      0,      0, 0xD556,      0, 0xD557,      0,
- 0x6655,      0,      0,      0, 0xD558,      0, 0xD559,      0,
- 0xD55A,      0,      0, 0x3C2A, 0xD55B, 0xD55C, 0x4C6D, 0xD55D,
-      0, 0xD55E, 0xD55F, 0x6657, 0xD560, 0x433F, 0xD561, 0x6656,
-};
-const unsigned short utf8_to_euc_E881[] = {
- 0xD562,      0,      0,      0, 0xD563,      0, 0x6659,      0,
-      0,      0, 0x6658,      0,      0,      0,      0,      0,
-      0,      0, 0x665A,      0,      0,      0, 0x403B,      0,
- 0x665B,      0, 0x665C,      0,      0,      0, 0x4A39, 0x665D,
- 0xD564, 0x416F, 0x665E,      0, 0xD565,      0, 0xD566,      0,
- 0x665F,      0,      0,      0,      0, 0xD567,      0, 0x4E7E,
- 0x6662, 0xD568, 0x6661, 0x6660, 0x4430, 0xD569, 0x6663, 0x3F26,
-      0, 0x6664,      0,      0,      0, 0x6665, 0x4F38, 0x6666,
-};
-const unsigned short utf8_to_euc_E882[] = {
-      0, 0xD56A,      0,      0, 0x6667, 0x6669, 0x6668, 0x4825,
- 0xD56B, 0x4679,      0, 0x4F3E, 0x4829,      0, 0xD56C,      0,
-      0,      0,      0, 0x666B,      0,      0, 0x3E53,      0,
- 0x492A,      0, 0x666C, 0x666A, 0xD56D, 0x344E, 0xD56E,      0,
-      0, 0x3854, 0x3B68,      0,      0, 0x486E, 0xD56F, 0xD570,
-      0, 0x382A, 0x4B43, 0xD571, 0x666F, 0x666D,      0, 0x394E,
-      0, 0x394F, 0x3069,      0, 0x3A68,      0,      0,      0,
- 0xD572, 0xD573, 0x4759,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E883[] = {
-      0,      0,      0, 0x305F, 0x6674,      0, 0x4340,      0,
- 0xD574,      0,      0,      0, 0x4758, 0xD575, 0x425B, 0xD576,
-      0,      0, 0xD577,      0, 0xD578, 0xD579, 0x6676, 0xD57A,
- 0xD57B, 0x6672, 0x6675, 0x6670,      0, 0x6673, 0x4B26,      0,
- 0xD57C, 0x3855,      0,      0, 0x307D, 0x6671,      0,      0,
-      0,      0,      0,      0,      0, 0xD57D, 0xD57E, 0x6678,
- 0xD621, 0x6679, 0xD622, 0xD623, 0x4639,      0, 0xD624,      0,
- 0x363B, 0xD625, 0xD626,      0, 0x6726, 0x473D, 0xD627,      0,
-};
-const unsigned short utf8_to_euc_E884[] = {
-      0,      0, 0x3B69, 0xD628,      0, 0x363C, 0x4048, 0x4F46,
- 0x4C2E, 0x6677, 0x4054, 0xD629,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xD62A, 0xD62B,
- 0xD62C,      0, 0x3553, 0x667A, 0xD62D,      0, 0xD62E,      0,
- 0xD62F,      0,      0, 0x667C, 0xD630,      0,      0, 0xD631,
-      0, 0x667B,      0,      0, 0xD632,      0,      0, 0x667D,
- 0xD633, 0x4326,      0, 0x473E,      0, 0xD634,      0,      0,
-      0, 0x4431, 0xD635,      0, 0xD636,      0, 0x6723,      0,
-};
-const unsigned short utf8_to_euc_E885[] = {
-      0,      0,      0,      0,      0, 0xD637, 0x6722, 0xD638,
-      0,      0, 0xD639, 0x667E, 0xD63A,      0, 0x3F55,      0,
- 0x4965, 0x6725, 0xD63B, 0x6724, 0x3950, 0x4F53,      0, 0xD63C,
-      0,      0,      0,      0,      0,      0,      0, 0x6735,
- 0xD63D, 0xD63E,      0,      0,      0, 0x6729, 0x672A, 0xD63F,
- 0xD640, 0xD641,      0, 0x3C70,      0, 0xD642, 0x6728, 0xD643,
- 0x3978, 0x6727,      0,      0, 0x672B,      0,      0, 0xD644,
- 0x4432, 0x4A22, 0x4123,      0,      0,      0,      0, 0x425C,
-};
-const unsigned short utf8_to_euc_E886[] = {
- 0x672F, 0xD645, 0x6730, 0x672C, 0xD647, 0xD648, 0xD649,      0,
- 0x672D,      0, 0x672E, 0xD64A,      0,      0, 0xD64B, 0x3951,
- 0xD646,      0,      0, 0x6736,      0, 0x6732, 0xD64C,      0,
- 0xD64D,      0, 0x4966, 0xD64E, 0x4B6C, 0x4928, 0xD64F,      0,
- 0x6731,      0, 0xD650, 0x6734, 0x6733,      0,      0,      0,
- 0x4B44, 0x6737,      0,      0,      0,      0, 0xD651,      0,
- 0x6738,      0, 0xD652, 0x4137, 0xD653, 0x6739,      0,      0,
- 0x673B,      0, 0x673F, 0xD654,      0, 0x673C, 0x673A, 0x473F,
-};
-const unsigned short utf8_to_euc_E887[] = {
- 0x673D,      0, 0x673E, 0xD656,      0, 0xD657, 0x3232,      0,
- 0x6745, 0x6740, 0xD658, 0xD655,      0, 0x6741, 0xD659, 0xD65A,
-      0, 0x6742,      0, 0x4221,      0, 0xD65B,      0, 0xD65C,
- 0x6744, 0x6743, 0x6746, 0xD65D,      0, 0xD65E, 0xD65F, 0x6747,
- 0x6748, 0xD660,      0, 0x3F43, 0xD661, 0x3269,      0, 0x6749,
- 0x4E57,      0, 0x3C2B, 0xD662, 0xD663, 0x3D2D,      0,      0,
- 0xD664, 0xD665, 0xD666, 0x3B6A, 0x4357, 0xD667, 0xD668,      0,
- 0xD669, 0xD66A, 0x674A, 0x674B, 0x3131, 0xD66B, 0x674C, 0xD66C,
-};
-const unsigned short utf8_to_euc_E888[] = {
- 0xD66D, 0x674D, 0x674E, 0xD66E,      0, 0x674F,      0, 0x6750,
- 0x363D, 0x5A2A, 0x6751,      0, 0x4065, 0x6752, 0x3C4B, 0xD66F,
- 0x6753,      0, 0x5030, 0xD670, 0xD671,      0, 0x6754, 0x4A5E,
- 0x345C, 0xD672, 0xD673, 0x4124, 0x3D58, 0xD674, 0x4971, 0x3D2E,
-      0, 0xD675, 0xD676,      0,      0,      0,      0,      0,
- 0xD677, 0x6755, 0x3952, 0x6756, 0x484C,      0, 0x6764,      0,
-      0,      0, 0xD678, 0x6758, 0xD679, 0x4249, 0x4775, 0x383F,
- 0x6757, 0x4125, 0xD67A,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E889[] = {
- 0x6759,      0,      0, 0xD67B, 0xD67C, 0xD67D, 0xD67E, 0x447A,
-      0,      0,      0, 0xD721,      0,      0, 0xD722, 0xD723,
-      0, 0xD724,      0,      0,      0,      0, 0xD725,      0,
- 0x675B, 0x675A, 0x675D,      0, 0xD726, 0x675C,      0, 0x675E,
- 0xD727,      0, 0x6760, 0xD728, 0x675F,      0, 0x344F, 0xD729,
- 0x6761,      0, 0x6762, 0x6763,      0, 0xD72A, 0x3A31, 0x4E49,
-      0, 0x6765, 0x3F27,      0, 0xD72B,      0, 0x3170, 0x6766,
- 0x6767,      0,      0, 0xD72C,      0, 0xD72D, 0x6768, 0xD72E,
-};
-const unsigned short utf8_to_euc_E88A[] = {
- 0xD72F, 0xD730,      0, 0xD731, 0xD732,      0,      0, 0xD733,
-      0, 0xD734, 0xD735, 0x3072,      0, 0x6769, 0xD736,      0,
-      0, 0xD737, 0x676A,      0, 0xD738,      0, 0xD739,      0,
- 0xD73A, 0x4967, 0xD73B, 0xD73C,      0, 0x3C47,      0, 0x676C,
- 0xD73D, 0xD73E,      0, 0xD73F, 0xD740, 0x3329, 0x3032, 0xD741,
- 0xD742, 0xD743, 0xD744, 0x676B, 0x676E, 0x474E, 0xD745, 0x3F44,
- 0xD746, 0x3256, 0xD747, 0x4B27, 0xD748,      0,      0, 0xD749,
- 0x375D, 0x365C, 0xD74A, 0x676D, 0xD74B, 0x326A, 0xD74C, 0xD74D,
-};
-const unsigned short utf8_to_euc_E88B[] = {
-      0,      0,      0,      0,      0, 0x3423, 0xD74E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xD74F, 0x3171, 0x6772, 0x4E6A, 0x425D, 0xD750,      0, 0x4944,
-      0, 0x677E, 0xD751, 0x3257, 0x677C,      0, 0x677A, 0x6771,
- 0xD752, 0x676F, 0xD753, 0x6770, 0xD754, 0x3C63, 0x366C, 0x4377,
- 0xD755,      0, 0xD756, 0x4651,      0, 0xD757,      0, 0xD758,
-      0, 0x3151,      0, 0x6774, 0x6773,      0, 0xD759, 0xD75A,
-      0, 0x6779, 0x6775, 0x6778,      0, 0xD75B, 0xD75C,      0,
-};
-const unsigned short utf8_to_euc_E88C[] = {
- 0xD75D, 0xD75E, 0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 0xD75F,
- 0xD760, 0x677D, 0xD761, 0xD762,      0,      0, 0x3754,      0,
-      0,      0,      0,      0,      0,      0, 0x6823, 0x682C,
- 0x682D,      0,      0, 0xD764, 0x302B, 0xD765, 0xD766, 0xD767,
-      0, 0xD768, 0xD769, 0x6834,      0,      0,      0,      0,
- 0x3071,      0,      0, 0x682B, 0xD76A, 0xD76B, 0xD76C, 0x682A,
- 0xD76D, 0x6825, 0x6824, 0xD76E, 0x6822, 0x6821, 0x4363, 0xD76F,
- 0x427B, 0x6827, 0xD770,      0, 0xD771, 0xD772,      0,      0,
-};
-const unsigned short utf8_to_euc_E88D[] = {
- 0x6826,      0, 0xD773, 0xD774, 0xD775, 0x6829,      0, 0xD776,
-      0, 0x4170, 0x3755,      0,      0, 0xD777, 0xD778, 0x3141,
- 0x6828, 0xD779, 0x3953, 0xD83E, 0xD763, 0xD77A, 0xD77B, 0xD77C,
- 0x4171,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xF45F,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xD77D,      0,      0, 0x683A,      0, 0x683B,      0, 0x3259,
- 0xD77E,      0,      0, 0x322E, 0x6838, 0xD821,      0, 0xD822,
-};
-const unsigned short utf8_to_euc_E88E[] = {
- 0xD823,      0, 0xD824,      0, 0xD825, 0x682E, 0xD826, 0x6836,
-      0, 0x683D, 0x6837,      0,      0, 0xD827, 0x6835,      0,
-      0,      0, 0xD828, 0x6776, 0xD829, 0xD82A, 0x6833,      0,
- 0xD82B, 0xD82C, 0x682F, 0xD82D, 0xD82E, 0xD82F, 0x3450, 0x6831,
- 0x683C,      0, 0x6832,      0,      0,      0, 0xD830, 0xD831,
- 0x683E, 0xD832, 0x6830, 0x477C, 0xD833, 0xD84C,      0,      0,
-      0, 0x4D69,      0,      0,      0, 0x6839,      0,      0,
-      0,      0,      0,      0,      0, 0x684F, 0xD834, 0xD835,
-};
-const unsigned short utf8_to_euc_E88F[] = {
- 0xD836, 0x6847,      0,      0,      0, 0x3F7B,      0, 0xD837,
-      0, 0xD838, 0x3546,      0, 0x365D,      0, 0x6842, 0xD839,
- 0xD83A, 0xD83B,      0, 0x325B, 0xD83C,      0, 0x3E54,      0,
- 0x6845,      0,      0,      0, 0x3A5A, 0xD83D,      0, 0x4551,
- 0x684A,      0,      0,      0,      0,      0,      0,      0,
- 0xD83F, 0x4A6E, 0xD840, 0x6841,      0,      0,      0, 0x325A,
- 0x3856, 0x4929, 0x684B,      0, 0x683F,      0, 0xD841, 0x6848,
- 0xD842, 0xD843,      0, 0x6852, 0xD844, 0x6843,      0,      0,
-};
-const unsigned short utf8_to_euc_E890[] = {
-      0, 0xD845,      0, 0x6844, 0x463A,      0, 0xD846, 0x6849,
-      0,      0, 0xD847, 0x6846, 0x4B28, 0x684C, 0x3060, 0xD848,
-      0, 0xD849,      0, 0x6840,      0, 0xD84A,      0,      0,
-      0, 0xD84B,      0,      0,      0,      0,      0,      0,
- 0x684E,      0, 0x684D,      0,      0,      0,      0,      0,
-      0, 0x476B, 0x6854,      0, 0x685F,      0,      0, 0xD84D,
-      0, 0x337E,      0,      0,      0, 0x6862,      0,      0,
- 0x6850, 0xD84E,      0,      0, 0x6855, 0x4D6E,      0,      0,
-};
-const unsigned short utf8_to_euc_E891[] = {
-      0,      0,      0,      0,      0, 0xD84F, 0x685E, 0xD850,
- 0xD851, 0x4D55, 0xD852,      0,      0, 0xD853, 0x4E2A, 0xD854,
-      0, 0xD855, 0xD856,      0,      0,      0, 0xD857, 0x4378,
- 0xD858, 0xD859, 0xD85A, 0x336B, 0xD85B,      0,      0,      0,
- 0xD85C, 0x4972, 0x6864, 0x4621, 0xD85D, 0xD85E, 0x3031, 0xD85F,
-      0, 0x685D, 0xD860, 0x6859, 0x4172, 0x6853, 0x685B, 0x6860,
- 0xD861, 0x472C,      0, 0xD862, 0xD863, 0x302A, 0xD864, 0x6858,
- 0xD865, 0x6861, 0x4978,      0, 0xD866, 0xD867,      0,      0,
-};
-const unsigned short utf8_to_euc_E892[] = {
-      0, 0xD868, 0x685C,      0, 0x6857, 0xD869,      0,      0,
-      0,      0,      0, 0x3E55,      0,      0,      0,      0,
- 0x3D2F,      0, 0xD86A, 0xD86B, 0x3C2C, 0xD86C,      0,      0,
-      0, 0x4C58,      0,      0, 0x4947,      0, 0xD86D, 0x6867,
-      0, 0x6870,      0,      0,      0,      0, 0xD86E,      0,
- 0xD86F, 0xD870, 0xD871,      0,      0, 0x685A,      0, 0xD872,
-      0, 0xD873, 0x3377,      0, 0xD874,      0,      0,      0,
- 0x3E78, 0x6865, 0xD875, 0x686A, 0x4173, 0xD876, 0xD877, 0x6866,
-};
-const unsigned short utf8_to_euc_E893[] = {
- 0xD878, 0x686D, 0xD879,      0, 0x435F,      0, 0x686E, 0xD87A,
- 0xD87B, 0x4D56, 0x6863, 0x3338, 0xD87C, 0x6869,      0, 0xD87D,
- 0x686C, 0x4C2C,      0, 0xD87E,      0,      0, 0x686F,      0,
-      0, 0x6868, 0x686B,      0, 0xD921,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xD922,
-      0,      0, 0xD923,      0, 0x4B29,      0, 0x4F21, 0xD924,
- 0xD925, 0xD926, 0xD927,      0, 0x6873,      0,      0, 0xD928,
-      0,      0, 0xD92A, 0xD92B, 0x687A, 0xD92C,      0, 0x6872,
-};
-const unsigned short utf8_to_euc_E894[] = {
- 0x3C43,      0, 0xD92D, 0xD92E,      0,      0, 0x6851, 0xD92F,
-      0,      0,      0,      0, 0xD930,      0, 0xD931,      0,
- 0xD932, 0x4A4E,      0, 0x4C22, 0x6879, 0x6878,      0, 0x6874,
- 0x6875,      0, 0x3136,      0, 0xD933,      0, 0xD934, 0x6877,
-      0, 0x6871, 0xD935, 0xD936, 0xD937, 0xD938, 0x4455, 0xD939,
-      0,      0, 0xD93A, 0xD93B, 0x6876, 0x307E,      0, 0xD93C,
-      0,      0, 0xD929, 0xD93D, 0xD93E, 0x4222, 0xD93F,      0,
-      0,      0,      0,      0,      0, 0x4A43,      0, 0xD940,
-};
-const unsigned short utf8_to_euc_E895[] = {
- 0x687B, 0x6921,      0, 0x4859,      0,      0, 0xD941,      0,
- 0x687E, 0x3E56, 0x3C49, 0x6923,      0,      0, 0x363E, 0xD942,
- 0xD943, 0xD944, 0xD945, 0xD946,      0, 0x6924, 0xD947, 0x4979,
- 0x687D, 0xD948, 0x6856,      0, 0xD949, 0xD94A, 0xD94B, 0xD94C,
- 0xD94D, 0xD94E, 0xD94F, 0x687C, 0xD950,      0,      0,      0,
- 0x4F4F, 0x4622, 0x4973, 0xD951,      0, 0x692B,      0, 0xD952,
-      0,      0,      0,      0,      0,      0,      0, 0x6931,
-      0, 0xD953, 0xD954, 0xD955,      0, 0xD956, 0x6932, 0xD957,
-};
-const unsigned short utf8_to_euc_E896[] = {
- 0x6925, 0xD958,      0,      0, 0x4776, 0xD959, 0xD95A, 0x692F,
- 0x6927, 0xD95B, 0x6929, 0xD95C, 0xD95D,      0,      0, 0xD95E,
- 0x6933, 0x6928,      0, 0xD95F, 0x692C,      0,      0, 0x3172,
- 0xD960, 0x4665,      0, 0x692D, 0x6930, 0xD961,      0, 0xD962,
- 0xD963,      0, 0xD964,      0, 0x6926, 0xD965, 0x4126, 0xD966,
- 0x692A, 0x3B27, 0x3F45, 0x3730, 0x4C74, 0xD974, 0x4C79, 0x3D72,
- 0xF461,      0,      0,      0, 0xD967,      0, 0xD968, 0xD969,
- 0xD96A, 0x6937, 0x6935,      0, 0xD96B, 0xD96C, 0xD96D, 0xD96E,
-};
-const unsigned short utf8_to_euc_E897[] = {
-      0, 0x4F4E, 0xD96F,      0,      0,      0,      0, 0xD970,
-      0, 0x6934, 0xD971, 0xD972,      0, 0x4D75, 0xD973, 0x6936,
- 0x6938,      0,      0,      0,      0, 0x6939,      0,      0,
- 0xD975,      0, 0xD976,      0, 0x693C, 0x693A,      0, 0xD977,
- 0xD978,      0,      0,      0, 0x4623, 0x693B, 0xD979,      0,
- 0xD97A, 0x484D, 0x692E,      0,      0, 0xD97B,      0,      0,
-      0,      0,      0, 0xD97C,      0,      0, 0xD97D, 0x3D73,
-      0, 0x693D, 0x6942, 0x4174, 0xD97E,      0, 0x6941, 0xDA21,
-};
-const unsigned short utf8_to_euc_E898[] = {
- 0xDA22,      0, 0x6922,      0, 0xDA23, 0xDA24, 0x6943, 0x4149,
-      0,      0, 0x693E, 0x6940,      0, 0xDA25, 0xDA26,      0,
- 0xDA27, 0xDA28, 0xDA29, 0x693F,      0,      0, 0x5D31, 0x5D22,
- 0xDA2A, 0xDA2B, 0x6945, 0xDA2C,      0,      0, 0xDA2D,      0,
-      0, 0xDA2E, 0x6944,      0,      0,      0,      0, 0xDA2F,
-      0, 0xDA30,      0,      0,      0, 0x4D76,      0, 0x623C,
- 0x6946,      0,      0,      0,      0,      0, 0xDA31,      0,
- 0xDA32,      0, 0xDA33,      0, 0xDA34, 0xDA35,      0, 0x6947,
-};
-const unsigned short utf8_to_euc_E899[] = {
- 0xDA36, 0xB866, 0xDA37,      0,      0,      0, 0xDA38,      0,
-      0,      0,      0,      0,      0, 0x6948, 0x3857,      0,
- 0x3554,      0, 0xDA39, 0xDA3A, 0x694A, 0x515D, 0xDA3B, 0xDA3C,
- 0xDA3D, 0xDA3E, 0x3575,      0, 0x4E3A, 0xDA3F, 0x3673, 0x694B,
- 0xDA40, 0xDA41, 0xDA42, 0xDA43, 0xDA44,      0,      0, 0x694C,
-      0, 0xDA45,      0, 0x436E, 0xDA46,      0,      0, 0xDA47,
-      0, 0x694D,      0,      0,      0, 0xDA48, 0xDA49, 0xDA4A,
-      0, 0x467A, 0xDA4B, 0x303A,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E89A[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xDA6D,      0, 0x3263, 0x6952, 0x6953, 0xDA4C,      0,      0,
-      0, 0xDA4D,      0, 0x694E,      0, 0x3B3D, 0xDA4E,      0,
- 0xDA4F,      0, 0xDA50,      0, 0xDA51,      0,      0,      0,
-      0, 0xDA52,      0, 0x694F, 0x4742,      0, 0xDA53, 0xDA54,
- 0xDA55, 0x6950, 0x6951, 0x695B,      0, 0xDA56,      0, 0x6955,
- 0x6958, 0xDA57,      0, 0xDA58, 0xDA59, 0xDA5A, 0x6954, 0xDA5B,
- 0xDA5C, 0xDA5D,      0,      0,      0,      0,      0, 0xDA5E,
-};
-const unsigned short utf8_to_euc_E89B[] = {
- 0xDA5F, 0xDA60,      0, 0xDA61, 0x6956, 0xDA62, 0x6957, 0x3C58,
-      0, 0x6959,      0, 0x4341,      0, 0x3756, 0x3342,      0,
-      0, 0xDA63, 0xDA64,      0, 0x695C, 0xDA65,      0, 0xDA66,
-      0, 0x333F, 0xDA67, 0x6961, 0xDA68,      0, 0x695D, 0x6960,
- 0xDA69,      0,      0, 0xDA6A, 0x483A, 0xDA6B,      0, 0xDA6C,
-      0, 0x695E,      0,      0, 0x695F, 0x4948, 0x485A, 0x6962,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x427D, 0x696C, 0xDA6E, 0x6968, 0xDA6F, 0xDA70, 0x326B,      0,
-};
-const unsigned short utf8_to_euc_E89C[] = {
- 0x6966,      0, 0x4B2A, 0x6967, 0xDA71, 0xDA72, 0x6964, 0xDA73,
- 0x6965, 0x696A, 0x696D, 0xDA74,      0, 0x696B, 0xDA75, 0xDA76,
- 0xDA77, 0x6969, 0x6963, 0xDA78, 0xDA79,      0,      0,      0,
- 0x4358, 0xDA7A, 0x6974,      0, 0x4C2A,      0, 0xDA7B, 0xDA7C,
-      0, 0xDA7D,      0, 0xDA7E,      0, 0x6972,      0,      0,
- 0xDB21, 0x6973,      0,      0,      0,      0, 0xDB22, 0xDB23,
-      0, 0xDB24, 0xDB25,      0, 0x696E,      0,      0, 0x6970,
-      0, 0xDB26, 0xDB27, 0x6971, 0xDB28, 0xDB29, 0xDB2A, 0x696F,
-};
-const unsigned short utf8_to_euc_E89D[] = {
- 0xDB2B,      0,      0, 0xDB2C,      0, 0xDB2D,      0,      0,
-      0, 0x4066,      0, 0x4F39, 0x6978, 0xDB2E, 0x6979,      0,
-      0,      0,      0, 0x6A21,      0, 0x3F2A,      0, 0x697B,
- 0xDB2F, 0x697E,      0,      0,      0, 0xDB30,      0, 0x6976,
- 0x6975, 0xDB31,      0, 0x6A22, 0xDB32, 0xDB33, 0x325C,      0,
- 0x697C,      0, 0x6A23,      0,      0,      0, 0x697D, 0xDB34,
-      0, 0xDB35, 0xDB36,      0, 0x697A,      0, 0x4433,      0,
- 0x6977,      0,      0, 0xDB37,      0,      0,      0, 0x4768,
-};
-const unsigned short utf8_to_euc_E89E[] = {
-      0,      0, 0x6A27, 0xDB38, 0xDB39, 0xDB3A, 0xDB3B, 0xDB3C,
- 0xDB3D, 0xDB3E,      0, 0xDB3F, 0xDB40, 0x4D3B,      0,      0,
- 0xDB41,      0,      0, 0xDB42,      0, 0xDB43,      0, 0xDB44,
- 0xDB45, 0xDB46,      0,      0,      0,      0, 0xDB47, 0x6A26,
- 0xDB48,      0, 0x6A25, 0xDB49,      0,      0,      0, 0xDB4A,
-      0,      0,      0, 0x6A2E, 0xDB4B, 0xDB4C, 0xDB4D, 0x6A28,
-      0, 0xDB4E,      0, 0x6A30,      0, 0xDB4F,      0,      0,
-      0,      0, 0x4D66, 0x6A33,      0, 0x6A2A, 0xDB50, 0xDB51,
-};
-const unsigned short utf8_to_euc_E89F[] = {
- 0x6A2B, 0xDB52,      0,      0, 0x6A2F,      0, 0x6A32, 0x6A31,
- 0xDB53, 0xDB54, 0xDB55, 0x6A29,      0,      0, 0xDB56,      0,
- 0x6A2C,      0, 0x6A3D,      0,      0, 0xDB57, 0xDB58,      0,
-      0, 0xDB59, 0xDB5A,      0, 0xDB5B,      0,      0, 0xDB5C,
- 0x6A36,      0, 0xDB5D, 0xDB5E, 0xDB5F,      0,      0,      0,
-      0,      0, 0xDB60, 0xDB61,      0, 0xDB62,      0, 0x6A34,
-      0, 0xDB63, 0x6A35, 0xDB64,      0,      0, 0x6A3A, 0x6A3B,
- 0xDB65, 0x332A, 0xDB66, 0x3542,      0,      0, 0x6A39, 0xDB67,
-};
-const unsigned short utf8_to_euc_E8A0[] = {
-      0, 0xDB68,      0, 0xDB69,      0, 0x6A24, 0xDB6A, 0xF464,
-      0, 0xDB6B, 0xDB6C, 0xDB6D,      0, 0x6A38, 0x6A3C, 0x6A37,
- 0xDB6E, 0x6A3E, 0xDB70, 0xDB71, 0xDB72, 0x6A40, 0x6A3F,      0,
- 0xDB73, 0xDB6F, 0xDB74, 0xDB75, 0xDB76,      0, 0xDB77, 0xDB78,
-      0, 0x6A42, 0x6A41, 0x695A,      0,      0,      0, 0x6A46,
- 0xDB79,      0,      0,      0,      0, 0xDB7A, 0xDB7B,      0,
- 0xDB7C, 0x6A43, 0xDB7D,      0,      0, 0xDB7E, 0x6A44,      0,
-      0, 0x6A45, 0xDC21, 0x6A47, 0xDC22,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E8A1[] = {
- 0x376C, 0xDC23, 0x6A49, 0xDC24, 0x6A48, 0xDC25, 0x3D30,      0,
- 0xDC26, 0xDC27, 0xDC28, 0xDC29, 0x3954, 0x5E27, 0xDC2A,      0,
-      0, 0xDC2B, 0x6A4A, 0x3D51,      0, 0xDC2C, 0xDC2D, 0x3339,
- 0xDC2E, 0x6A4B, 0xDC2F, 0x3152, 0xDC30, 0x3E57, 0x6A4C, 0xDC31,
- 0xDC32, 0x3955, 0x6A4D, 0x3061, 0xDC33,      0,      0,      0,
- 0x493D, 0xDC34,      0, 0x6A4E,      0,      0,      0,      0,
- 0x3F6A, 0xDC35, 0x6A55,      0,      0, 0x6A52,      0, 0x436F,
-      0, 0xDC36,      0, 0xDC37,      0, 0x6A53, 0x6A50, 0x365E,
-};
-const unsigned short utf8_to_euc_E8A2[] = {
- 0xDC38, 0x6A4F, 0x6A56,      0,      0,      0,      0,      0,
- 0x3736,      0,      0, 0x425E,      0, 0x6A5C,      0,      0,
-      0,      0, 0x6A58,      0,      0,      0, 0x4235, 0x6A57,
- 0xDC39, 0x6A5A, 0xDC3A, 0xDC3B, 0xDC3C,      0, 0x6A51, 0xDC3D,
- 0xDC3E,      0, 0x6A5B,      0, 0x6A5D,      0,      0,      0,
- 0xDC3F,      0, 0xDC40, 0x486F,      0,      0, 0x6A59,      0,
- 0x6A5E, 0x6A60,      0,      0, 0x3853, 0x6A54,      0, 0x3041,
-      0,      0, 0xDC41,      0,      0, 0xDC42, 0xDC43, 0x6A5F,
-};
-const unsigned short utf8_to_euc_E8A3[] = {
- 0xDC44, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175,      0,      0,
-      0,      0, 0xDC45, 0xDC46, 0xDC47, 0xDC48, 0xDC49, 0x4E22,
-      0, 0xDC4A, 0xDC4B, 0xDC4C, 0x6A63, 0x4D35,      0,      0,
- 0x6A64, 0x6A65,      0, 0xDC4D, 0x4A64, 0x6A66, 0xDC4E, 0x3A40,
-      0, 0x4E23,      0,      0,      0,      0,      0, 0xDC4F,
- 0x6A6B,      0,      0,      0,      0,      0,      0, 0xDC50,
- 0xDC51, 0xDC52, 0x6A6C, 0x3E58, 0x6A6A, 0xDC53,      0, 0xDC54,
- 0x4D67, 0x6A67,      0,      0, 0x6A69, 0x403D, 0x3F7E,      0,
-};
-const unsigned short utf8_to_euc_E8A4[] = {
-      0, 0xDC55, 0x6A68,      0, 0x6A6D,      0, 0xDC56, 0x4A23,
-      0,      0, 0x6A6F,      0, 0x6A6E, 0xDC57, 0xDC58, 0xDC59,
- 0x336C,      0, 0x4B2B, 0x6A70,      0, 0xDC5A, 0xDC5B,      0,
- 0xDC5C, 0xDC5D, 0xDC5E,      0, 0xDC5F, 0x6A7C, 0x6A72,      0,
- 0xDC60,      0,      0,      0,      0, 0x6A73, 0xDC61, 0xDC62,
- 0xDC63,      0, 0x6A74, 0x6A75,      0,      0,      0,      0,
- 0xDC64, 0xDC65, 0xDC66,      0,      0, 0xDC67, 0x6A79,      0,
- 0x6A7A, 0xDC68, 0xDC69, 0x6A78,      0,      0, 0xDC6A,      0,
-};
-const unsigned short utf8_to_euc_E8A5[] = {
- 0xDC6B, 0x6A76, 0xDC6C, 0x6A71, 0x6A77, 0xDC6D, 0xDC6E,      0,
-      0, 0xDC6F,      0,      0, 0x6A7B, 0x7037,      0, 0xDC70,
-      0,      0, 0xDC71,      0,      0,      0, 0x3228, 0xDC72,
-      0,      0, 0xDC73, 0xDC74, 0xDC75,      0, 0x6A7E, 0x365F,
- 0x6A7D, 0xDC76, 0xDC77, 0xDC78, 0x6B22,      0, 0x6B21,      0,
-      0,      0, 0x6B24, 0xDC79,      0, 0x6B23, 0xDC7A, 0x6B25,
- 0xDC7B,      0, 0x3D31, 0xDC7C, 0x6B26, 0xDC7D,      0, 0x6B27,
-      0,      0, 0xDC7E, 0xDD21, 0xDD22, 0xDD23, 0x6B28, 0x403E,
-};
-const unsigned short utf8_to_euc_E8A6[] = {
-      0, 0x4D57,      0, 0x6B29,      0,      0, 0x4A24, 0x4746,
- 0x6B2A, 0xDD24, 0x6B2B, 0x382B,      0, 0xDD25,      0, 0x352C,
- 0xDD26,      0,      0, 0x6B2C, 0xDD27, 0xDD28, 0x3B6B, 0x4741,
- 0x6B2D,      0, 0x3350, 0xDD29, 0xDD2A,      0,      0, 0xDD2B,
- 0xDD2C, 0x6B2E,      0,      0,      0, 0xDD2D, 0x6B30, 0x4D77,
-      0, 0x6B2F, 0x3F46,      0, 0x6B31,      0,      0, 0x6B32,
- 0xDD2E,      0, 0x6B33, 0x3451, 0xDD2F, 0xDD30, 0xDD31, 0xDD32,
-      0,      0, 0x6B34,      0, 0xDD33, 0x6B35,      0, 0x6B36,
-};
-const unsigned short utf8_to_euc_E8A7[] = {
- 0x6B37,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x3351,      0, 0xDD34, 0xDD35, 0xDD36, 0xDD37,
- 0xDD38,      0, 0x6B38,      0, 0x6B39, 0x6B3A,      0,      0,
-      0,      0,      0, 0x3272,      0, 0xDD39, 0x3F28, 0x6B3B,
-      0, 0xDD3A,      0, 0xDD3B,      0, 0xDD3C,      0,      0,
-      0, 0xDD3D,      0, 0xDD3E, 0x6B3C,      0, 0xDD3F,      0,
- 0x6B3D, 0xDD40,      0,      0,      0, 0xDD41,      0, 0xDD42,
-};
-const unsigned short utf8_to_euc_E8A8[] = {
- 0x3840,      0, 0x447B, 0x6B3E, 0xDD43, 0xDD44,      0, 0xDD45,
- 0x3757,      0, 0x3F56,      0, 0x6B41,      0, 0x4624, 0xDD46,
- 0x6B40, 0xDD47, 0xDD48, 0x3731, 0xDD49, 0xDD4A, 0x6B3F, 0x4277,
- 0x352D,      0,      0, 0x6B42,      0, 0x6B43, 0xDD4B, 0x3E59,
- 0xDD4C,      0, 0xDD4D, 0x376D, 0xDD4E, 0x6B44, 0xDD4F,      0,
-      0,      0, 0x4B2C, 0xDD50, 0xDD51, 0x405F,      0, 0xDD52,
-      0, 0x3576,      0, 0x4C75, 0x414A, 0xDD53, 0x6B45, 0xDD54,
-      0,      0, 0x3F47, 0x4370, 0x3E5A, 0xDD55, 0xDD56,      0,
-};
-const unsigned short utf8_to_euc_E8A9[] = {
- 0xDD57, 0x6B46,      0, 0xDD58,      0, 0xDD59, 0x6B49, 0xDD5A,
- 0x6B4A, 0xDD5B,      0,      0,      0, 0xDD5C, 0xDD5D,      0,
- 0x3A3E, 0x4242, 0x6B48, 0xDD5E, 0x3E5B, 0x493E, 0xDD5F, 0xDD60,
- 0xDD61,      0,      0, 0x6B47, 0xDD62, 0xDD63, 0x3B6C,      0,
- 0x3153, 0xDD64, 0x6B4E, 0x3758,      0, 0xDD65, 0x3B6E, 0xDD66,
-      0, 0x3B6D,      0, 0x4F4D, 0x6B4D, 0x6B4C, 0x4127,      0,
- 0x354D, 0x4F43, 0x333A, 0x3E5C,      0, 0xDD67, 0xDD68, 0xDD69,
-      0, 0xDD6A, 0xDD6B, 0xDD6C, 0x6B4B,      0, 0xDD6D, 0xDD6E,
-};
-const unsigned short utf8_to_euc_E8AA[] = {
- 0xDD6F,      0, 0x6B50, 0xDD70, 0x6B51, 0x6B4F, 0xDD71, 0x3858,
-      0, 0x4D40,      0, 0xDD72, 0x3B6F, 0x4727,      0, 0xDD73,
- 0xDD74, 0x6B54, 0xDD75, 0x4040,      0, 0x4342, 0xDD76, 0xDD77,
- 0x4D36, 0xDD78, 0x6B57,      0,      0,      0, 0x386C, 0xDD79,
- 0x403F, 0x6B53,      0, 0x6B58, 0x386D, 0x6B55, 0x6B56, 0xDD7A,
- 0x6B52, 0xDD7B,      0,      0, 0x4062, 0x4649, 0xDD7C, 0xDD7D,
- 0x432F,      0, 0x325D, 0xDD7E,      0,      0, 0xDE21, 0xDE22,
-      0, 0x4870,      0, 0xDE23, 0x3543,      0, 0xDE24, 0x4434,
-};
-const unsigned short utf8_to_euc_E8AB[] = {
-      0,      0, 0x6B5B, 0xDE25, 0x6B59,      0, 0xDE26, 0x434C,
- 0xDE27, 0xDE28, 0xDE29, 0x4041, 0x3452, 0x6B5A,      0, 0x3F5B,
-      0, 0xDE2A, 0x4E4A, 0xDE2B, 0xDE2C, 0xDE2D, 0x4F40, 0xDE2E,
-      0,      0, 0x6B5C, 0x6B67, 0x4435, 0xDE2F, 0x6B66, 0xDE30,
- 0x6B63, 0x6B6B, 0x6B64,      0, 0x6B60,      0, 0x447C, 0x6B5F,
-      0,      0,      0, 0x6B5D, 0xDE31, 0x4D21, 0x3B70,      0,
- 0xDE32, 0x6B61,      0, 0x6B5E, 0xDE33, 0xDE34, 0xDE35, 0x6B65,
- 0x3D74,      0, 0x3841,      0, 0xDE36,      0, 0x427A, 0xDE37,
-};
-const unsigned short utf8_to_euc_E8AC[] = {
- 0x4B45, 0x315A, 0x3062,      0, 0x4625, 0xDE38, 0xDE39, 0x6B69,
-      0,      0, 0xDE3F, 0xDE3A, 0x6B68,      0, 0x4666,      0,
- 0x6B6D, 0xDE3B,      0,      0, 0x6B62,      0, 0x6B6C, 0x6B6E,
-      0, 0x382C, 0x6B6A, 0x3956, 0xDE3C, 0x3C55, 0xDE3D, 0xDE3E,
- 0x6B6F, 0x4D58,      0,      0,      0,      0, 0x6B72,      0,
- 0x6B75,      0,      0, 0x6B73, 0x4935, 0xDE40,      0,      0,
- 0xDE41,      0,      0, 0x6B70,      0,      0,      0, 0xDE42,
-      0, 0x3660,      0,      0, 0xDE43,      0, 0x6B74,      0,
-};
-const unsigned short utf8_to_euc_E8AD[] = {
-      0, 0x6B76, 0xDE44, 0xDE45, 0xDE46, 0xDE47, 0xDE48,      0,
- 0xDE49, 0x6B7A,      0,      0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
-      0,      0, 0xDE4A, 0xDE4B, 0xDE4C,      0, 0x6B7B,      0,
- 0x3C31, 0xDE4D, 0x6B7D, 0x6B7C, 0x4968,      0, 0xDE4F, 0x6C21,
-      0,      0,      0, 0xDE50,      0,      0, 0x3759,      0,
-      0,      0,      0, 0x6B7E, 0x6C22, 0xDE51,      0, 0x6C23,
- 0x3544, 0x6641, 0x3E79,      0, 0x6C24,      0, 0xDE52, 0x386E,
- 0xDE53, 0xDE54,      0,      0, 0xDE55, 0x6C25, 0xDE56, 0xF466,
-};
-const unsigned short utf8_to_euc_E8AE[] = {
- 0x6C26, 0xDE57,      0, 0x3B3E, 0xDE58, 0xDE59,      0,      0,
-      0,      0, 0x5A4E, 0xDE5A, 0x6C27, 0xDE5B, 0x6C28, 0xDE5C,
- 0x3D32,      0, 0x6C29, 0x6C2A, 0xDE5D, 0xDE5E, 0x6C2B,      0,
-      0, 0x6C2C, 0x6C2D,      0, 0xDE5F,      0, 0xDE60, 0xDE61,
-      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,
-};
-const unsigned short utf8_to_euc_E8B0[] = {
-      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, 0x432B,
- 0xDE62, 0xDE63, 0x6C2E,      0,      0, 0xDE64, 0xDE65, 0x6C30,
-};
-const unsigned short utf8_to_euc_E8B1[] = {
-      0, 0x6C2F,      0,      0,      0, 0xDE66, 0x4626, 0xDE67,
- 0x6C31, 0xDE68, 0x4B2D, 0xDE69, 0x6C32,      0, 0x6C33, 0xDE6A,
- 0x6C34, 0xDE6B,      0, 0xDE6C, 0xDE6D, 0x6C35,      0, 0xDE6E,
- 0xDE6F, 0xDE72, 0x465A, 0xDE70,      0, 0xDE71,      0,      0,
-      0, 0x3E5D, 0x6C36, 0xDE73, 0xDE74,      0, 0xDE75,      0,
- 0xDE76, 0xDE77, 0x396B, 0x502E, 0x6C37, 0xDE78,      0,      0,
-      0,      0,      0, 0xDE79,      0, 0xDE7A, 0xDE7B,      0,
- 0x6C38, 0x493F, 0x6C39, 0xDE7C, 0x6C41,      0, 0xDE7D,      0,
-};
-const unsigned short utf8_to_euc_E8B2[] = {
-      0,      0, 0x6C3A,      0,      0, 0x6C3C, 0xDE7E, 0xDF21,
-      0, 0x6C3B, 0x6C3D, 0xDF22, 0x4B46, 0x6C3E, 0x6C3F,      0,
- 0xDF23,      0, 0xDF24, 0xDF25, 0x6C40,      0,      0,      0,
- 0x6C42, 0xDF26,      0, 0xDF27, 0xDF28, 0x332D, 0x4467,      0,
- 0x4969, 0x3A62, 0x3957,      0, 0xDF29,      0,      0, 0x494F,
- 0x325F, 0x484E, 0x6C45, 0x3453, 0x4055, 0x6C44, 0x6C49, 0x4379,
- 0x4C63,      0, 0x6C47, 0x6C48, 0x352E,      0, 0x6C4A, 0x4763,
- 0x425F, 0xDF2A, 0xDF2B, 0x4871, 0x453D, 0x6C46,      0, 0x4B47,
-};
-const unsigned short utf8_to_euc_E8B3[] = {
- 0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 0xDF2C, 0xDF2D, 0x3B71,
- 0x6C4B, 0xDF2E, 0x4231, 0xDF2F,      0, 0x6C5C, 0x4128, 0xDF30,
-      0, 0x4678,      0, 0x4950,      0, 0xDF32, 0xDF31,      0,
-      0, 0xDF33, 0x6C4F, 0x3B3F, 0x3B72, 0xDF34, 0x3E5E,      0,
- 0x4765, 0xDF35, 0x382D, 0x6C4E, 0x6C4D,      0, 0x496A,      0,
- 0xDF36,      0, 0x3C41,      0, 0xDF37, 0x4552,      0, 0xDF38,
- 0xDF39,      0, 0xDF3A,      0, 0xF467, 0xDF3B,      0, 0xDF3C,
- 0xDF3D,      0, 0x6C51, 0x6C52, 0x3958, 0x6C50, 0xDF3E, 0xDF3F,
-};
-const unsigned short utf8_to_euc_E8B4[] = {
-      0, 0xDF40,      0, 0xDF41, 0x6C53, 0x6C54,      0, 0x6C56,
- 0x4223, 0xDF42, 0x6C55, 0x3466,      0, 0x6C58,      0, 0x6C57,
- 0x6C59,      0, 0xDF43, 0x6C5B, 0x6C5D,      0, 0x6C5E, 0xDF44,
-      0,      0,      0, 0xDF45,      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,
-};
-const unsigned short utf8_to_euc_E8B5[] = {
-      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, 0x4056, 0xDF46, 0x3C4F, 0x6C5F,
-      0, 0xDF47,      0, 0x3352, 0xDF48, 0x6C60, 0xDF49,      0,
- 0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0, 0xF468, 0x352F,
-      0,      0,      0,      0,      0,      0,      0, 0xDF4A,
-};
-const unsigned short utf8_to_euc_E8B6[] = {
-      0, 0x6C63, 0xDF4B,      0, 0xDF4C, 0x4436,      0,      0,
- 0xDF4D,      0, 0x315B,      0,      0, 0xDF4E,      0,      0,
- 0xDF4F, 0xDF50,      0,      0,      0, 0xDF51,      0,      0,
-      0, 0x6C64,      0,      0,      0,      0, 0xDF52, 0xDF53,
- 0xDF54,      0,      0, 0x3C71,      0,      0, 0xDF55,      0,
- 0x3F76,      0,      0, 0xDF56, 0xDF57,      0,      0, 0xDF58,
-      0,      0, 0xDF59, 0x422D,      0, 0xDF5A,      0, 0xDF5B,
-      0, 0xDF5C, 0x6C67, 0xDF5D, 0xDF6F,      0, 0x6C66,      0,
-};
-const unsigned short utf8_to_euc_E8B7[] = {
- 0xDF5E,      0, 0x6C65,      0,      0, 0xDF5F, 0xDF60, 0xDF61,
- 0xDF62,      0, 0xDF63, 0x6C6D, 0x6C6B,      0, 0xDF64, 0x6C68,
-      0, 0xDF65,      0,      0, 0xDF66, 0xDF67, 0x6C6A, 0xDF68,
-      0, 0xDF69, 0x6C69, 0x6C6C,      0, 0x3577,      0, 0x6C70,
-      0, 0x4057,      0, 0x6C71, 0xDF6A, 0xDF6B,      0, 0xDF6C,
- 0x3859,      0, 0x6C6E, 0x6C6F, 0xDF6D,      0,      0, 0x4F29,
- 0xDF6E, 0xDF70, 0xDF71, 0x4437, 0xDF72, 0x4129,      0,      0,
-      0,      0,      0,      0, 0x6C72, 0xDF73,      0, 0x6C75,
-};
-const unsigned short utf8_to_euc_E8B8[] = {
-      0, 0xDF74,      0,      0, 0xDF75, 0xDF76, 0xDF77,      0,
- 0x6C73, 0x6C74, 0x4D59, 0xDF78,      0,      0,      0, 0x4627,
- 0x6C78, 0xDF79,      0,      0, 0xDF7A,      0, 0xDF7B,      0,
-      0,      0,      0,      0,      0, 0x6C76, 0x6C77, 0x6C79,
- 0xDF7C, 0xDF7D, 0xDF7E, 0xE021,      0,      0, 0xE022, 0xE023,
-      0,      0, 0x6D29,      0,      0,      0,      0,      0,
- 0x6C7C, 0xE024,      0, 0xE025, 0x6C7D, 0x6C7B, 0xE026, 0xE027,
- 0xE028, 0xE029,      0,      0,      0, 0xE02A,      0,      0,
-};
-const unsigned short utf8_to_euc_E8B9[] = {
- 0xE02B, 0xE02C, 0x6C7A,      0, 0x447D,      0,      0, 0x6D21,
- 0x6D25, 0x6D22, 0x6C7E, 0xE02D, 0x6D23, 0xE02E, 0xE02F, 0xE030,
- 0x6D24,      0,      0,      0, 0xE031, 0x6D2B,      0,      0,
-      0, 0x6D26,      0, 0xE032, 0xE033, 0xE034, 0xE035, 0x4058,
- 0x6D28, 0xE036, 0xE037, 0x6D2A, 0x6D27,      0,      0,      0,
-      0, 0xE038,      0,      0, 0xE039, 0xE03A,      0, 0xE03B,
- 0xE03C, 0xE03D, 0x6D2D,      0, 0x3D33,      0, 0x6D2C,      0,
-      0, 0xE03E, 0xE03F, 0xE040, 0x6D2E,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E8BA[] = {
-      0, 0x6D2F, 0xE041, 0xE042, 0x6D32, 0x6D31,      0, 0x6D30,
-      0, 0xE043, 0x6D34, 0x6D33,      0, 0x4C76,      0,      0,
- 0xE044, 0x6D36, 0xE045, 0x6D35, 0x6D37, 0xE046,      0,      0,
-      0, 0x6D38, 0xE047, 0xE048,      0, 0xE049, 0xE04A,      0,
-      0, 0x6D3A, 0xE04B,      0,      0,      0,      0, 0xE04C,
-      0, 0xE04D, 0x6D39, 0x3F48, 0x6D3B, 0xE04E, 0xE04F, 0x366D,
- 0x6D3C, 0x6D3E,      0, 0xE050,      0, 0xE051,      0,      0,
-      0,      0, 0xE052, 0xE053,      0,      0, 0x6D3F,      0,
-};
-const unsigned short utf8_to_euc_E8BB[] = {
- 0xE054, 0xE055,      0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
- 0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0, 0xE059,
-      0, 0xE05A, 0x382E,      0, 0xE05B,      0,      0,      0,
-      0,      0,      0, 0x6D43, 0xE05C,      0,      0, 0x4670,
-      0,      0, 0x453E, 0x6D44,      0,      0,      0,      0,
- 0xE05D,      0,      0, 0x6D47,      0, 0xE064, 0xE05E,      0,
- 0xE05F, 0xE060,      0,      0,      0,      0,      0, 0xE061,
- 0x3C34, 0xE062, 0xE063, 0x6D46, 0x6D45, 0x375A, 0x6D48,      0,
-};
-const unsigned short utf8_to_euc_E8BC[] = {
- 0xE065,      0, 0xE066, 0x3353,      0, 0x6D4A,      0, 0xE067,
- 0xE068, 0x3A5C, 0x6D49,      0, 0x6D52,      0,      0, 0xE069,
- 0xE06A,      0, 0x6D4C, 0x6D4E, 0x4A65, 0x6D4B, 0xE06B, 0xE06C,
- 0xE06D, 0x6D4D,      0, 0x6D51, 0x6D4F, 0x3531, 0xE06E, 0x6D50,
- 0xE06F, 0xE070,      0, 0xE071,      0, 0xE072, 0x6D53, 0xE073,
- 0xE074, 0x475A, 0x4E58,      0, 0xE075, 0xE076, 0xE077, 0x3D34,
-      0,      0,      0, 0x6D54, 0xE078, 0xE079, 0xE07A, 0xE07B,
- 0x4D22, 0x6D56, 0xE07C, 0x6D55,      0,      0, 0x6D59, 0x4D41,
-};
-const unsigned short utf8_to_euc_E8BD[] = {
- 0xE07D, 0xE07E, 0x6D58, 0xE121, 0x336D, 0x6D57, 0x6D5C, 0xE122,
-      0, 0x6D5B,      0,      0, 0x6D5A, 0x4532, 0x6D5D, 0xE123,
-      0, 0xE124, 0xE125, 0xE126, 0xE127, 0xE128,      0, 0x6D5E,
- 0xE129,      0,      0,      0, 0x6D5F, 0xE12A, 0xE12B, 0x396C,
-      0, 0x3725, 0x6D60, 0x6D61, 0x6D62, 0xE12C,      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,
-};
-const unsigned short utf8_to_euc_E8BE[] = {
-      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, 0x3F49, 0x6D63, 0xE12D, 0x3C2D, 0x6D64,
- 0xE12E, 0xE12F,      0, 0x6D65, 0xE130, 0xE131, 0xE132, 0x5221,
- 0x517E,      0,      0,      0,      0, 0x6D66, 0x6570, 0x6D67,
- 0x4324, 0x3F2B, 0x4740,      0,      0, 0xE133, 0xE134, 0x6D68,
- 0xE135,      0, 0x4A55, 0x4454, 0x397E,      0, 0xE136, 0x4329,
-};
-const unsigned short utf8_to_euc_E8BF[] = {
- 0xE137, 0xE138, 0x312A,      0, 0x4B78, 0x3F57, 0xE139,      0,
-      0,      0, 0xE13A, 0xE13B,      0, 0xE13C, 0x375E,      0,
- 0xE13D, 0x3661, 0xE13E, 0xE13F, 0x4A56, 0xE140,      0,      0,
-      0,      0, 0x6D69,      0,      0,      0,      0,      0,
- 0xE141,      0, 0x6D6B, 0xE142, 0xE143, 0x6D6A, 0x3260,      0,
- 0xE144, 0x4676, 0x6D6C, 0x4777,      0, 0x4533, 0xE145, 0x6D6D,
- 0x3D52, 0xE146,      0,      0, 0x6D6F, 0xE147, 0xE148, 0x4C42,
- 0x6D7E, 0x6D71, 0x6D72, 0xE149,      0, 0x4449, 0xE14A,      0,
-};
-const unsigned short utf8_to_euc_E980[] = {
- 0x4260, 0x4177, 0xE14B, 0x4628, 0xE14C, 0x6D70, 0x3555,      0,
- 0xE14D,      0,      0, 0x6D79, 0xE14E, 0x6D76, 0x6E25, 0x4629,
- 0x4360, 0x6D73,      0, 0x447E, 0x4553, 0x6D74, 0x6D78, 0x3F60,
- 0xE14F, 0x4767, 0x444C, 0xE150,      0, 0x4042, 0x6D77, 0x422E,
- 0x4224, 0x6D75, 0x3029, 0x4F22,      0,      0,      0, 0x6D7A,
- 0xE151, 0xE152, 0xE154,      0, 0xE155, 0xE156, 0x4261, 0xE153,
-      0, 0x3D35, 0x3F4A, 0xE157, 0xE158, 0x6D7C, 0x6D7B, 0xE159,
- 0x306F, 0x6D7D,      0,      0, 0x492F,      0, 0x6E27, 0xE15A,
-};
-const unsigned short utf8_to_euc_E981[] = {
-      0, 0x465B, 0x3F6B, 0xE15B, 0xE15C, 0x4359,      0, 0x3678,
-      0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
- 0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28,      0,
- 0x6E29, 0x7423,      0, 0xE15E, 0x423D, 0xE15F, 0x6E2A,      0,
- 0x3173, 0x414C, 0xE160, 0x382F,      0, 0x4D5A, 0xE161, 0xE162,
- 0x6E2B, 0x452C,      0,      0, 0xE163, 0x4178, 0x3C57, 0x6E2C,
- 0xE164,      0, 0x6E2F,      0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
- 0x412A, 0xE166, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872,
-};
-const unsigned short utf8_to_euc_E982[] = {
- 0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 0xE167,      0, 0x6D6E,
- 0xE168, 0x6E35, 0x6E34, 0xE169, 0xE16A,      0, 0xE16B, 0x6E36,
- 0xE16C, 0x4D38,      0,      0,      0, 0xE16D,      0, 0xE16E,
- 0xE16F, 0xE170,      0, 0xE171,      0,      0,      0,      0,
- 0xE172, 0xE173, 0xE174, 0x4661,      0, 0xE175, 0x4B2E,      0,
- 0x6E37,      0, 0x3C59,      0,      0,      0,      0, 0x6E38,
- 0xE176, 0x6E39, 0xE177, 0xE178, 0xE179, 0x6E3A, 0xE17A,      0,
- 0x4521,      0,      0,      0,      0, 0xE17B, 0xE17D,      0,
-};
-const unsigned short utf8_to_euc_E983[] = {
-      0, 0x306A,      0, 0xE17E, 0xE221, 0xE222,      0, 0xE223,
- 0xE224,      0, 0x3959,      0, 0xE17C,      0, 0x4F3A,      0,
-      0,      0, 0xE22D,      0,      0, 0xE225,      0, 0xE226,
- 0xE227, 0xE228,      0, 0x6E3E, 0xE229, 0xE22A, 0xF46C, 0xE22B,
-      0, 0x3734, 0x6E3B,      0, 0x6E3C, 0xE22C,      0,      0,
- 0x4974,      0,      0, 0xE22F,      0, 0x3354,      0, 0xE230,
- 0xE231,      0,      0,      0, 0xE232, 0x4D39, 0xE22E, 0x363F,
-      0,      0,      0,      0,      0, 0x4554, 0xE233, 0xE234,
-};
-const unsigned short utf8_to_euc_E984[] = {
- 0xE235,      0, 0x6E3F,      0, 0xE236, 0xE237, 0xE238,      0,
- 0xE239,      0,      0,      0,      0, 0xE23A,      0,      0,
- 0xE23B,      0, 0x6E40,      0, 0xE23C, 0xF46E, 0xE23D, 0xE23E,
- 0xE23F, 0x6E41, 0xE240,      0, 0xE241,      0, 0xE242,      0,
- 0xE243,      0, 0xE245, 0xE246,      0, 0xE244,      0, 0xE247,
-      0, 0xE248,      0,      0,      0, 0x4522, 0xE249, 0xE24A,
- 0x6E43, 0xE24B, 0x6E42,      0, 0xE24C,      0, 0xE24D, 0xE24E,
-      0, 0xE24F, 0xE250,      0, 0xE251, 0xE252,      0,      0,
-};
-const unsigned short utf8_to_euc_E985[] = {
-      0,      0,      0, 0xE253,      0,      0,      0, 0xE254,
- 0xE255, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 0xE256,
-      0,      0, 0x3C72, 0xE257, 0x3F6C,      0, 0x6E45, 0xE258,
- 0x6E46, 0xE259, 0xE25A, 0xE25B,      0,      0,      0,      0,
-      0, 0xE25C, 0x3F5D, 0x6E47, 0xE25D, 0x6E48,      0, 0xE25E,
-      0, 0x6E49, 0x4D6F,      0, 0x3D37, 0xE25F,      0,      0,
-      0,      0, 0x6E4B, 0x6E4A, 0xE260, 0x395A,      0, 0x3973,
- 0x3B40, 0xE261, 0xE262, 0xE263,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E986[] = {
-      0, 0xE264, 0x6E4E, 0xE265,      0, 0xE266, 0xE267, 0x3D66,
-      0, 0x6E4D, 0xE268, 0x6E4C,      0, 0x4269, 0xE269,      0,
- 0x386F, 0xE26A, 0x4043, 0xE26B, 0xE26C, 0xE26D,      0, 0x4830,
- 0xE26E,      0,      0,      0, 0x3D39,      0, 0xE26F,      0,
-      0, 0xE270, 0x6E4F,      0, 0x3E5F,      0, 0xE271,      0,
- 0xE272,      0, 0x6E52, 0x6E50, 0xE273, 0xE274, 0xE275, 0x6E51,
- 0xE276, 0xE277, 0xE278, 0xE279, 0x6E54, 0x6E53, 0xE27A,      0,
- 0x3E7A,      0, 0x6E55, 0xE27B, 0xE27C, 0xE27D,      0, 0xE27E,
-};
-const unsigned short utf8_to_euc_E987[] = {
- 0x6E56, 0x6E57, 0xE321, 0xE322,      0, 0xE323, 0x4850, 0x3A53,
- 0x3C61, 0x6E58,      0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
- 0x6E5A, 0x3662,      0, 0xE324, 0xE325,      0, 0x6E5B, 0xE326,
- 0x4523, 0xE327, 0xE328, 0x6E5E, 0x3378, 0x3F4B, 0xE329, 0x6E5C,
-      0, 0x6E5D,      0, 0x4460, 0xE32A, 0xE32B, 0x4B55, 0x367C,
-      0, 0xE32C, 0xE32D,      0, 0xE32E, 0xE32F, 0xE330, 0xE331,
- 0xE332, 0xE333,      0,      0,      0, 0x6E60, 0x6E61, 0xE334,
-      0, 0xE335,      0, 0xE336, 0x6E5F, 0xE337,      0, 0x6E63,
-};
-const unsigned short utf8_to_euc_E988[] = {
- 0xE338, 0xE339,      0,      0, 0xE33A, 0xE33B, 0xE33C, 0xE33D,
-      0, 0xE33E, 0xE33F,      0, 0xE340, 0x465F, 0x3343,      0,
- 0xE341, 0x6E67, 0xE342, 0xE343, 0x6E64, 0x6E66, 0xE344,      0,
- 0xE345,      0,      0,      0, 0xE346, 0xE347, 0x6E62,      0,
-      0,      0,      0, 0xE348, 0xE349, 0xE34A, 0xE34B,      0,
- 0xE34C, 0x6F4F,      0,      0, 0x6E65,      0, 0xE34D, 0xE34E,
- 0xE34F,      0,      0, 0xE350, 0x4E6B, 0xE351, 0xE352, 0x385A,
- 0xE353, 0xE354, 0xE355,      0, 0xE356,      0, 0xE357, 0x6E6F,
-};
-const unsigned short utf8_to_euc_E989[] = {
- 0xE358,      0, 0xE359, 0xE35A, 0x4534, 0x6E6A, 0xE35B, 0xE35C,
- 0x6E6D, 0x6E6B, 0xE35D, 0x6E70,      0, 0xE35E, 0xE35F, 0xE360,
- 0x6E71, 0xE361,      0,      0,      0,      0,      0, 0x6E69,
- 0xE362, 0xE363, 0x6E76, 0x3174, 0xE364, 0xE365, 0x6E68,      0,
- 0xE366, 0xE367, 0x482D,      0, 0x6E6C, 0xE368, 0x3E60, 0xE369,
- 0xE36A, 0xE36B,      0,      0,      0,      0, 0xE36C, 0xE36D,
- 0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370, 0xE371,
- 0xE372, 0xE373,      0, 0xE374, 0xE375, 0xE376, 0x4B48, 0xE377,
-};
-const unsigned short utf8_to_euc_E98A[] = {
- 0x3664,      0,      0, 0x3D46,      0, 0x463C,      0,      0,
- 0xE378, 0xE379, 0xE37A,      0,      0, 0xE37B, 0xE37C,      0,
-      0, 0x412D, 0xE37D, 0x6E74,      0, 0x6E6E, 0x6E73, 0xE37E,
- 0x4C43, 0xE421, 0x4438, 0x6E75, 0x6E72,      0,      0, 0xE422,
- 0xE423,      0,      0,      0, 0xE424, 0xE425,      0, 0xE426,
- 0xE427,      0,      0, 0xE428,      0, 0x412C,      0, 0xE429,
-      0,      0, 0xE42A,      0,      0,      0, 0xE42B, 0x6E79,
- 0xE42C, 0x6E78, 0xE42D, 0xE42E, 0xE42F, 0xE430,      0, 0xE431,
-};
-const unsigned short utf8_to_euc_E98B[] = {
- 0xE432, 0xE433, 0xE434, 0xE435,      0, 0xE436, 0xE437, 0xE438,
- 0xE439,      0,      0, 0xE43A, 0xE43B, 0xE43C, 0xE43D, 0x6E77,
- 0xE43E,      0, 0x4B2F, 0xE43F,      0, 0xE440,      0, 0xE441,
- 0xE442, 0xE443,      0,      0, 0xE444, 0xE445,      0, 0xE446,
- 0xE447, 0xE448,      0, 0xE449, 0x3D7B, 0xE44A,      0, 0xE44B,
- 0xE44C, 0x6E7A, 0x4A5F,      0, 0xE44D, 0x3154, 0xE44E,      0,
- 0xE44F,      0, 0x4946, 0x4372,      0,      0,      0,      0,
- 0x3578, 0xE450, 0x6E7C, 0xE451, 0x395D,      0,      0, 0xE452,
-};
-const unsigned short utf8_to_euc_E98C[] = {
- 0xE453,      0, 0xE454,      0,      0,      0, 0x3B2C,      0,
- 0xE455,      0,      0,      0,      0, 0xE456,      0, 0x6E7B,
- 0x3F6D, 0xE457,      0,      0, 0xE458, 0xE459,      0,      0,
- 0x3F6E, 0x6F21, 0x6F23,      0, 0xE45A, 0xE45B, 0xE45C, 0xE45D,
- 0x3E7B, 0xE45E, 0x6F22, 0x6F24, 0xE45F, 0xE460, 0x3653, 0xE461,
- 0x4945, 0xE462, 0xE463, 0x3C62, 0x4F23,      0, 0x6E7E, 0x3A78,
-      0,      0, 0x4F3F, 0xE464, 0xE465, 0x6F26, 0xE466, 0xE467,
-      0,      0, 0x6F25, 0x6F27,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E98D[] = {
-      0,      0,      0,      0, 0x6E7D,      0,      0, 0xE468,
- 0xE469, 0xE46A,      0, 0x4669,      0, 0x4555,      0,      0,
- 0xE46B, 0xE46C, 0xE46D,      0, 0x4457, 0xE46E, 0x6F2C, 0xE46F,
- 0xE470,      0, 0xE471, 0x4343, 0x6F28,      0, 0xE472,      0,
- 0x6F29,      0,      0,      0, 0xE473, 0xE474,      0, 0xE475,
-      0, 0xE476, 0xE477,      0, 0x372D, 0xE478, 0x6F2B, 0xE479,
- 0xE47A, 0xE47B,      0, 0xE47C, 0xE47D, 0x3830, 0xE47E,      0,
-      0,      0, 0xE521,      0, 0x6F2A, 0xE522, 0x3E61, 0xE523,
-};
-const unsigned short utf8_to_euc_E98E[] = {
- 0xE524, 0xE525, 0xE526,      0,      0,      0,      0,      0,
- 0xE527,      0, 0xE528, 0xE529, 0x3379, 0xE52A,      0, 0xE52B,
-      0,      0, 0xE52C,      0, 0x6F30, 0xE52D, 0x3A3F, 0x4179,
- 0xE52E,      0, 0x444A, 0xE52F,      0,      0, 0xE530,      0,
-      0, 0xE531,      0, 0xE532, 0xE533,      0, 0xE534, 0x333B,
- 0xE535, 0xE53B,      0, 0xE536, 0x6F2E, 0x6F2F, 0x4443,      0,
- 0x6F2D,      0,      0,      0, 0xE537, 0xE538, 0xE539,      0,
-      0, 0x6F31, 0xE53A,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E98F[] = {
-      0, 0xE53C,      0, 0x6F37, 0xE53D, 0xE53E, 0xE53F, 0xE540,
- 0x6F3A, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545,      0,      0,
- 0x6F39, 0x452D,      0, 0xE546,      0,      0, 0x6F32, 0x6F33,
- 0x6F36, 0xE547,      0,      0, 0xE548, 0x6F38, 0xE549, 0xE54A,
-      0, 0x3640, 0xE54B,      0, 0x6F3B, 0x6F35, 0xE54C, 0xE54D,
- 0x6F34,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xE54F,
- 0xE550, 0xE54E, 0xE551, 0xE552,      0, 0xE553,      0,      0,
-};
-const unsigned short utf8_to_euc_E990[] = {
-      0, 0xE554, 0xE555, 0x6F3F, 0xE556,      0,      0, 0x6F40,
- 0xE557, 0xE558,      0,      0,      0, 0xE559, 0xE55A, 0xE55B,
- 0x6F41,      0,      0, 0x6F3E, 0x6F3D, 0xE55C, 0xE55D, 0xE55E,
- 0x3E62, 0x462A, 0x6F3C,      0,      0,      0,      0, 0xE55F,
-      0, 0x6F45,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x6F43,      0,      0, 0xE560, 0xE561,
-      0, 0xE562, 0xE563, 0xE564, 0xE565, 0x6F44, 0x6F42,      0,
- 0x4278,      0, 0x6F46, 0xE566,      0, 0xE568,      0, 0xE567,
-};
-const unsigned short utf8_to_euc_E991[] = {
-      0, 0x6F47,      0, 0xE569, 0x6F49, 0xE56A,      0,      0,
- 0xE56B,      0, 0xE56C,      0, 0xE56D,      0,      0,      0,
-      0, 0x3455, 0x6F48, 0x4C7A,      0, 0xE56E,      0,      0,
-      0, 0xE56F, 0x6F54, 0x6F4A, 0xE570,      0, 0x6F4D, 0xE571,
- 0x6F4B, 0xE572, 0x6F4C, 0xE573,      0,      0,      0,      0,
- 0xE574,      0, 0x6F4E, 0xE575,      0, 0xE576, 0xE577, 0xE578,
- 0x6F50, 0xE579, 0xE57A,      0,      0, 0x6F51,      0, 0x6F52,
-      0,      0,      0,      0, 0x6F55, 0x6F53, 0x6F56, 0x6F58,
-};
-const unsigned short utf8_to_euc_E992[] = {
-      0, 0x6F57,      0, 0xE57C, 0xE57B,      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,
-};
-const unsigned short utf8_to_euc_E995[] = {
-      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, 0x4439,
- 0xE57D, 0xE57E,      0,      0,      0,      0, 0xE621,      0,
-};
-const unsigned short utf8_to_euc_E996[] = {
- 0x4C67,      0, 0x6F59, 0x412E, 0xE622,      0,      0, 0x6F5A,
- 0xE623, 0x4A44, 0x6F5B, 0x332B, 0xE624, 0xE625, 0xE626, 0x313C,
-      0, 0x3457, 0xF471, 0x3456, 0x6F5C,      0, 0x6F5D,      0,
- 0x6F5E, 0x6F5F,      0,      0,      0, 0xE627, 0xE628, 0xE629,
- 0x6F60, 0xE62A, 0x3458, 0x3355, 0x395E, 0x4836, 0xE62B, 0x6F62,
- 0x6F61, 0xE62C,      0, 0xE62D, 0xE62E, 0x6F63,      0,      0,
-      0,      0, 0x315C,      0, 0xE62F,      0, 0xE630,      0,
-      0, 0x6F66, 0xE631, 0x6F65, 0x6F64, 0xE632, 0x6F67, 0xE633,
-};
-const unsigned short utf8_to_euc_E997[] = {
-      0,      0,      0, 0x6F6A,      0,      0, 0xE634, 0x3047,
- 0xE635, 0xE636, 0x6F68, 0xE637, 0x6F6C, 0x6F6B,      0,      0,
- 0xE638, 0xE639, 0xE63A, 0xE63B, 0x6F6E, 0x6F6D, 0x6F6F,      0,
- 0x462E, 0xE63C, 0xE63D,      0, 0x6F70, 0xE63E, 0xE63F, 0xE640,
- 0xE641, 0x6F71, 0x6F73,      0, 0xE642, 0x6F72, 0xE643,      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,
-};
-const unsigned short utf8_to_euc_E998[] = {
-      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, 0x496C, 0xE644, 0xE645,      0,
-      0, 0x6F74, 0xE646,      0, 0xE647, 0xE648, 0xE649,      0,
- 0x6F75,      0, 0x3A65,      0, 0xE64A,      0, 0x6F76, 0x6F77,
-      0, 0xE64B, 0x4B49, 0xE64C,      0,      0,      0, 0xE64D,
- 0xE64E, 0xE64F, 0xE650, 0x414B, 0xE651, 0xE652,      0, 0x3024,
-};
-const unsigned short utf8_to_euc_E999[] = {
- 0x424B, 0xE653, 0x6F78,      0, 0x496D,      0,      0,      0,
-      0,      0,      0, 0x6F7B, 0x6F79, 0x395F,      0, 0x6F7A,
- 0x3842,      0, 0xE654,      0, 0xE655,      0, 0xE656, 0xE657,
- 0xE658,      0,      0, 0x4A45, 0x6F7D, 0x7021, 0x6F7E, 0x7022,
-      0, 0xE659, 0x3121, 0x3F58, 0x3D7C, 0x3459, 0x7023,      0,
-      0,      0, 0x4766,      0, 0x7025,      0, 0xE65A,      0,
- 0x3122,      0, 0x7024, 0x4444, 0xE65B, 0x4E4D, 0x462B, 0x6F7C,
- 0x4E26,      0, 0x3831, 0xE65C, 0xE65D, 0x4D5B, 0xE65E, 0xE65F,
-};
-const unsigned short utf8_to_euc_E99A[] = {
-      0, 0xE660, 0xE661, 0xE662, 0xE663, 0x3679, 0x4E34,      0,
- 0x3728, 0xE664, 0x4262, 0x6721,      0, 0x7026, 0x332C, 0x3F6F,
-      0, 0xE665,      0,      0, 0x3356, 0x7028, 0xE666, 0x7029,
- 0x7027, 0x3764, 0xE667, 0x3A5D, 0x3E63, 0xE668,      0, 0xE669,
- 0x3123,      0,      0, 0x4E59, 0xE66A, 0xE66B, 0xE66C, 0x702B,
- 0x6E2E, 0xE66D, 0x702A,      0,      0,      0, 0xE66E, 0xE66F,
- 0x702E, 0x702C, 0x702D, 0xE670, 0x702F,      0, 0x7030, 0x4E6C,
- 0x7031, 0x7032, 0xE671, 0x4049, 0x483B,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E99B[] = {
- 0x3F7D, 0x3467,      0,      0, 0x4D3A, 0x326D, 0x3D38, 0x385B,
-      0, 0x7035, 0xE672, 0x7034, 0x3B73, 0x7036, 0x7033,      0,
-      0, 0x3B28, 0xE673,      0,      0, 0x703A, 0x6A2D,      0,
- 0xE675, 0x5256, 0xE676, 0x3F77, 0x7038, 0xE677, 0xE678, 0xE679,
-      0,      0, 0x4E25, 0x4671,      0,      0,      0,      0,
- 0x312B, 0xE67A, 0x4063, 0x3C36,      0,      0,      0, 0xE67B,
- 0x4A37, 0xE67C, 0x3140,      0,      0,      0, 0x4E6D, 0x4D6B,
-      0, 0x703B, 0xE67D, 0x4545,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E99C[] = {
- 0x3C7B,      0, 0xE67E, 0xE721, 0x703C, 0xE722, 0x703D, 0x3F4C,
- 0x703E, 0xE723, 0x4E6E,      0,      0, 0x7039, 0x7040, 0x7042,
-      0, 0x7041,      0, 0x703F,      0,      0, 0x7043,      0,
-      0, 0x7044, 0xE724, 0xE725, 0x417A, 0xE726, 0x3262,      0,
-      0, 0xE727, 0xE728, 0xE729, 0x7045,      0,      0, 0x4C38,
- 0xE72A,      0, 0x7046,      0,      0,      0,      0,      0,
- 0x7047, 0xE72B, 0x4F2A, 0xE72C,      0,      0,      0,      0,
- 0x5B31, 0x7048,      0, 0xF474,      0, 0x7049, 0x704A,      0,
-};
-const unsigned short utf8_to_euc_E99D[] = {
-      0, 0xE72D, 0x704E, 0xE72E, 0x704B,      0, 0x704C,      0,
- 0x704D, 0x704F, 0xE72F,      0,      0, 0xF475, 0xE730, 0xE731,
-      0, 0xF476, 0x4044,      0,      0, 0xE732, 0x4C77, 0xE733,
- 0xE734, 0x4045, 0xE735, 0xE736, 0x7050,      0, 0x4873,      0,
- 0x7051, 0x7353, 0x4C4C, 0xE737, 0x7052,      0, 0x7053, 0xE738,
- 0x7054, 0x3357, 0xE739, 0x7056,      0, 0x3F59, 0xE73A,      0,
-      0, 0x7057,      0, 0xE73B, 0x3724,      0, 0xE73C, 0xE73D,
- 0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740,      0, 0xE741,
-};
-const unsigned short utf8_to_euc_E99E[] = {
- 0xE742, 0x705B,      0,      0, 0x3373, 0x7059, 0x705D,      0,
-      0, 0xE743,      0, 0x705E,      0, 0x3048,      0, 0x705F,
- 0x7060,      0,      0,      0,      0, 0xE744, 0xE745, 0xE746,
- 0x3E64, 0xE747, 0xE748,      0, 0x7061,      0, 0xE749, 0xE74A,
- 0x3547,      0, 0xE74B, 0x7064,      0,      0, 0x7063,      0,
- 0x7062,      0,      0, 0x6B71, 0xE74C, 0x4A5C, 0xE74D,      0,
-      0, 0xE74E, 0xE74F, 0x7065, 0x7066, 0xE750, 0xE751,      0,
- 0xE752, 0xE753, 0xE754,      0, 0xE755,      0, 0xE756, 0xE757,
-};
-const unsigned short utf8_to_euc_E99F[] = {
-      0, 0xE758,      0, 0x7067, 0xE759, 0xE75A, 0x7068, 0xE75B,
- 0x7069, 0xE75C, 0xE75D, 0x706A, 0xE75E, 0xE75F, 0xE760,      0,
- 0xE761, 0xE762,      0, 0x345A, 0xE763,      0,      0, 0xE764,
- 0xE765, 0xE766,      0, 0xE76A, 0x706B, 0xE767, 0xE768,      0,
- 0xE769, 0xE76B,      0,      0, 0xE76C,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x706C, 0x4723, 0xE76D,
-      0, 0xE76E, 0x706E, 0x323B, 0xE76F, 0x7071, 0x7070, 0xE770,
- 0xE771,      0, 0xE772, 0x3124,      0,      0,      0, 0x3641,
-};
-const unsigned short utf8_to_euc_E9A0[] = {
-      0, 0x4A47, 0x443A, 0x3A22,      0, 0x3960, 0x3D67, 0xE773,
- 0x3F5C,      0, 0xE774,      0, 0x7073, 0xE776, 0xE777, 0x7072,
- 0x4D42, 0x3468, 0x4852, 0x465C, 0xE778,      0, 0xE779, 0x3F7C,
- 0x4E4E, 0xE775, 0x375B,      0, 0xE77A,      0, 0xE77B,      0,
- 0xE77C, 0x7076,      0, 0xE77D, 0x7075, 0xE828, 0xE77E,      0,
-      0,      0,      0, 0xE821, 0x4B4B, 0x462C, 0xE822, 0xE823,
- 0xE824,      0, 0xE825, 0xE826, 0x3150, 0xE827,      0, 0x7077,
- 0x7074,      0,      0, 0x4951, 0x4D6A, 0x7078, 0xE829,      0,
-};
-const unsigned short utf8_to_euc_E9A1[] = {
-      0,      0,      0,      0, 0xE82A,      0, 0x7079, 0xE82B,
-      0,      0, 0xE82C, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A,
-      0, 0xE82D, 0xE82E, 0xE82F, 0x3469, 0x3832, 0xE830, 0xE831,
- 0x346A, 0xE832, 0xE833, 0x453F,      0,      0, 0x4E60,      0,
-      0,      0, 0xE834, 0xE835,      0, 0xE836, 0xE837, 0x385C,
-      0,      0, 0xE838, 0x707C, 0xE839,      0,      0, 0x707D,
- 0x707E, 0x7121,      0, 0x7123, 0x7122,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E9A2[] = {
-      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,
- 0x4977,      0, 0x7124, 0xE83A,      0, 0xE83B, 0xE83C, 0x7125,
- 0xE83D, 0x7126,      0,      0, 0xE83E,      0, 0x7127, 0xE83F,
- 0xE840,      0, 0xE841, 0xE842,      0,      0,      0, 0xE843,
-};
-const unsigned short utf8_to_euc_E9A3[] = {
-      0,      0, 0xE844, 0x7129, 0x7128, 0xE845, 0x712A,      0,
- 0xE846,      0,      0,      0, 0xE847,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x4874, 0x664C,      0,      0, 0x3F29,
-      0, 0xE848, 0x3532, 0xE849,      0, 0xE84A, 0xE84B, 0xE84C,
-      0, 0x712B, 0xE84D, 0x712C,      0, 0x522C, 0x5D3B, 0x4853,
-      0,      0, 0x307B, 0xE84E, 0x303B,      0, 0xE84F,      0,
-      0,      0,      0,      0, 0x3B74, 0x4B30, 0x3E7E,      0,
-};
-const unsigned short utf8_to_euc_E9A4[] = {
-      0,      0, 0xE850, 0x712D,      0, 0x4C5F,      0, 0xE851,
- 0xE852, 0x712E, 0x4D5C,      0, 0x3142,      0,      0,      0,
- 0x3B41, 0xE853, 0x712F, 0x326E, 0x7130, 0xE854, 0xE855, 0xE856,
- 0x7131,      0, 0xE857, 0xE858, 0xE859, 0x7133, 0x7134, 0xE85A,
- 0x7136, 0x7132, 0xE85B,      0, 0x7135,      0, 0xE85C, 0xE85D,
- 0x345B,      0,      0, 0xE85E, 0x7137,      0, 0x7138,      0,
-      0, 0xE85F, 0xE860, 0xE861, 0xE862, 0xE863,      0,      0,
-      0, 0xE864, 0xE865, 0xE866, 0xE867, 0x7139, 0x713A,      0,
-};
-const unsigned short utf8_to_euc_E9A5[] = {
- 0xE868, 0xE869, 0x713B,      0,      0, 0x713D, 0xE86A, 0xE86B,
- 0xE86C, 0x713C,      0, 0x713F, 0x7142, 0xE86D, 0xE86E,      0,
- 0x713E, 0x7140, 0x7141,      0, 0xE86F, 0x7143,      0, 0x3642,
- 0xE870, 0xE871,      0, 0xE872, 0xE873,      0, 0xE874, 0xE875,
- 0xE876,      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,
-};
-const unsigned short utf8_to_euc_E9A6[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x3C73, 0x7144,
- 0x7145, 0x3961,      0, 0xE877,      0, 0xE878, 0xF47A, 0xE879,
-      0,      0,      0,      0,      0, 0x7146, 0xE87A,      0,
- 0x333E,      0,      0,      0, 0x474F, 0x7147, 0x7148,      0,
- 0xE87B, 0xE87C, 0xE87D, 0x435A, 0x466B, 0xE87E,      0,      0,
-      0, 0xE921, 0xE922,      0, 0x7149, 0xE923,      0, 0xE924,
-};
-const unsigned short utf8_to_euc_E9A7[] = {
-      0, 0x477D,      0, 0xE925, 0x424C, 0x3158, 0x366E,      0,
- 0x366F, 0xE926,      0,      0,      0,      0,      0,      0,
- 0x4373, 0x714E, 0x3670, 0xE927, 0xE928, 0x326F,      0,      0,
- 0x714D, 0xE929, 0xE92A, 0x714B, 0xE92B, 0x714C, 0xE92C, 0x714A,
-      0,      0, 0x7158,      0,      0,      0,      0, 0xE92D,
-      0,      0, 0xE92E, 0xE92F, 0xE930, 0x714F, 0x7150,      0,
- 0xE931, 0x7151, 0x7152,      0, 0xE932, 0xE933,      0,      0,
- 0x7154, 0xE934,      0, 0x7153,      0, 0xE935, 0xE936, 0x3D59,
-};
-const unsigned short utf8_to_euc_E9A8[] = {
-      0, 0x7155, 0xE937, 0xE938, 0xE939, 0x7157,      0,      0,
-      0,      0,      0, 0xE93A, 0xE93B,      0, 0x3533, 0x7156,
- 0xE93C, 0xE93D, 0x417B, 0x3833,      0,      0, 0xE93E,      0,
-      0, 0x7159,      0,      0,      0,      0, 0xE93F,      0,
- 0xE940,      0, 0xE941, 0xE942, 0xE943,      0,      0, 0xE944,
- 0x424D,      0,      0, 0x715A,      0, 0xE945, 0xE946,      0,
- 0x462D,      0,      0, 0xE947,      0, 0xE948, 0xE949, 0x715B,
- 0xE94A,      0,      0,      0,      0,      0, 0x7160,      0,
-};
-const unsigned short utf8_to_euc_E9A9[] = {
- 0x715E, 0xE94C, 0x715D, 0x715F, 0xE94D, 0x715C,      0, 0xE94B,
-      0,      0, 0xE94E, 0xE94F, 0xE950, 0x7162, 0xE951,      0,
-      0, 0xE952,      0,      0, 0xE953, 0x7161, 0xE954, 0x7164,
-      0,      0, 0x3643, 0x7163,      0, 0xE955,      0, 0x7165,
-      0,      0, 0x7166,      0, 0x7168, 0x7167,      0,      0,
-      0, 0x7169, 0x716B, 0x716A,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E9AA[] = {
-      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,
- 0x397C,      0, 0xE956,      0, 0xE957, 0x716C, 0xE958, 0xE959,
- 0x716D,      0, 0xE95A,      0, 0xE95B, 0xE95C, 0xE95D,      0,
- 0x333C, 0xE95E,      0, 0xE95F, 0x716E,      0, 0xE960, 0xE961,
-};
-const unsigned short utf8_to_euc_E9AB[] = {
- 0x716F, 0xE962,      0, 0xE963, 0x3F71,      0, 0xE964,      0,
- 0xE965,      0,      0,      0,      0,      0, 0xE966, 0x7170,
- 0xE967, 0x7171, 0xE968, 0x7172, 0x7173, 0xE969, 0xE96A, 0xE96B,
- 0x3962, 0xF47B,      0, 0xE96C, 0xE96D,      0, 0x7174, 0x7175,
- 0xE96E,      0, 0x7176, 0x7177, 0xE96F, 0xE970, 0x7178, 0xE971,
-      0, 0xE972, 0x4831, 0x717A, 0xE973, 0x4926, 0x717B, 0x7179,
-      0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976,      0, 0x717E,
-      0, 0xE977, 0xE978, 0x7221,      0, 0xE979,      0, 0xE97A,
-};
-const unsigned short utf8_to_euc_E9AC[] = {
- 0xE97B, 0xE97C, 0xE97D, 0xE97E, 0xEA21, 0xEA22, 0x7222,      0,
- 0xEA23, 0xEA24,      0, 0xEA25, 0xEA26, 0xEA27, 0xEA28,      0,
- 0xEA29,      0, 0xEA2A,      0,      0,      0, 0xEA2B,      0,
- 0x7223, 0xEA2C, 0x7224, 0xEA2D, 0xEA2E,      0,      0, 0x7225,
- 0xEA2F,      0, 0x7226, 0x7227,      0, 0x7228, 0xEA30, 0x7229,
- 0x722A, 0x722B, 0x722C, 0xEA31,      0, 0xEA32, 0x722D, 0x722E,
-      0, 0x5D35, 0x722F, 0xEA33, 0xEA34, 0xEA35,      0, 0xEA36,
-      0, 0xEA37, 0xEA38, 0x6478, 0x3534, 0xEA39,      0,      0,
-};
-const unsigned short utf8_to_euc_E9AD[] = {
-      0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25,      0,      0,
- 0xEA3A,      0,      0, 0xEA3B, 0xEA3C, 0x7233, 0x7234, 0x7232,
-      0, 0x7235,      0,      0, 0x4B62, 0xEA3D, 0xEA3E, 0xEA3F,
- 0x7236,      0, 0x357B, 0xEA40,      0,      0, 0xEA41,      0,
-      0, 0xEA42,      0, 0xEA43,      0, 0xEA44, 0xEA45,      0,
- 0xEA46,      0, 0xEA47, 0xEA48, 0xEA49, 0xEA4A, 0xEA4B, 0x4F25,
-      0,      0, 0xF47C, 0xEA4C, 0x7237, 0xEA4D,      0, 0xEA4E,
- 0xEA4F, 0xEA50,      0,      0,      0,      0,      0, 0xEA51,
-};
-const unsigned short utf8_to_euc_E9AE[] = {
- 0xEA52,      0,      0, 0x7239, 0xEA53, 0xEA54, 0xEA55, 0xEA56,
-      0, 0xEA57, 0xEA58, 0xEA59,      0, 0xEA5A, 0x303E, 0xEA5B,
- 0xEA5C, 0x723A, 0x4A2B, 0x7238, 0xEA5D,      0, 0x723B, 0x723C,
-      0,      0, 0xEA5E,      0,      0, 0xEA5F, 0xEA60, 0x723D,
- 0x723E,      0,      0,      0,      0,      0, 0xEA61, 0xEA62,
- 0x723F, 0xEA63, 0x4B6E, 0x3B2D, 0xEA64, 0x3A7A, 0x412F,      0,
- 0xEA65, 0xEA66, 0xEA67,      0, 0x7240,      0,      0, 0xEA68,
- 0xEA69, 0x7243,      0, 0xEA6A, 0xEA6B,      0, 0xEA6C, 0xEA6D,
-};
-const unsigned short utf8_to_euc_E9AF[] = {
- 0x7241, 0xEA6E,      0,      0,      0,      0, 0x7244, 0xEA6F,
- 0xEA70, 0x3871, 0x7242,      0,      0,      0, 0xEA71, 0x7245,
- 0xEA72, 0x7246, 0x7247,      0, 0x724B,      0, 0x3B2A, 0xEA73,
- 0xEA74,      0,      0, 0x4264,      0, 0xEA75,      0, 0xEA76,
-      0, 0x724C, 0x7249, 0x7248, 0x724A, 0xEA77,      0, 0xEA78,
- 0x375F,      0, 0xEA79, 0xEA7A,      0,      0,      0, 0xEA7B,
- 0x7250, 0x724F, 0x724E, 0xEA7C,      0, 0x3033,      0, 0xEA7D,
- 0xEA7E, 0xEB21, 0xEB22,      0,      0, 0xEB23,      0, 0xEB24,
-};
-const unsigned short utf8_to_euc_E9B0[] = {
- 0xEB25,      0, 0xEB26,      0, 0x725A,      0, 0x7256,      0,
- 0x7257, 0x7253, 0x7259, 0xEB27, 0x7255, 0x3362,      0, 0xEB28,
- 0x4F4C, 0xEB29, 0x7258, 0x7254, 0x7252, 0x7251, 0xEB2A,      0,
- 0xEB2B, 0xEB2C, 0xEB2D, 0x725C, 0xEB2E,      0, 0xEB2F,      0,
-      0, 0x725F, 0xEB30, 0xEB31, 0x725E, 0x725D, 0xEB32, 0xEB33,
- 0xEB34, 0xEB35, 0xEB36,      0,      0, 0x4949, 0x725B, 0x3073,
- 0x7260, 0xEB37, 0x7262,      0,      0, 0xEB38, 0xEB39, 0xEB3A,
-      0, 0x336F, 0x724D, 0x3137,      0, 0xEB3B, 0x7264,      0,
-};
-const unsigned short utf8_to_euc_E9B1[] = {
-      0, 0xEB3C,      0, 0xEB3D, 0xEB3E, 0xEB3F, 0x7263, 0x7261,
- 0x432D, 0xEB40, 0xEB41,      0,      0,      0, 0xEB42, 0xEB43,
- 0xEB44,      0, 0x4B70, 0xEB45, 0xEB46,      0, 0xEB47, 0x4E5A,
- 0xEB48,      0, 0x7265, 0xEB49, 0xEB50, 0xEB4A, 0xEB4B, 0xEB4C,
- 0x7266,      0,      0, 0xEB4D,      0,      0,      0, 0x7267,
- 0xEB52, 0xEB4E, 0xEB4F, 0xEB51,      0,      0, 0xEB53,      0,
- 0xEB54,      0, 0xEB55,      0,      0, 0xEB56, 0x7268, 0xEB57,
- 0x7269,      0,      0, 0xEB58,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E9B3[] = {
-      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, 0x443B, 0xEB59, 0x726A,
-      0, 0x4837,      0, 0x726F, 0x726B,      0,      0,      0,
- 0x726C,      0, 0xEB5A, 0x4B31, 0x4C44,      0, 0x4650, 0xEB5B,
-      0, 0xEB5C,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_E9B4[] = {
-      0,      0, 0xEB5E, 0x7270,      0,      0, 0x7271, 0x463E,
- 0x726E, 0x726D,      0, 0xEB5D,      0,      0, 0x322A,      0,
-      0, 0xEB5F, 0x7279,      0,      0, 0x7278,      0, 0xEB60,
- 0xEB61,      0,      0, 0x3175, 0xEB62, 0xEB63, 0xEB64, 0x7276,
-      0,      0,      0, 0x7275,      0,      0, 0x7273,      0,
- 0x337B,      0, 0x7272, 0x3C32, 0x3229,      0,      0, 0xEB65,
- 0xEB66,      0, 0xEB67, 0xEB68, 0xEB69,      0,      0,      0,
-      0,      0, 0xEB6A, 0x3963, 0xEB6B, 0xEB6D, 0x727C, 0x727B,
-};
-const unsigned short utf8_to_euc_E9B5[] = {
-      0, 0x727A, 0xEB6E, 0xEB6F, 0x7277, 0xEB6C, 0x727D, 0xEB70,
- 0x727E,      0, 0xEB71,      0,      0,      0,      0,      0,
- 0x7325, 0x7324,      0, 0xEB72, 0xEB73,      0,      0,      0,
-      0, 0x7326,      0,      0, 0x312D, 0x7321, 0x7322, 0xEB74,
- 0x3974, 0x4C39, 0xEB76, 0xEB75, 0x7323, 0xEB77,      0,      0,
-      0, 0xEB78, 0xEB79, 0xEB7A, 0x4B32,      0,      0, 0x732B,
- 0xEB7B,      0, 0x7327,      0,      0,      0, 0xEB7C, 0xEB7D,
-      0,      0, 0x732C, 0xEB7E, 0xEC21,      0, 0xEC22,      0,
-};
-const unsigned short utf8_to_euc_E9B6[] = {
-      0,      0,      0, 0xEC23, 0xEC24,      0, 0xEC25, 0x7329,
-      0, 0x7328, 0xEC26,      0,      0, 0xEC27, 0xEC28, 0x375C,
-      0,      0, 0xEC29, 0xEC2A,      0, 0xEC2B, 0xEC2C, 0xEC2D,
- 0xEC2E,      0, 0x732D,      0,      0,      0,      0,      0,
-      0, 0xEC2F,      0,      0, 0x732E,      0,      0,      0,
-      0, 0x732F, 0xEC30, 0x732A, 0xEC31,      0, 0xEC32, 0x7274,
-      0, 0xEC33, 0x7330,      0, 0x4461, 0xEC34,      0,      0,
- 0x7334, 0xEC35, 0x7335, 0x7333, 0xEC36,      0,      0, 0xEC37,
-};
-const unsigned short utf8_to_euc_E9B7[] = {
-      0, 0x7332, 0x7338, 0xEC38, 0x7331,      0, 0x7336, 0xEC39,
-      0, 0xEC3A, 0xEC3B,      0,      0,      0,      0, 0x7337,
-      0,      0,      0, 0x733A, 0xEC3C, 0xEC3D, 0xEC3E, 0xEC3F,
-      0, 0x7339, 0xEC40,      0,      0,      0, 0xEC41, 0xEC42,
- 0xEC43,      0,      0,      0,      0, 0xEC44, 0x733C, 0xEC45,
-      0, 0xEC46,      0, 0xEC47,      0, 0x733D, 0xEC48, 0x733E,
- 0xEC49,      0, 0x4F49, 0xEC4A, 0xEC4B,      0,      0,      0,
- 0x733B, 0x426B, 0x3A6D,      0,      0, 0x733F, 0xEC4C,      0,
-};
-const unsigned short utf8_to_euc_E9B8[] = {
-      0,      0, 0xEC4E,      0,      0,      0,      0, 0xEC4F,
-      0,      0, 0xEC4D,      0,      0,      0, 0xEC50,      0,
- 0xEC51, 0xEC52, 0xEC53,      0,      0, 0xEC54, 0xEC55,      0,
-      0, 0xEC56, 0x7340, 0x7341, 0xEC57, 0xEC58, 0x7342,      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,
-};
-const unsigned short utf8_to_euc_E9B9[] = {
-      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, 0x7343,      0,      0,
- 0x3834, 0x7344, 0xEC59, 0xEC5A, 0xEC5B, 0x7345,      0, 0x3C2F,
-};
-const unsigned short utf8_to_euc_E9BA[] = {
- 0xEC5C, 0x7346, 0xEC5D, 0xEC5E, 0xEC5F, 0xEC60,      0, 0xEC61,
- 0x7347,      0,      0, 0x7348, 0x7349,      0, 0xEC62, 0xEC63,
-      0, 0x734C, 0x734A, 0x4F3C,      0, 0x734B, 0xEC64, 0x4E6F,
- 0xEC65,      0,      0, 0xEC66,      0, 0x734D, 0xEC67, 0x4E5B,
-      0,      0,      0,      0, 0xEC68, 0x734E, 0x477E,      0,
- 0xEC69, 0x734F, 0x7351,      0, 0xEC6A, 0x7352, 0xEC6B, 0xEC6C,
- 0xEC6D,      0,      0, 0xEC6E, 0xEC6F, 0xEC70,      0,      0,
- 0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677,      0, 0x5D60, 0x4B7B,
-};
-const unsigned short utf8_to_euc_E9BB[] = {
-      0,      0,      0,      0, 0x322B,      0, 0xEC71,      0,
- 0xEC72,      0,      0, 0xEC73, 0x7354, 0x3550, 0x7355, 0x7356,
- 0x7357, 0xF47E, 0x3975,      0, 0x7358, 0xEC74,      0,      0,
- 0x6054, 0x4C5B,      0, 0x4263, 0x7359, 0x735B, 0x735A, 0xEC75,
- 0x735C,      0,      0,      0, 0xEC76, 0x735D,      0, 0xEC77,
- 0x735E,      0,      0,      0, 0xEC78, 0xEC79, 0xEC7A, 0x735F,
- 0xEC7B, 0xEC7C, 0xEC7D,      0, 0x7360, 0xEC7E, 0x7361, 0x7362,
- 0xED21, 0x7363,      0, 0x7364, 0x7365, 0x7366,      0, 0xED22,
-};
-const unsigned short utf8_to_euc_E9BC[] = {
-      0,      0, 0xED23, 0xED24,      0,      0,      0, 0x7367,
- 0x7368, 0xED25,      0,      0,      0,      0, 0x4524, 0xED26,
- 0xED27, 0xED28, 0xED29, 0x385D, 0xED2A, 0x736A, 0xED2B, 0xED2C,
-      0, 0xED2D, 0xED2E, 0xED2F,      0,      0,      0, 0xED30,
- 0x414D, 0x736B, 0xED31,      0,      0,      0, 0xED32,      0,
-      0,      0, 0xED33, 0xED34, 0x736C,      0,      0, 0xED35,
-      0, 0xED36, 0xED37,      0, 0xED38,      0,      0, 0xED39,
-      0, 0xED3A, 0xED3B, 0x4921, 0xED3C, 0xED3D, 0x736D, 0xED3E,
-};
-const unsigned short utf8_to_euc_E9BD[] = {
-      0, 0xED3F,      0, 0xED40, 0xED41, 0xED42, 0xED43, 0xED44,
-      0,      0, 0x736E, 0x6337,      0,      0, 0x6C5A, 0x706D,
-      0,      0, 0x736F, 0xED45, 0x7370, 0xED46, 0xED47, 0xED48,
- 0xED49,      0, 0xED4A,      0,      0, 0xED4B, 0xED4C, 0x7372,
- 0x7373, 0x7374, 0x4E70, 0x7371,      0,      0, 0x7375, 0x7376,
- 0xED4D, 0xED4E, 0x7378,      0, 0x7377, 0xED4F, 0xED50, 0xED51,
- 0xED52, 0xED53, 0x737A, 0xED54,      0, 0xED55, 0x737B, 0x7379,
-      0,      0, 0xED56,      0,      0, 0xED57,      0,      0,
-};
-const unsigned short utf8_to_euc_E9BE[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x4E36,      0, 0xED58,
- 0xED59, 0xED5A, 0xED5B,      0, 0xED5C, 0x737C, 0xED5D, 0xED5E,
-      0,      0,      0,      0, 0x737D, 0x6354, 0xED5F,      0,
- 0x737E, 0xED60, 0xED61, 0xED62,      0, 0xED63,      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,
-};
-const unsigned short utf8_to_euc_EFA4[] = {
-      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, 0xF445,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_EFA7[] = {
-      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, 0xF472,      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,
-};
-const unsigned short utf8_to_euc_EFA8[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF434, 0xF437,
- 0xF438, 0xF43D, 0xF444, 0xF447, 0xF448, 0xF44E, 0xF44F, 0xF453,
- 0xF455, 0xF456, 0xF457, 0xF458, 0xF45A, 0xF45B, 0xF45E, 0xF460,
- 0xF462, 0xF463, 0xF465, 0xF469, 0xF46A, 0xF46B, 0xF46D, 0xF46F,
- 0xF470, 0xF473, 0xF477, 0xF478, 0xF479, 0xF47D,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short utf8_to_euc_EFBC[] = {
-      0, 0x212A, 0xF42A, 0x2174, 0x2170, 0x2173, 0x2175, 0xF429,
- 0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 0x215D, 0x2125, 0x213F,
- 0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337,
- 0x2338, 0x2339, 0x2127, 0x2128, 0x2163, 0x2161, 0x2164, 0x2129,
- 0x2177, 0x2341, 0x2342, 0x2343, 0x2344, 0x2345, 0x2346, 0x2347,
- 0x2348, 0x2349, 0x234A, 0x234B, 0x234C, 0x234D, 0x234E, 0x234F,
- 0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
- 0x2358, 0x2359, 0x235A, 0x214E, 0x2140, 0x214F, 0x2130, 0x2132,
-};
-const unsigned short utf8_to_euc_EFBD[] = {
- 0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
- 0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
- 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
- 0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151, 0xA237,      0,
-      0, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
- 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
- 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
- 0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
-};
-const unsigned short utf8_to_euc_EFBD_ms[] = {
- 0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
- 0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
- 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
- 0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151, 0x2141,      0,
-      0, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
- 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
- 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
- 0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
-};
-const unsigned short utf8_to_euc_EFBE[] = {
- 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
- 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
- 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
- 0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0E5C, 0x0E5D, 0x0E5E, 0x0E5F,
-      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,
-};
-const unsigned short utf8_to_euc_EFBF[] = {
-      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,
- 0x2171, 0x2172, 0x224C, 0x2131, 0xA243, 0x216F,      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,
-};
-const unsigned short *const utf8_to_euc_E2[] = {
- utf8_to_euc_E280,                0,                0,                0,
- utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
- utf8_to_euc_E288, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
- utf8_to_euc_E28C,                0,                0,                0,
-                0, utf8_to_euc_E291,                0,                0,
- utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
- utf8_to_euc_E298, utf8_to_euc_E299,                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,
-};
-const unsigned short *const utf8_to_euc_E2_ms[] = {
- utf8_to_euc_E280_ms,                0,                0,                0,
- utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
- utf8_to_euc_E288, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
- utf8_to_euc_E28C,                0,                0,                0,
-                0, utf8_to_euc_E291,                0,                0,
- utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
- utf8_to_euc_E298, utf8_to_euc_E299,                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,
-};
-const unsigned short *const utf8_to_euc_E2_932[] = {
- utf8_to_euc_E280_932,                0,                0,                0,
- utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
- utf8_to_euc_E288_932, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
- utf8_to_euc_E28C,                0,                0,                0,
-                0, utf8_to_euc_E291,                0,                0,
- utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
- utf8_to_euc_E298, utf8_to_euc_E299,                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,
-};
-const unsigned short *const utf8_to_euc_E3[] = {
- utf8_to_euc_E380, utf8_to_euc_E381, utf8_to_euc_E382, utf8_to_euc_E383,
-                0,                0,                0,                0,
- utf8_to_euc_E388,                0, utf8_to_euc_E38A,                0,
- utf8_to_euc_E38C, utf8_to_euc_E38D, utf8_to_euc_E38E, utf8_to_euc_E38F,
-                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,
-};
-const unsigned short *const utf8_to_euc_E3_932[] = {
- utf8_to_euc_E380_932, utf8_to_euc_E381, utf8_to_euc_E382_932, utf8_to_euc_E383,
-                0,                0,                0,                0,
- utf8_to_euc_E388,                0, utf8_to_euc_E38A,                0,
- utf8_to_euc_E38C, utf8_to_euc_E38D, utf8_to_euc_E38E, utf8_to_euc_E38F,
-                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,
-};
-const unsigned short *const utf8_to_euc_E4[] = {
-                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,
- utf8_to_euc_E4B8, utf8_to_euc_E4B9, utf8_to_euc_E4BA, utf8_to_euc_E4BB,
- utf8_to_euc_E4BC, utf8_to_euc_E4BD, utf8_to_euc_E4BE, utf8_to_euc_E4BF,
-};
-const unsigned short *const utf8_to_euc_E5[] = {
- utf8_to_euc_E580, utf8_to_euc_E581, utf8_to_euc_E582, utf8_to_euc_E583,
- utf8_to_euc_E584, utf8_to_euc_E585, utf8_to_euc_E586, utf8_to_euc_E587,
- utf8_to_euc_E588, utf8_to_euc_E589, utf8_to_euc_E58A, utf8_to_euc_E58B,
- utf8_to_euc_E58C, utf8_to_euc_E58D, utf8_to_euc_E58E, utf8_to_euc_E58F,
- utf8_to_euc_E590, utf8_to_euc_E591, utf8_to_euc_E592, utf8_to_euc_E593,
- utf8_to_euc_E594, utf8_to_euc_E595, utf8_to_euc_E596, utf8_to_euc_E597,
- utf8_to_euc_E598, utf8_to_euc_E599, utf8_to_euc_E59A, utf8_to_euc_E59B,
- utf8_to_euc_E59C, utf8_to_euc_E59D, utf8_to_euc_E59E, utf8_to_euc_E59F,
- utf8_to_euc_E5A0, utf8_to_euc_E5A1, utf8_to_euc_E5A2, utf8_to_euc_E5A3,
- utf8_to_euc_E5A4, utf8_to_euc_E5A5, utf8_to_euc_E5A6, utf8_to_euc_E5A7,
- utf8_to_euc_E5A8, utf8_to_euc_E5A9, utf8_to_euc_E5AA, utf8_to_euc_E5AB,
- utf8_to_euc_E5AC, utf8_to_euc_E5AD, utf8_to_euc_E5AE, utf8_to_euc_E5AF,
- utf8_to_euc_E5B0, utf8_to_euc_E5B1, utf8_to_euc_E5B2, utf8_to_euc_E5B3,
- utf8_to_euc_E5B4, utf8_to_euc_E5B5, utf8_to_euc_E5B6, utf8_to_euc_E5B7,
- utf8_to_euc_E5B8, utf8_to_euc_E5B9, utf8_to_euc_E5BA, utf8_to_euc_E5BB,
- utf8_to_euc_E5BC, utf8_to_euc_E5BD, utf8_to_euc_E5BE, utf8_to_euc_E5BF,
-};
-const unsigned short *const utf8_to_euc_E6[] = {
- utf8_to_euc_E680, utf8_to_euc_E681, utf8_to_euc_E682, utf8_to_euc_E683,
- utf8_to_euc_E684, utf8_to_euc_E685, utf8_to_euc_E686, utf8_to_euc_E687,
- utf8_to_euc_E688, utf8_to_euc_E689, utf8_to_euc_E68A, utf8_to_euc_E68B,
- utf8_to_euc_E68C, utf8_to_euc_E68D, utf8_to_euc_E68E, utf8_to_euc_E68F,
- utf8_to_euc_E690, utf8_to_euc_E691, utf8_to_euc_E692, utf8_to_euc_E693,
- utf8_to_euc_E694, utf8_to_euc_E695, utf8_to_euc_E696, utf8_to_euc_E697,
- utf8_to_euc_E698, utf8_to_euc_E699, utf8_to_euc_E69A, utf8_to_euc_E69B,
- utf8_to_euc_E69C, utf8_to_euc_E69D, utf8_to_euc_E69E, utf8_to_euc_E69F,
- utf8_to_euc_E6A0, utf8_to_euc_E6A1, utf8_to_euc_E6A2, utf8_to_euc_E6A3,
- utf8_to_euc_E6A4, utf8_to_euc_E6A5, utf8_to_euc_E6A6, utf8_to_euc_E6A7,
- utf8_to_euc_E6A8, utf8_to_euc_E6A9, utf8_to_euc_E6AA, utf8_to_euc_E6AB,
- utf8_to_euc_E6AC, utf8_to_euc_E6AD, utf8_to_euc_E6AE, utf8_to_euc_E6AF,
- utf8_to_euc_E6B0, utf8_to_euc_E6B1, utf8_to_euc_E6B2, utf8_to_euc_E6B3,
- utf8_to_euc_E6B4, utf8_to_euc_E6B5, utf8_to_euc_E6B6, utf8_to_euc_E6B7,
- utf8_to_euc_E6B8, utf8_to_euc_E6B9, utf8_to_euc_E6BA, utf8_to_euc_E6BB,
- utf8_to_euc_E6BC, utf8_to_euc_E6BD, utf8_to_euc_E6BE, utf8_to_euc_E6BF,
-};
-const unsigned short *const utf8_to_euc_E7[] = {
- utf8_to_euc_E780, utf8_to_euc_E781, utf8_to_euc_E782, utf8_to_euc_E783,
- utf8_to_euc_E784, utf8_to_euc_E785, utf8_to_euc_E786, utf8_to_euc_E787,
- utf8_to_euc_E788, utf8_to_euc_E789, utf8_to_euc_E78A, utf8_to_euc_E78B,
- utf8_to_euc_E78C, utf8_to_euc_E78D, utf8_to_euc_E78E, utf8_to_euc_E78F,
- utf8_to_euc_E790, utf8_to_euc_E791, utf8_to_euc_E792, utf8_to_euc_E793,
- utf8_to_euc_E794, utf8_to_euc_E795, utf8_to_euc_E796, utf8_to_euc_E797,
- utf8_to_euc_E798, utf8_to_euc_E799, utf8_to_euc_E79A, utf8_to_euc_E79B,
- utf8_to_euc_E79C, utf8_to_euc_E79D, utf8_to_euc_E79E, utf8_to_euc_E79F,
- utf8_to_euc_E7A0, utf8_to_euc_E7A1, utf8_to_euc_E7A2, utf8_to_euc_E7A3,
- utf8_to_euc_E7A4, utf8_to_euc_E7A5, utf8_to_euc_E7A6, utf8_to_euc_E7A7,
- utf8_to_euc_E7A8, utf8_to_euc_E7A9, utf8_to_euc_E7AA, utf8_to_euc_E7AB,
- utf8_to_euc_E7AC, utf8_to_euc_E7AD, utf8_to_euc_E7AE, utf8_to_euc_E7AF,
- utf8_to_euc_E7B0, utf8_to_euc_E7B1, utf8_to_euc_E7B2, utf8_to_euc_E7B3,
- utf8_to_euc_E7B4, utf8_to_euc_E7B5, utf8_to_euc_E7B6, utf8_to_euc_E7B7,
- utf8_to_euc_E7B8, utf8_to_euc_E7B9, utf8_to_euc_E7BA,                0,
- utf8_to_euc_E7BC, utf8_to_euc_E7BD, utf8_to_euc_E7BE, utf8_to_euc_E7BF,
-};
-const unsigned short *const utf8_to_euc_E8[] = {
- utf8_to_euc_E880, utf8_to_euc_E881, utf8_to_euc_E882, utf8_to_euc_E883,
- utf8_to_euc_E884, utf8_to_euc_E885, utf8_to_euc_E886, utf8_to_euc_E887,
- utf8_to_euc_E888, utf8_to_euc_E889, utf8_to_euc_E88A, utf8_to_euc_E88B,
- utf8_to_euc_E88C, utf8_to_euc_E88D, utf8_to_euc_E88E, utf8_to_euc_E88F,
- utf8_to_euc_E890, utf8_to_euc_E891, utf8_to_euc_E892, utf8_to_euc_E893,
- utf8_to_euc_E894, utf8_to_euc_E895, utf8_to_euc_E896, utf8_to_euc_E897,
- utf8_to_euc_E898, utf8_to_euc_E899, utf8_to_euc_E89A, utf8_to_euc_E89B,
- utf8_to_euc_E89C, utf8_to_euc_E89D, utf8_to_euc_E89E, utf8_to_euc_E89F,
- utf8_to_euc_E8A0, utf8_to_euc_E8A1, utf8_to_euc_E8A2, utf8_to_euc_E8A3,
- utf8_to_euc_E8A4, utf8_to_euc_E8A5, utf8_to_euc_E8A6, utf8_to_euc_E8A7,
- utf8_to_euc_E8A8, utf8_to_euc_E8A9, utf8_to_euc_E8AA, utf8_to_euc_E8AB,
- utf8_to_euc_E8AC, utf8_to_euc_E8AD, utf8_to_euc_E8AE,                0,
- utf8_to_euc_E8B0, utf8_to_euc_E8B1, utf8_to_euc_E8B2, utf8_to_euc_E8B3,
- utf8_to_euc_E8B4, utf8_to_euc_E8B5, utf8_to_euc_E8B6, utf8_to_euc_E8B7,
- utf8_to_euc_E8B8, utf8_to_euc_E8B9, utf8_to_euc_E8BA, utf8_to_euc_E8BB,
- utf8_to_euc_E8BC, utf8_to_euc_E8BD, utf8_to_euc_E8BE, utf8_to_euc_E8BF,
-};
-const unsigned short *const utf8_to_euc_E9[] = {
- utf8_to_euc_E980, utf8_to_euc_E981, utf8_to_euc_E982, utf8_to_euc_E983,
- utf8_to_euc_E984, utf8_to_euc_E985, utf8_to_euc_E986, utf8_to_euc_E987,
- utf8_to_euc_E988, utf8_to_euc_E989, utf8_to_euc_E98A, utf8_to_euc_E98B,
- utf8_to_euc_E98C, utf8_to_euc_E98D, utf8_to_euc_E98E, utf8_to_euc_E98F,
- utf8_to_euc_E990, utf8_to_euc_E991, utf8_to_euc_E992,                0,
-                0, utf8_to_euc_E995, utf8_to_euc_E996, utf8_to_euc_E997,
- utf8_to_euc_E998, utf8_to_euc_E999, utf8_to_euc_E99A, utf8_to_euc_E99B,
- utf8_to_euc_E99C, utf8_to_euc_E99D, utf8_to_euc_E99E, utf8_to_euc_E99F,
- utf8_to_euc_E9A0, utf8_to_euc_E9A1, utf8_to_euc_E9A2, utf8_to_euc_E9A3,
- utf8_to_euc_E9A4, utf8_to_euc_E9A5, utf8_to_euc_E9A6, utf8_to_euc_E9A7,
- utf8_to_euc_E9A8, utf8_to_euc_E9A9, utf8_to_euc_E9AA, utf8_to_euc_E9AB,
- utf8_to_euc_E9AC, utf8_to_euc_E9AD, utf8_to_euc_E9AE, utf8_to_euc_E9AF,
- utf8_to_euc_E9B0, utf8_to_euc_E9B1,                0, utf8_to_euc_E9B3,
- utf8_to_euc_E9B4, utf8_to_euc_E9B5, utf8_to_euc_E9B6, utf8_to_euc_E9B7,
- utf8_to_euc_E9B8, utf8_to_euc_E9B9, utf8_to_euc_E9BA, utf8_to_euc_E9BB,
- utf8_to_euc_E9BC, utf8_to_euc_E9BD, utf8_to_euc_E9BE,                0,
-};
-const unsigned short *const utf8_to_euc_EF[] = {
-                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,
- utf8_to_euc_EFA4,                0,                0, utf8_to_euc_EFA7,
- utf8_to_euc_EFA8,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
- utf8_to_euc_EFBC, utf8_to_euc_EFBD, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
-};
-const unsigned short *const utf8_to_euc_EF_ms[] = {
-                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,
- utf8_to_euc_EFA4,                0,                0, utf8_to_euc_EFA7,
- utf8_to_euc_EFA8,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
- utf8_to_euc_EFBC, utf8_to_euc_EFBD_ms, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
-};
-const unsigned short *const utf8_to_euc_2bytes[] = {
-              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,              0,
-              0,              0, utf8_to_euc_C2, utf8_to_euc_C3,
- utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
-              0,              0,              0, utf8_to_euc_CB,
-              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
- utf8_to_euc_D0, utf8_to_euc_D1,              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,
-};
-const unsigned short *const utf8_to_euc_2bytes_ms[] = {
-              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,              0,
-              0,              0, utf8_to_euc_C2_ms, utf8_to_euc_C3,
- utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
-              0,              0,              0, utf8_to_euc_CB,
-              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
- utf8_to_euc_D0, utf8_to_euc_D1,              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,
-};
-const unsigned short *const utf8_to_euc_2bytes_932[] = {
-              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,              0,
-              0,              0, utf8_to_euc_C2_932, utf8_to_euc_C3_932,
- utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
-              0,              0,              0, utf8_to_euc_CB,
-              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
- utf8_to_euc_D0, utf8_to_euc_D1,              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,
-};
-const unsigned short *const *const utf8_to_euc_3bytes[] = {
-              0,              0, utf8_to_euc_E2, utf8_to_euc_E3,
- utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
- utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
-              0,              0,              0, utf8_to_euc_EF,
-};
-const unsigned short *const *const utf8_to_euc_3bytes_ms[] = {
-              0,              0, utf8_to_euc_E2_ms, utf8_to_euc_E3,
- utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
- utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
-              0,              0,              0, utf8_to_euc_EF_ms,
-};
-const unsigned short *const *const utf8_to_euc_3bytes_932[] = {
-              0,              0, utf8_to_euc_E2_932, utf8_to_euc_E3_932,
- utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
- utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
-              0,              0,              0, utf8_to_euc_EF_ms,
-};
-
-#ifdef UNICODE_NORMALIZATION
-
-/* Normalization Table by Apple */
-/* http://developer.apple.com/technotes/tn/tn1150table.html */
-
-const struct normalization_pair normalization_table[] = {
-    {{0xcd,0xbe},	{0x3b}},
-    {{0xc3,0x80},	{0x41,0xcc,0x80,0x00}},
-    {{0xc3,0x81},	{0x41,0xcc,0x81}},
-    {{0xc3,0x82},	{0x41,0xcc,0x82}},
-    {{0xe1,0xba,0xa6},	{0x41,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xba,0xa4},	{0x41,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xba,0xaa},	{0x41,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xba,0xa8},	{0x41,0xcc,0x82,0xcc,0x89}},
-    {{0xc3,0x83},	{0x41,0xcc,0x83}},
-    {{0xc4,0x80},	{0x41,0xcc,0x84}},
-    {{0xc4,0x82},	{0x41,0xcc,0x86}},
-    {{0xe1,0xba,0xb0},	{0x41,0xcc,0x86,0xcc,0x80}},
-    {{0xe1,0xba,0xae},	{0x41,0xcc,0x86,0xcc,0x81}},
-    {{0xe1,0xba,0xb4},	{0x41,0xcc,0x86,0xcc,0x83}},
-    {{0xe1,0xba,0xb2},	{0x41,0xcc,0x86,0xcc,0x89}},
-    {{0xc7,0xa0},	{0x41,0xcc,0x87,0xcc,0x84}},
-    {{0xc3,0x84},	{0x41,0xcc,0x88}},
-    {{0xc7,0x9e},	{0x41,0xcc,0x88,0xcc,0x84}},
-    {{0xe1,0xba,0xa2},	{0x41,0xcc,0x89}},
-    {{0xc3,0x85},	{0x41,0xcc,0x8a}},
-    {{0xc7,0xba},	{0x41,0xcc,0x8a,0xcc,0x81}},
-    {{0xc7,0x8d},	{0x41,0xcc,0x8c}},
-    {{0xc8,0x80},	{0x41,0xcc,0x8f}},
-    {{0xc8,0x82},	{0x41,0xcc,0x91}},
-    {{0xe1,0xba,0xa0},	{0x41,0xcc,0xa3}},
-    {{0xe1,0xba,0xac},	{0x41,0xcc,0xa3,0xcc,0x82}},
-    {{0xe1,0xba,0xb6},	{0x41,0xcc,0xa3,0xcc,0x86}},
-    {{0xe1,0xb8,0x80},	{0x41,0xcc,0xa5}},
-    {{0xc4,0x84},	{0x41,0xcc,0xa8}},
-    {{0xe1,0xb8,0x82},	{0x42,0xcc,0x87}},
-    {{0xe1,0xb8,0x84},	{0x42,0xcc,0xa3}},
-    {{0xe1,0xb8,0x86},	{0x42,0xcc,0xb1}},
-    {{0xc4,0x86},	{0x43,0xcc,0x81}},
-    {{0xc4,0x88},	{0x43,0xcc,0x82}},
-    {{0xc4,0x8a},	{0x43,0xcc,0x87}},
-    {{0xc4,0x8c},	{0x43,0xcc,0x8c}},
-    {{0xc3,0x87},	{0x43,0xcc,0xa7}},
-    {{0xe1,0xb8,0x88},	{0x43,0xcc,0xa7,0xcc,0x81}},
-    {{0xe1,0xb8,0x8a},	{0x44,0xcc,0x87}},
-    {{0xc4,0x8e},	{0x44,0xcc,0x8c}},
-    {{0xe1,0xb8,0x8c},	{0x44,0xcc,0xa3}},
-    {{0xe1,0xb8,0x90},	{0x44,0xcc,0xa7}},
-    {{0xe1,0xb8,0x92},	{0x44,0xcc,0xad}},
-    {{0xe1,0xb8,0x8e},	{0x44,0xcc,0xb1}},
-    {{0xc3,0x88},	{0x45,0xcc,0x80}},
-    {{0xc3,0x89},	{0x45,0xcc,0x81}},
-    {{0xc3,0x8a},	{0x45,0xcc,0x82}},
-    {{0xe1,0xbb,0x80},	{0x45,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xba,0xbe},	{0x45,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xbb,0x84},	{0x45,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xbb,0x82},	{0x45,0xcc,0x82,0xcc,0x89}},
-    {{0xe1,0xba,0xbc},	{0x45,0xcc,0x83}},
-    {{0xc4,0x92},	{0x45,0xcc,0x84}},
-    {{0xe1,0xb8,0x94},	{0x45,0xcc,0x84,0xcc,0x80}},
-    {{0xe1,0xb8,0x96},	{0x45,0xcc,0x84,0xcc,0x81}},
-    {{0xc4,0x94},	{0x45,0xcc,0x86}},
-    {{0xc4,0x96},	{0x45,0xcc,0x87}},
-    {{0xc3,0x8b},	{0x45,0xcc,0x88}},
-    {{0xe1,0xba,0xba},	{0x45,0xcc,0x89}},
-    {{0xc4,0x9a},	{0x45,0xcc,0x8c}},
-    {{0xc8,0x84},	{0x45,0xcc,0x8f}},
-    {{0xc8,0x86},	{0x45,0xcc,0x91}},
-    {{0xe1,0xba,0xb8},	{0x45,0xcc,0xa3}},
-    {{0xe1,0xbb,0x86},	{0x45,0xcc,0xa3,0xcc,0x82}},
-    {{0xe1,0xb8,0x9c},	{0x45,0xcc,0xa7,0xcc,0x86}},
-    {{0xc4,0x98},	{0x45,0xcc,0xa8}},
-    {{0xe1,0xb8,0x98},	{0x45,0xcc,0xad}},
-    {{0xe1,0xb8,0x9a},	{0x45,0xcc,0xb0}},
-    {{0xe1,0xb8,0x9e},	{0x46,0xcc,0x87}},
-    {{0xc7,0xb4},	{0x47,0xcc,0x81}},
-    {{0xc4,0x9c},	{0x47,0xcc,0x82}},
-    {{0xe1,0xb8,0xa0},	{0x47,0xcc,0x84}},
-    {{0xc4,0x9e},	{0x47,0xcc,0x86}},
-    {{0xc4,0xa0},	{0x47,0xcc,0x87}},
-    {{0xc7,0xa6},	{0x47,0xcc,0x8c}},
-    {{0xc4,0xa2},	{0x47,0xcc,0xa7}},
-    {{0xc4,0xa4},	{0x48,0xcc,0x82}},
-    {{0xe1,0xb8,0xa2},	{0x48,0xcc,0x87}},
-    {{0xe1,0xb8,0xa6},	{0x48,0xcc,0x88}},
-    {{0xe1,0xb8,0xa4},	{0x48,0xcc,0xa3}},
-    {{0xe1,0xb8,0xa8},	{0x48,0xcc,0xa7}},
-    {{0xe1,0xb8,0xaa},	{0x48,0xcc,0xae}},
-    {{0xc3,0x8c},	{0x49,0xcc,0x80}},
-    {{0xc3,0x8d},	{0x49,0xcc,0x81}},
-    {{0xc3,0x8e},	{0x49,0xcc,0x82}},
-    {{0xc4,0xa8},	{0x49,0xcc,0x83}},
-    {{0xc4,0xaa},	{0x49,0xcc,0x84}},
-    {{0xc4,0xac},	{0x49,0xcc,0x86}},
-    {{0xc4,0xb0},	{0x49,0xcc,0x87}},
-    {{0xc3,0x8f},	{0x49,0xcc,0x88}},
-    {{0xe1,0xb8,0xae},	{0x49,0xcc,0x88,0xcc,0x81}},
-    {{0xe1,0xbb,0x88},	{0x49,0xcc,0x89}},
-    {{0xc7,0x8f},	{0x49,0xcc,0x8c}},
-    {{0xc8,0x88},	{0x49,0xcc,0x8f}},
-    {{0xc8,0x8a},	{0x49,0xcc,0x91}},
-    {{0xe1,0xbb,0x8a},	{0x49,0xcc,0xa3}},
-    {{0xc4,0xae},	{0x49,0xcc,0xa8}},
-    {{0xe1,0xb8,0xac},	{0x49,0xcc,0xb0}},
-    {{0xc4,0xb4},	{0x4a,0xcc,0x82}},
-    {{0xe1,0xb8,0xb0},	{0x4b,0xcc,0x81}},
-    {{0xc7,0xa8},	{0x4b,0xcc,0x8c}},
-    {{0xe1,0xb8,0xb2},	{0x4b,0xcc,0xa3}},
-    {{0xc4,0xb6},	{0x4b,0xcc,0xa7}},
-    {{0xe1,0xb8,0xb4},	{0x4b,0xcc,0xb1}},
-    {{0xc4,0xb9},	{0x4c,0xcc,0x81}},
-    {{0xc4,0xbd},	{0x4c,0xcc,0x8c}},
-    {{0xe1,0xb8,0xb6},	{0x4c,0xcc,0xa3}},
-    {{0xe1,0xb8,0xb8},	{0x4c,0xcc,0xa3,0xcc,0x84}},
-    {{0xc4,0xbb},	{0x4c,0xcc,0xa7}},
-    {{0xe1,0xb8,0xbc},	{0x4c,0xcc,0xad}},
-    {{0xe1,0xb8,0xba},	{0x4c,0xcc,0xb1}},
-    {{0xe1,0xb8,0xbe},	{0x4d,0xcc,0x81}},
-    {{0xe1,0xb9,0x80},	{0x4d,0xcc,0x87}},
-    {{0xe1,0xb9,0x82},	{0x4d,0xcc,0xa3}},
-    {{0xc5,0x83},	{0x4e,0xcc,0x81}},
-    {{0xc3,0x91},	{0x4e,0xcc,0x83}},
-    {{0xe1,0xb9,0x84},	{0x4e,0xcc,0x87}},
-    {{0xc5,0x87},	{0x4e,0xcc,0x8c}},
-    {{0xe1,0xb9,0x86},	{0x4e,0xcc,0xa3}},
-    {{0xc5,0x85},	{0x4e,0xcc,0xa7}},
-    {{0xe1,0xb9,0x8a},	{0x4e,0xcc,0xad}},
-    {{0xe1,0xb9,0x88},	{0x4e,0xcc,0xb1}},
-    {{0xc3,0x92},	{0x4f,0xcc,0x80}},
-    {{0xc3,0x93},	{0x4f,0xcc,0x81}},
-    {{0xc3,0x94},	{0x4f,0xcc,0x82}},
-    {{0xe1,0xbb,0x92},	{0x4f,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xbb,0x90},	{0x4f,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xbb,0x96},	{0x4f,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xbb,0x94},	{0x4f,0xcc,0x82,0xcc,0x89}},
-    {{0xc3,0x95},	{0x4f,0xcc,0x83}},
-    {{0xe1,0xb9,0x8c},	{0x4f,0xcc,0x83,0xcc,0x81}},
-    {{0xe1,0xb9,0x8e},	{0x4f,0xcc,0x83,0xcc,0x88}},
-    {{0xc5,0x8c},	{0x4f,0xcc,0x84}},
-    {{0xe1,0xb9,0x90},	{0x4f,0xcc,0x84,0xcc,0x80}},
-    {{0xe1,0xb9,0x92},	{0x4f,0xcc,0x84,0xcc,0x81}},
-    {{0xc5,0x8e},	{0x4f,0xcc,0x86}},
-    {{0xc3,0x96},	{0x4f,0xcc,0x88}},
-    {{0xe1,0xbb,0x8e},	{0x4f,0xcc,0x89}},
-    {{0xc5,0x90},	{0x4f,0xcc,0x8b}},
-    {{0xc7,0x91},	{0x4f,0xcc,0x8c}},
-    {{0xc8,0x8c},	{0x4f,0xcc,0x8f}},
-    {{0xc8,0x8e},	{0x4f,0xcc,0x91}},
-    {{0xc6,0xa0},	{0x4f,0xcc,0x9b}},
-    {{0xe1,0xbb,0x9c},	{0x4f,0xcc,0x9b,0xcc,0x80}},
-    {{0xe1,0xbb,0x9a},	{0x4f,0xcc,0x9b,0xcc,0x81}},
-    {{0xe1,0xbb,0xa0},	{0x4f,0xcc,0x9b,0xcc,0x83}},
-    {{0xe1,0xbb,0x9e},	{0x4f,0xcc,0x9b,0xcc,0x89}},
-    {{0xe1,0xbb,0xa2},	{0x4f,0xcc,0x9b,0xcc,0xa3}},
-    {{0xe1,0xbb,0x8c},	{0x4f,0xcc,0xa3}},
-    {{0xe1,0xbb,0x98},	{0x4f,0xcc,0xa3,0xcc,0x82}},
-    {{0xc7,0xaa},	{0x4f,0xcc,0xa8}},
-    {{0xc7,0xac},	{0x4f,0xcc,0xa8,0xcc,0x84}},
-    {{0xe1,0xb9,0x94},	{0x50,0xcc,0x81}},
-    {{0xe1,0xb9,0x96},	{0x50,0xcc,0x87}},
-    {{0xc5,0x94},	{0x52,0xcc,0x81}},
-    {{0xe1,0xb9,0x98},	{0x52,0xcc,0x87}},
-    {{0xc5,0x98},	{0x52,0xcc,0x8c}},
-    {{0xc8,0x90},	{0x52,0xcc,0x8f}},
-    {{0xc8,0x92},	{0x52,0xcc,0x91}},
-    {{0xe1,0xb9,0x9a},	{0x52,0xcc,0xa3}},
-    {{0xe1,0xb9,0x9c},	{0x52,0xcc,0xa3,0xcc,0x84}},
-    {{0xc5,0x96},	{0x52,0xcc,0xa7}},
-    {{0xe1,0xb9,0x9e},	{0x52,0xcc,0xb1}},
-    {{0xc5,0x9a},	{0x53,0xcc,0x81}},
-    {{0xe1,0xb9,0xa4},	{0x53,0xcc,0x81,0xcc,0x87}},
-    {{0xc5,0x9c},	{0x53,0xcc,0x82}},
-    {{0xe1,0xb9,0xa0},	{0x53,0xcc,0x87}},
-    {{0xc5,0xa0},	{0x53,0xcc,0x8c}},
-    {{0xe1,0xb9,0xa6},	{0x53,0xcc,0x8c,0xcc,0x87}},
-    {{0xe1,0xb9,0xa2},	{0x53,0xcc,0xa3}},
-    {{0xe1,0xb9,0xa8},	{0x53,0xcc,0xa3,0xcc,0x87}},
-    {{0xc5,0x9e},	{0x53,0xcc,0xa7}},
-    {{0xe1,0xb9,0xaa},	{0x54,0xcc,0x87}},
-    {{0xc5,0xa4},	{0x54,0xcc,0x8c}},
-    {{0xe1,0xb9,0xac},	{0x54,0xcc,0xa3}},
-    {{0xc5,0xa2},	{0x54,0xcc,0xa7}},
-    {{0xe1,0xb9,0xb0},	{0x54,0xcc,0xad}},
-    {{0xe1,0xb9,0xae},	{0x54,0xcc,0xb1}},
-    {{0xc3,0x99},	{0x55,0xcc,0x80}},
-    {{0xc3,0x9a},	{0x55,0xcc,0x81}},
-    {{0xc3,0x9b},	{0x55,0xcc,0x82}},
-    {{0xc5,0xa8},	{0x55,0xcc,0x83}},
-    {{0xe1,0xb9,0xb8},	{0x55,0xcc,0x83,0xcc,0x81}},
-    {{0xc5,0xaa},	{0x55,0xcc,0x84}},
-    {{0xe1,0xb9,0xba},	{0x55,0xcc,0x84,0xcc,0x88}},
-    {{0xc5,0xac},	{0x55,0xcc,0x86}},
-    {{0xc3,0x9c},	{0x55,0xcc,0x88}},
-    {{0xc7,0x9b},	{0x55,0xcc,0x88,0xcc,0x80}},
-    {{0xc7,0x97},	{0x55,0xcc,0x88,0xcc,0x81}},
-    {{0xc7,0x95},	{0x55,0xcc,0x88,0xcc,0x84}},
-    {{0xc7,0x99},	{0x55,0xcc,0x88,0xcc,0x8c}},
-    {{0xe1,0xbb,0xa6},	{0x55,0xcc,0x89}},
-    {{0xc5,0xae},	{0x55,0xcc,0x8a}},
-    {{0xc5,0xb0},	{0x55,0xcc,0x8b}},
-    {{0xc7,0x93},	{0x55,0xcc,0x8c}},
-    {{0xc8,0x94},	{0x55,0xcc,0x8f}},
-    {{0xc8,0x96},	{0x55,0xcc,0x91}},
-    {{0xc6,0xaf},	{0x55,0xcc,0x9b}},
-    {{0xe1,0xbb,0xaa},	{0x55,0xcc,0x9b,0xcc,0x80}},
-    {{0xe1,0xbb,0xa8},	{0x55,0xcc,0x9b,0xcc,0x81}},
-    {{0xe1,0xbb,0xae},	{0x55,0xcc,0x9b,0xcc,0x83}},
-    {{0xe1,0xbb,0xac},	{0x55,0xcc,0x9b,0xcc,0x89}},
-    {{0xe1,0xbb,0xb0},	{0x55,0xcc,0x9b,0xcc,0xa3}},
-    {{0xe1,0xbb,0xa4},	{0x55,0xcc,0xa3}},
-    {{0xe1,0xb9,0xb2},	{0x55,0xcc,0xa4}},
-    {{0xc5,0xb2},	{0x55,0xcc,0xa8}},
-    {{0xe1,0xb9,0xb6},	{0x55,0xcc,0xad}},
-    {{0xe1,0xb9,0xb4},	{0x55,0xcc,0xb0}},
-    {{0xe1,0xb9,0xbc},	{0x56,0xcc,0x83}},
-    {{0xe1,0xb9,0xbe},	{0x56,0xcc,0xa3}},
-    {{0xe1,0xba,0x80},	{0x57,0xcc,0x80}},
-    {{0xe1,0xba,0x82},	{0x57,0xcc,0x81}},
-    {{0xc5,0xb4},	{0x57,0xcc,0x82}},
-    {{0xe1,0xba,0x86},	{0x57,0xcc,0x87}},
-    {{0xe1,0xba,0x84},	{0x57,0xcc,0x88}},
-    {{0xe1,0xba,0x88},	{0x57,0xcc,0xa3}},
-    {{0xe1,0xba,0x8a},	{0x58,0xcc,0x87}},
-    {{0xe1,0xba,0x8c},	{0x58,0xcc,0x88}},
-    {{0xe1,0xbb,0xb2},	{0x59,0xcc,0x80}},
-    {{0xc3,0x9d},	{0x59,0xcc,0x81}},
-    {{0xc5,0xb6},	{0x59,0xcc,0x82}},
-    {{0xe1,0xbb,0xb8},	{0x59,0xcc,0x83}},
-    {{0xe1,0xba,0x8e},	{0x59,0xcc,0x87}},
-    {{0xc5,0xb8},	{0x59,0xcc,0x88}},
-    {{0xe1,0xbb,0xb6},	{0x59,0xcc,0x89}},
-    {{0xe1,0xbb,0xb4},	{0x59,0xcc,0xa3}},
-    {{0xc5,0xb9},	{0x5a,0xcc,0x81}},
-    {{0xe1,0xba,0x90},	{0x5a,0xcc,0x82}},
-    {{0xc5,0xbb},	{0x5a,0xcc,0x87}},
-    {{0xc5,0xbd},	{0x5a,0xcc,0x8c}},
-    {{0xe1,0xba,0x92},	{0x5a,0xcc,0xa3}},
-    {{0xe1,0xba,0x94},	{0x5a,0xcc,0xb1}},
-    {{0xe1,0xbf,0xaf},	{0x60}},
-    {{0xc3,0xa0},	{0x61,0xcc,0x80}},
-    {{0xc3,0xa1},	{0x61,0xcc,0x81}},
-    {{0xc3,0xa2},	{0x61,0xcc,0x82}},
-    {{0xe1,0xba,0xa7},	{0x61,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xba,0xa5},	{0x61,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xba,0xab},	{0x61,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xba,0xa9},	{0x61,0xcc,0x82,0xcc,0x89}},
-    {{0xc3,0xa3},	{0x61,0xcc,0x83}},
-    {{0xc4,0x81},	{0x61,0xcc,0x84}},
-    {{0xc4,0x83},	{0x61,0xcc,0x86}},
-    {{0xe1,0xba,0xb1},	{0x61,0xcc,0x86,0xcc,0x80}},
-    {{0xe1,0xba,0xaf},	{0x61,0xcc,0x86,0xcc,0x81}},
-    {{0xe1,0xba,0xb5},	{0x61,0xcc,0x86,0xcc,0x83}},
-    {{0xe1,0xba,0xb3},	{0x61,0xcc,0x86,0xcc,0x89}},
-    {{0xc7,0xa1},	{0x61,0xcc,0x87,0xcc,0x84}},
-    {{0xc3,0xa4},	{0x61,0xcc,0x88}},
-    {{0xc7,0x9f},	{0x61,0xcc,0x88,0xcc,0x84}},
-    {{0xe1,0xba,0xa3},	{0x61,0xcc,0x89}},
-    {{0xc3,0xa5},	{0x61,0xcc,0x8a}},
-    {{0xc7,0xbb},	{0x61,0xcc,0x8a,0xcc,0x81}},
-    {{0xc7,0x8e},	{0x61,0xcc,0x8c}},
-    {{0xc8,0x81},	{0x61,0xcc,0x8f}},
-    {{0xc8,0x83},	{0x61,0xcc,0x91}},
-    {{0xe1,0xba,0xa1},	{0x61,0xcc,0xa3}},
-    {{0xe1,0xba,0xad},	{0x61,0xcc,0xa3,0xcc,0x82}},
-    {{0xe1,0xba,0xb7},	{0x61,0xcc,0xa3,0xcc,0x86}},
-    {{0xe1,0xb8,0x81},	{0x61,0xcc,0xa5}},
-    {{0xc4,0x85},	{0x61,0xcc,0xa8}},
-    {{0xe1,0xb8,0x83},	{0x62,0xcc,0x87}},
-    {{0xe1,0xb8,0x85},	{0x62,0xcc,0xa3}},
-    {{0xe1,0xb8,0x87},	{0x62,0xcc,0xb1}},
-    {{0xc4,0x87},	{0x63,0xcc,0x81}},
-    {{0xc4,0x89},	{0x63,0xcc,0x82}},
-    {{0xc4,0x8b},	{0x63,0xcc,0x87}},
-    {{0xc4,0x8d},	{0x63,0xcc,0x8c}},
-    {{0xc3,0xa7},	{0x63,0xcc,0xa7}},
-    {{0xe1,0xb8,0x89},	{0x63,0xcc,0xa7,0xcc,0x81}},
-    {{0xe1,0xb8,0x8b},	{0x64,0xcc,0x87}},
-    {{0xc4,0x8f},	{0x64,0xcc,0x8c}},
-    {{0xe1,0xb8,0x8d},	{0x64,0xcc,0xa3}},
-    {{0xe1,0xb8,0x91},	{0x64,0xcc,0xa7}},
-    {{0xe1,0xb8,0x93},	{0x64,0xcc,0xad}},
-    {{0xe1,0xb8,0x8f},	{0x64,0xcc,0xb1}},
-    {{0xc3,0xa8},	{0x65,0xcc,0x80}},
-    {{0xc3,0xa9},	{0x65,0xcc,0x81}},
-    {{0xc3,0xaa},	{0x65,0xcc,0x82}},
-    {{0xe1,0xbb,0x81},	{0x65,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xba,0xbf},	{0x65,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xbb,0x85},	{0x65,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xbb,0x83},	{0x65,0xcc,0x82,0xcc,0x89}},
-    {{0xe1,0xba,0xbd},	{0x65,0xcc,0x83}},
-    {{0xc4,0x93},	{0x65,0xcc,0x84}},
-    {{0xe1,0xb8,0x95},	{0x65,0xcc,0x84,0xcc,0x80}},
-    {{0xe1,0xb8,0x97},	{0x65,0xcc,0x84,0xcc,0x81}},
-    {{0xc4,0x95},	{0x65,0xcc,0x86}},
-    {{0xc4,0x97},	{0x65,0xcc,0x87}},
-    {{0xc3,0xab},	{0x65,0xcc,0x88}},
-    {{0xe1,0xba,0xbb},	{0x65,0xcc,0x89}},
-    {{0xc4,0x9b},	{0x65,0xcc,0x8c}},
-    {{0xc8,0x85},	{0x65,0xcc,0x8f}},
-    {{0xc8,0x87},	{0x65,0xcc,0x91}},
-    {{0xe1,0xba,0xb9},	{0x65,0xcc,0xa3}},
-    {{0xe1,0xbb,0x87},	{0x65,0xcc,0xa3,0xcc,0x82}},
-    {{0xe1,0xb8,0x9d},	{0x65,0xcc,0xa7,0xcc,0x86}},
-    {{0xc4,0x99},	{0x65,0xcc,0xa8}},
-    {{0xe1,0xb8,0x99},	{0x65,0xcc,0xad}},
-    {{0xe1,0xb8,0x9b},	{0x65,0xcc,0xb0}},
-    {{0xe1,0xb8,0x9f},	{0x66,0xcc,0x87}},
-    {{0xc7,0xb5},	{0x67,0xcc,0x81}},
-    {{0xc4,0x9d},	{0x67,0xcc,0x82}},
-    {{0xe1,0xb8,0xa1},	{0x67,0xcc,0x84}},
-    {{0xc4,0x9f},	{0x67,0xcc,0x86}},
-    {{0xc4,0xa1},	{0x67,0xcc,0x87}},
-    {{0xc7,0xa7},	{0x67,0xcc,0x8c}},
-    {{0xc4,0xa3},	{0x67,0xcc,0xa7}},
-    {{0xc4,0xa5},	{0x68,0xcc,0x82}},
-    {{0xe1,0xb8,0xa3},	{0x68,0xcc,0x87}},
-    {{0xe1,0xb8,0xa7},	{0x68,0xcc,0x88}},
-    {{0xe1,0xb8,0xa5},	{0x68,0xcc,0xa3}},
-    {{0xe1,0xb8,0xa9},	{0x68,0xcc,0xa7}},
-    {{0xe1,0xb8,0xab},	{0x68,0xcc,0xae}},
-    {{0xe1,0xba,0x96},	{0x68,0xcc,0xb1}},
-    {{0xc3,0xac},	{0x69,0xcc,0x80}},
-    {{0xc3,0xad},	{0x69,0xcc,0x81}},
-    {{0xc3,0xae},	{0x69,0xcc,0x82}},
-    {{0xc4,0xa9},	{0x69,0xcc,0x83}},
-    {{0xc4,0xab},	{0x69,0xcc,0x84}},
-    {{0xc4,0xad},	{0x69,0xcc,0x86}},
-    {{0xc3,0xaf},	{0x69,0xcc,0x88}},
-    {{0xe1,0xb8,0xaf},	{0x69,0xcc,0x88,0xcc,0x81}},
-    {{0xe1,0xbb,0x89},	{0x69,0xcc,0x89}},
-    {{0xc7,0x90},	{0x69,0xcc,0x8c}},
-    {{0xc8,0x89},	{0x69,0xcc,0x8f}},
-    {{0xc8,0x8b},	{0x69,0xcc,0x91}},
-    {{0xe1,0xbb,0x8b},	{0x69,0xcc,0xa3}},
-    {{0xc4,0xaf},	{0x69,0xcc,0xa8}},
-    {{0xe1,0xb8,0xad},	{0x69,0xcc,0xb0}},
-    {{0xc4,0xb5},	{0x6a,0xcc,0x82}},
-    {{0xc7,0xb0},	{0x6a,0xcc,0x8c}},
-    {{0xe1,0xb8,0xb1},	{0x6b,0xcc,0x81}},
-    {{0xc7,0xa9},	{0x6b,0xcc,0x8c}},
-    {{0xe1,0xb8,0xb3},	{0x6b,0xcc,0xa3}},
-    {{0xc4,0xb7},	{0x6b,0xcc,0xa7}},
-    {{0xe1,0xb8,0xb5},	{0x6b,0xcc,0xb1}},
-    {{0xc4,0xba},	{0x6c,0xcc,0x81}},
-    {{0xc4,0xbe},	{0x6c,0xcc,0x8c}},
-    {{0xe1,0xb8,0xb7},	{0x6c,0xcc,0xa3}},
-    {{0xe1,0xb8,0xb9},	{0x6c,0xcc,0xa3,0xcc,0x84}},
-    {{0xc4,0xbc},	{0x6c,0xcc,0xa7}},
-    {{0xe1,0xb8,0xbd},	{0x6c,0xcc,0xad}},
-    {{0xe1,0xb8,0xbb},	{0x6c,0xcc,0xb1}},
-    {{0xe1,0xb8,0xbf},	{0x6d,0xcc,0x81}},
-    {{0xe1,0xb9,0x81},	{0x6d,0xcc,0x87}},
-    {{0xe1,0xb9,0x83},	{0x6d,0xcc,0xa3}},
-    {{0xc5,0x84},	{0x6e,0xcc,0x81}},
-    {{0xc3,0xb1},	{0x6e,0xcc,0x83}},
-    {{0xe1,0xb9,0x85},	{0x6e,0xcc,0x87}},
-    {{0xc5,0x88},	{0x6e,0xcc,0x8c}},
-    {{0xe1,0xb9,0x87},	{0x6e,0xcc,0xa3}},
-    {{0xc5,0x86},	{0x6e,0xcc,0xa7}},
-    {{0xe1,0xb9,0x8b},	{0x6e,0xcc,0xad}},
-    {{0xe1,0xb9,0x89},	{0x6e,0xcc,0xb1}},
-    {{0xc3,0xb2},	{0x6f,0xcc,0x80}},
-    {{0xc3,0xb3},	{0x6f,0xcc,0x81}},
-    {{0xc3,0xb4},	{0x6f,0xcc,0x82}},
-    {{0xe1,0xbb,0x93},	{0x6f,0xcc,0x82,0xcc,0x80}},
-    {{0xe1,0xbb,0x91},	{0x6f,0xcc,0x82,0xcc,0x81}},
-    {{0xe1,0xbb,0x97},	{0x6f,0xcc,0x82,0xcc,0x83}},
-    {{0xe1,0xbb,0x95},	{0x6f,0xcc,0x82,0xcc,0x89}},
-    {{0xc3,0xb5},	{0x6f,0xcc,0x83}},
-    {{0xe1,0xb9,0x8d},	{0x6f,0xcc,0x83,0xcc,0x81}},
-    {{0xe1,0xb9,0x8f},	{0x6f,0xcc,0x83,0xcc,0x88}},
-    {{0xc5,0x8d},	{0x6f,0xcc,0x84}},
-    {{0xe1,0xb9,0x91},	{0x6f,0xcc,0x84,0xcc,0x80}},
-    {{0xe1,0xb9,0x93},	{0x6f,0xcc,0x84,0xcc,0x81}},
-    {{0xc5,0x8f},	{0x6f,0xcc,0x86}},
-    {{0xc3,0xb6},	{0x6f,0xcc,0x88}},
-    {{0xe1,0xbb,0x8f},	{0x6f,0xcc,0x89}},
-    {{0xc5,0x91},	{0x6f,0xcc,0x8b}},
-    {{0xc7,0x92},	{0x6f,0xcc,0x8c}},
-    {{0xc8,0x8d},	{0x6f,0xcc,0x8f}},
-    {{0xc8,0x8f},	{0x6f,0xcc,0x91}},
-    {{0xc6,0xa1},	{0x6f,0xcc,0x9b}},
-    {{0xe1,0xbb,0x9d},	{0x6f,0xcc,0x9b,0xcc,0x80}},
-    {{0xe1,0xbb,0x9b},	{0x6f,0xcc,0x9b,0xcc,0x81}},
-    {{0xe1,0xbb,0xa1},	{0x6f,0xcc,0x9b,0xcc,0x83}},
-    {{0xe1,0xbb,0x9f},	{0x6f,0xcc,0x9b,0xcc,0x89}},
-    {{0xe1,0xbb,0xa3},	{0x6f,0xcc,0x9b,0xcc,0xa3}},
-    {{0xe1,0xbb,0x8d},	{0x6f,0xcc,0xa3}},
-    {{0xe1,0xbb,0x99},	{0x6f,0xcc,0xa3,0xcc,0x82}},
-    {{0xc7,0xab},	{0x6f,0xcc,0xa8}},
-    {{0xc7,0xad},	{0x6f,0xcc,0xa8,0xcc,0x84}},
-    {{0xe1,0xb9,0x95},	{0x70,0xcc,0x81}},
-    {{0xe1,0xb9,0x97},	{0x70,0xcc,0x87}},
-    {{0xc5,0x95},	{0x72,0xcc,0x81}},
-    {{0xe1,0xb9,0x99},	{0x72,0xcc,0x87}},
-    {{0xc5,0x99},	{0x72,0xcc,0x8c}},
-    {{0xc8,0x91},	{0x72,0xcc,0x8f}},
-    {{0xc8,0x93},	{0x72,0xcc,0x91}},
-    {{0xe1,0xb9,0x9b},	{0x72,0xcc,0xa3}},
-    {{0xe1,0xb9,0x9d},	{0x72,0xcc,0xa3,0xcc,0x84}},
-    {{0xc5,0x97},	{0x72,0xcc,0xa7}},
-    {{0xe1,0xb9,0x9f},	{0x72,0xcc,0xb1}},
-    {{0xc5,0x9b},	{0x73,0xcc,0x81}},
-    {{0xe1,0xb9,0xa5},	{0x73,0xcc,0x81,0xcc,0x87}},
-    {{0xc5,0x9d},	{0x73,0xcc,0x82}},
-    {{0xe1,0xb9,0xa1},	{0x73,0xcc,0x87}},
-    {{0xc5,0xa1},	{0x73,0xcc,0x8c}},
-    {{0xe1,0xb9,0xa7},	{0x73,0xcc,0x8c,0xcc,0x87}},
-    {{0xe1,0xb9,0xa3},	{0x73,0xcc,0xa3}},
-    {{0xe1,0xb9,0xa9},	{0x73,0xcc,0xa3,0xcc,0x87}},
-    {{0xc5,0x9f},	{0x73,0xcc,0xa7}},
-    {{0xe1,0xb9,0xab},	{0x74,0xcc,0x87}},
-    {{0xe1,0xba,0x97},	{0x74,0xcc,0x88}},
-    {{0xc5,0xa5},	{0x74,0xcc,0x8c}},
-    {{0xe1,0xb9,0xad},	{0x74,0xcc,0xa3}},
-    {{0xc5,0xa3},	{0x74,0xcc,0xa7}},
-    {{0xe1,0xb9,0xb1},	{0x74,0xcc,0xad}},
-    {{0xe1,0xb9,0xaf},	{0x74,0xcc,0xb1}},
-    {{0xc3,0xb9},	{0x75,0xcc,0x80}},
-    {{0xc3,0xba},	{0x75,0xcc,0x81}},
-    {{0xc3,0xbb},	{0x75,0xcc,0x82}},
-    {{0xc5,0xa9},	{0x75,0xcc,0x83}},
-    {{0xe1,0xb9,0xb9},	{0x75,0xcc,0x83,0xcc,0x81}},
-    {{0xc5,0xab},	{0x75,0xcc,0x84}},
-    {{0xe1,0xb9,0xbb},	{0x75,0xcc,0x84,0xcc,0x88}},
-    {{0xc5,0xad},	{0x75,0xcc,0x86}},
-    {{0xc3,0xbc},	{0x75,0xcc,0x88}},
-    {{0xc7,0x9c},	{0x75,0xcc,0x88,0xcc,0x80}},
-    {{0xc7,0x98},	{0x75,0xcc,0x88,0xcc,0x81}},
-    {{0xc7,0x96},	{0x75,0xcc,0x88,0xcc,0x84}},
-    {{0xc7,0x9a},	{0x75,0xcc,0x88,0xcc,0x8c}},
-    {{0xe1,0xbb,0xa7},	{0x75,0xcc,0x89}},
-    {{0xc5,0xaf},	{0x75,0xcc,0x8a}},
-    {{0xc5,0xb1},	{0x75,0xcc,0x8b}},
-    {{0xc7,0x94},	{0x75,0xcc,0x8c}},
-    {{0xc8,0x95},	{0x75,0xcc,0x8f}},
-    {{0xc8,0x97},	{0x75,0xcc,0x91}},
-    {{0xc6,0xb0},	{0x75,0xcc,0x9b}},
-    {{0xe1,0xbb,0xab},	{0x75,0xcc,0x9b,0xcc,0x80}},
-    {{0xe1,0xbb,0xa9},	{0x75,0xcc,0x9b,0xcc,0x81}},
-    {{0xe1,0xbb,0xaf},	{0x75,0xcc,0x9b,0xcc,0x83}},
-    {{0xe1,0xbb,0xad},	{0x75,0xcc,0x9b,0xcc,0x89}},
-    {{0xe1,0xbb,0xb1},	{0x75,0xcc,0x9b,0xcc,0xa3}},
-    {{0xe1,0xbb,0xa5},	{0x75,0xcc,0xa3}},
-    {{0xe1,0xb9,0xb3},	{0x75,0xcc,0xa4}},
-    {{0xc5,0xb3},	{0x75,0xcc,0xa8}},
-    {{0xe1,0xb9,0xb7},	{0x75,0xcc,0xad}},
-    {{0xe1,0xb9,0xb5},	{0x75,0xcc,0xb0}},
-    {{0xe1,0xb9,0xbd},	{0x76,0xcc,0x83}},
-    {{0xe1,0xb9,0xbf},	{0x76,0xcc,0xa3}},
-    {{0xe1,0xba,0x81},	{0x77,0xcc,0x80}},
-    {{0xe1,0xba,0x83},	{0x77,0xcc,0x81}},
-    {{0xc5,0xb5},	{0x77,0xcc,0x82}},
-    {{0xe1,0xba,0x87},	{0x77,0xcc,0x87}},
-    {{0xe1,0xba,0x85},	{0x77,0xcc,0x88}},
-    {{0xe1,0xba,0x98},	{0x77,0xcc,0x8a}},
-    {{0xe1,0xba,0x89},	{0x77,0xcc,0xa3}},
-    {{0xe1,0xba,0x8b},	{0x78,0xcc,0x87}},
-    {{0xe1,0xba,0x8d},	{0x78,0xcc,0x88}},
-    {{0xe1,0xbb,0xb3},	{0x79,0xcc,0x80}},
-    {{0xc3,0xbd},	{0x79,0xcc,0x81}},
-    {{0xc5,0xb7},	{0x79,0xcc,0x82}},
-    {{0xe1,0xbb,0xb9},	{0x79,0xcc,0x83}},
-    {{0xe1,0xba,0x8f},	{0x79,0xcc,0x87}},
-    {{0xc3,0xbf},	{0x79,0xcc,0x88}},
-    {{0xe1,0xbb,0xb7},	{0x79,0xcc,0x89}},
-    {{0xe1,0xba,0x99},	{0x79,0xcc,0x8a}},
-    {{0xe1,0xbb,0xb5},	{0x79,0xcc,0xa3}},
-    {{0xc5,0xba},	{0x7a,0xcc,0x81}},
-    {{0xe1,0xba,0x91},	{0x7a,0xcc,0x82}},
-    {{0xc5,0xbc},	{0x7a,0xcc,0x87}},
-    {{0xc5,0xbe},	{0x7a,0xcc,0x8c}},
-    {{0xe1,0xba,0x93},	{0x7a,0xcc,0xa3}},
-    {{0xe1,0xba,0x95},	{0x7a,0xcc,0xb1}},
-    {{0xe1,0xbf,0xad},	{0xc2,0xa8,0xcc,0x80}},
-    {{0xe1,0xbf,0xae},	{0xc2,0xa8,0xcc,0x81}},
-    {{0xce,0x85},	{0xc2,0xa8,0xcc,0x8d}},
-    {{0xe1,0xbf,0x81},	{0xc2,0xa8,0xcd,0x82}},
-    {{0xe1,0xbf,0xbd},	{0xc2,0xb4}},
-    {{0xce,0x87},	{0xc2,0xb7}},
-    {{0xd3,0x94},	{0xc3,0x86}},
-    {{0xc7,0xbc},	{0xc3,0x86,0xcc,0x81}},
-    {{0xc7,0xa2},	{0xc3,0x86,0xcc,0x84}},
-    {{0xc7,0xbe},	{0xc3,0x98,0xcc,0x81}},
-    {{0xd3,0x95},	{0xc3,0xa6}},
-    {{0xc7,0xbd},	{0xc3,0xa6,0xcc,0x81}},
-    {{0xc7,0xa3},	{0xc3,0xa6,0xcc,0x84}},
-    {{0xc7,0xbf},	{0xc3,0xb8,0xcc,0x81}},
-    {{0xe1,0xba,0x9b},	{0xc5,0xbf,0xcc,0x87}},
-    {{0xd3,0x98},	{0xc6,0x8f}},
-    {{0xd3,0x9a},	{0xc6,0x8f,0xcc,0x88}},
-    {{0xd3,0xa8},	{0xc6,0x9f}},
-    {{0xd3,0xaa},	{0xc6,0x9f,0xcc,0x88}},
-    {{0xd3,0xa0},	{0xc6,0xb7}},
-    {{0xc7,0xae},	{0xc6,0xb7,0xcc,0x8c}},
-    {{0xd3,0x99},	{0xc9,0x99}},
-    {{0xd3,0x9b},	{0xc9,0x99,0xcc,0x88}},
-    {{0xd3,0xa9},	{0xc9,0xb5}},
-    {{0xd3,0xab},	{0xc9,0xb5,0xcc,0x88}},
-    {{0xd3,0xa1},	{0xca,0x92}},
-    {{0xc7,0xaf},	{0xca,0x92,0xcc,0x8c}},
-    {{0xcd,0xb4},	{0xca,0xb9}},
-    {{0xcd,0x80},	{0xcc,0x80}},
-    {{0xcd,0x81},	{0xcc,0x81}},
-    {{0xcc,0x90},	{0xcc,0x86,0xcc,0x87}},
-    {{0xcd,0x84},	{0xcc,0x88,0xcc,0x8d}},
-    {{0xcd,0x83},	{0xcc,0x93}},
-    {{0xe1,0xbe,0xba},	{0xce,0x91,0xcc,0x80}},
-    {{0xe1,0xbe,0xbb},	{0xce,0x91,0xcc,0x81}},
-    {{0xe1,0xbe,0xb9},	{0xce,0x91,0xcc,0x84}},
-    {{0xe1,0xbe,0xb8},	{0xce,0x91,0xcc,0x86}},
-    {{0xce,0x86},	{0xce,0x91,0xcc,0x8d}},
-    {{0xe1,0xbc,0x88},	{0xce,0x91,0xcc,0x93}},
-    {{0xe1,0xbc,0x8a},	{0xce,0x91,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0x8c},	{0xce,0x91,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0x8e},	{0xce,0x91,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0x89},	{0xce,0x91,0xcc,0x94}},
-    {{0xe1,0xbc,0x8b},	{0xce,0x91,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0x8d},	{0xce,0x91,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0x8f},	{0xce,0x91,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbe,0xbc},	{0xce,0x91,0xcd,0x85}},
-    {{0xe1,0xbe,0x88},	{0xce,0x91,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0x8a},	{0xce,0x91,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0x8c},	{0xce,0x91,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0x8e},	{0xce,0x91,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0x89},	{0xce,0x91,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0x8b},	{0xce,0x91,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0x8d},	{0xce,0x91,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0x8f},	{0xce,0x91,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x88},	{0xce,0x95,0xcc,0x80}},
-    {{0xe1,0xbf,0x89},	{0xce,0x95,0xcc,0x81}},
-    {{0xce,0x88},	{0xce,0x95,0xcc,0x8d}},
-    {{0xe1,0xbc,0x98},	{0xce,0x95,0xcc,0x93}},
-    {{0xe1,0xbc,0x9a},	{0xce,0x95,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0x9c},	{0xce,0x95,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0x99},	{0xce,0x95,0xcc,0x94}},
-    {{0xe1,0xbc,0x9b},	{0xce,0x95,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0x9d},	{0xce,0x95,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbf,0x8a},	{0xce,0x97,0xcc,0x80}},
-    {{0xe1,0xbf,0x8b},	{0xce,0x97,0xcc,0x81}},
-    {{0xce,0x89},	{0xce,0x97,0xcc,0x8d}},
-    {{0xe1,0xbc,0xa8},	{0xce,0x97,0xcc,0x93}},
-    {{0xe1,0xbc,0xaa},	{0xce,0x97,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0xac},	{0xce,0x97,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0xae},	{0xce,0x97,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0xa9},	{0xce,0x97,0xcc,0x94}},
-    {{0xe1,0xbc,0xab},	{0xce,0x97,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0xad},	{0xce,0x97,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0xaf},	{0xce,0x97,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x8c},	{0xce,0x97,0xcd,0x85}},
-    {{0xe1,0xbe,0x98},	{0xce,0x97,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0x9a},	{0xce,0x97,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0x9c},	{0xce,0x97,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0x9e},	{0xce,0x97,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0x99},	{0xce,0x97,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0x9b},	{0xce,0x97,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0x9d},	{0xce,0x97,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0x9f},	{0xce,0x97,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x9a},	{0xce,0x99,0xcc,0x80}},
-    {{0xe1,0xbf,0x9b},	{0xce,0x99,0xcc,0x81}},
-    {{0xe1,0xbf,0x99},	{0xce,0x99,0xcc,0x84}},
-    {{0xe1,0xbf,0x98},	{0xce,0x99,0xcc,0x86}},
-    {{0xce,0xaa},	{0xce,0x99,0xcc,0x88}},
-    {{0xce,0x8a},	{0xce,0x99,0xcc,0x8d}},
-    {{0xe1,0xbc,0xb8},	{0xce,0x99,0xcc,0x93}},
-    {{0xe1,0xbc,0xba},	{0xce,0x99,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0xbc},	{0xce,0x99,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0xbe},	{0xce,0x99,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0xb9},	{0xce,0x99,0xcc,0x94}},
-    {{0xe1,0xbc,0xbb},	{0xce,0x99,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0xbd},	{0xce,0x99,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0xbf},	{0xce,0x99,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xb8},	{0xce,0x9f,0xcc,0x80}},
-    {{0xe1,0xbf,0xb9},	{0xce,0x9f,0xcc,0x81}},
-    {{0xce,0x8c},	{0xce,0x9f,0xcc,0x8d}},
-    {{0xe1,0xbd,0x88},	{0xce,0x9f,0xcc,0x93}},
-    {{0xe1,0xbd,0x8a},	{0xce,0x9f,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbd,0x8c},	{0xce,0x9f,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbd,0x89},	{0xce,0x9f,0xcc,0x94}},
-    {{0xe1,0xbd,0x8b},	{0xce,0x9f,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0x8d},	{0xce,0x9f,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbf,0xac},	{0xce,0xa1,0xcc,0x94}},
-    {{0xe1,0xbf,0xaa},	{0xce,0xa5,0xcc,0x80}},
-    {{0xe1,0xbf,0xab},	{0xce,0xa5,0xcc,0x81}},
-    {{0xe1,0xbf,0xa9},	{0xce,0xa5,0xcc,0x84}},
-    {{0xe1,0xbf,0xa8},	{0xce,0xa5,0xcc,0x86}},
-    {{0xce,0xab},	{0xce,0xa5,0xcc,0x88}},
-    {{0xce,0x8e},	{0xce,0xa5,0xcc,0x8d}},
-    {{0xe1,0xbd,0x99},	{0xce,0xa5,0xcc,0x94}},
-    {{0xe1,0xbd,0x9b},	{0xce,0xa5,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0x9d},	{0xce,0xa5,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbd,0x9f},	{0xce,0xa5,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xba},	{0xce,0xa9,0xcc,0x80}},
-    {{0xe1,0xbf,0xbb},	{0xce,0xa9,0xcc,0x81}},
-    {{0xce,0x8f},	{0xce,0xa9,0xcc,0x8d}},
-    {{0xe1,0xbd,0xa8},	{0xce,0xa9,0xcc,0x93}},
-    {{0xe1,0xbd,0xaa},	{0xce,0xa9,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbd,0xac},	{0xce,0xa9,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbd,0xae},	{0xce,0xa9,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbd,0xa9},	{0xce,0xa9,0xcc,0x94}},
-    {{0xe1,0xbd,0xab},	{0xce,0xa9,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0xad},	{0xce,0xa9,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbd,0xaf},	{0xce,0xa9,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xbc},	{0xce,0xa9,0xcd,0x85}},
-    {{0xe1,0xbe,0xa8},	{0xce,0xa9,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0xaa},	{0xce,0xa9,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0xac},	{0xce,0xa9,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0xae},	{0xce,0xa9,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0xa9},	{0xce,0xa9,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0xab},	{0xce,0xa9,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0xad},	{0xce,0xa9,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0xaf},	{0xce,0xa9,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbd,0xb0},	{0xce,0xb1,0xcc,0x80}},
-    {{0xe1,0xbd,0xb1},	{0xce,0xb1,0xcc,0x81}},
-    {{0xe1,0xbe,0xb1},	{0xce,0xb1,0xcc,0x84}},
-    {{0xe1,0xbe,0xb0},	{0xce,0xb1,0xcc,0x86}},
-    {{0xce,0xac},	{0xce,0xb1,0xcc,0x8d}},
-    {{0xe1,0xbc,0x80},	{0xce,0xb1,0xcc,0x93}},
-    {{0xe1,0xbc,0x82},	{0xce,0xb1,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0x84},	{0xce,0xb1,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0x86},	{0xce,0xb1,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0x81},	{0xce,0xb1,0xcc,0x94}},
-    {{0xe1,0xbc,0x83},	{0xce,0xb1,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0x85},	{0xce,0xb1,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0x87},	{0xce,0xb1,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbe,0xb6},	{0xce,0xb1,0xcd,0x82}},
-    {{0xe1,0xbe,0xb3},	{0xce,0xb1,0xcd,0x85}},
-    {{0xe1,0xbe,0xb2},	{0xce,0xb1,0xcd,0x85,0xcc,0x80}},
-    {{0xe1,0xbe,0xb4},	{0xce,0xb1,0xcd,0x85,0xcc,0x81}},
-    {{0xe1,0xbe,0x80},	{0xce,0xb1,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0x82},	{0xce,0xb1,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0x84},	{0xce,0xb1,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0x86},	{0xce,0xb1,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0x81},	{0xce,0xb1,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0x83},	{0xce,0xb1,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0x85},	{0xce,0xb1,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0x87},	{0xce,0xb1,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbe,0xb7},	{0xce,0xb1,0xcd,0x85,0xcd,0x82}},
-    {{0xe1,0xbd,0xb2},	{0xce,0xb5,0xcc,0x80}},
-    {{0xe1,0xbd,0xb3},	{0xce,0xb5,0xcc,0x81}},
-    {{0xce,0xad},	{0xce,0xb5,0xcc,0x8d}},
-    {{0xe1,0xbc,0x90},	{0xce,0xb5,0xcc,0x93}},
-    {{0xe1,0xbc,0x92},	{0xce,0xb5,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0x94},	{0xce,0xb5,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0x91},	{0xce,0xb5,0xcc,0x94}},
-    {{0xe1,0xbc,0x93},	{0xce,0xb5,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0x95},	{0xce,0xb5,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbd,0xb4},	{0xce,0xb7,0xcc,0x80}},
-    {{0xe1,0xbd,0xb5},	{0xce,0xb7,0xcc,0x81}},
-    {{0xce,0xae},	{0xce,0xb7,0xcc,0x8d}},
-    {{0xe1,0xbc,0xa0},	{0xce,0xb7,0xcc,0x93}},
-    {{0xe1,0xbc,0xa2},	{0xce,0xb7,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0xa4},	{0xce,0xb7,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0xa6},	{0xce,0xb7,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0xa1},	{0xce,0xb7,0xcc,0x94}},
-    {{0xe1,0xbc,0xa3},	{0xce,0xb7,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0xa5},	{0xce,0xb7,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0xa7},	{0xce,0xb7,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x86},	{0xce,0xb7,0xcd,0x82}},
-    {{0xe1,0xbf,0x83},	{0xce,0xb7,0xcd,0x85}},
-    {{0xe1,0xbf,0x82},	{0xce,0xb7,0xcd,0x85,0xcc,0x80}},
-    {{0xe1,0xbf,0x84},	{0xce,0xb7,0xcd,0x85,0xcc,0x81}},
-    {{0xe1,0xbe,0x90},	{0xce,0xb7,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0x92},	{0xce,0xb7,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0x94},	{0xce,0xb7,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0x96},	{0xce,0xb7,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0x91},	{0xce,0xb7,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0x93},	{0xce,0xb7,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0x95},	{0xce,0xb7,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0x97},	{0xce,0xb7,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x87},	{0xce,0xb7,0xcd,0x85,0xcd,0x82}},
-    {{0xe1,0xbe,0xbe},	{0xce,0xb9}},
-    {{0xe1,0xbd,0xb6},	{0xce,0xb9,0xcc,0x80}},
-    {{0xe1,0xbd,0xb7},	{0xce,0xb9,0xcc,0x81}},
-    {{0xe1,0xbf,0x91},	{0xce,0xb9,0xcc,0x84}},
-    {{0xe1,0xbf,0x90},	{0xce,0xb9,0xcc,0x86}},
-    {{0xcf,0x8a},	{0xce,0xb9,0xcc,0x88}},
-    {{0xe1,0xbf,0x92},	{0xce,0xb9,0xcc,0x88,0xcc,0x80}},
-    {{0xe1,0xbf,0x93},	{0xce,0xb9,0xcc,0x88,0xcc,0x81}},
-    {{0xce,0x90},	{0xce,0xb9,0xcc,0x88,0xcc,0x8d}},
-    {{0xe1,0xbf,0x97},	{0xce,0xb9,0xcc,0x88,0xcd,0x82}},
-    {{0xce,0xaf},	{0xce,0xb9,0xcc,0x8d}},
-    {{0xe1,0xbc,0xb0},	{0xce,0xb9,0xcc,0x93}},
-    {{0xe1,0xbc,0xb2},	{0xce,0xb9,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbc,0xb4},	{0xce,0xb9,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbc,0xb6},	{0xce,0xb9,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbc,0xb1},	{0xce,0xb9,0xcc,0x94}},
-    {{0xe1,0xbc,0xb3},	{0xce,0xb9,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbc,0xb5},	{0xce,0xb9,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbc,0xb7},	{0xce,0xb9,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0x96},	{0xce,0xb9,0xcd,0x82}},
-    {{0xe1,0xbd,0xb8},	{0xce,0xbf,0xcc,0x80}},
-    {{0xe1,0xbd,0xb9},	{0xce,0xbf,0xcc,0x81}},
-    {{0xcf,0x8c},	{0xce,0xbf,0xcc,0x8d}},
-    {{0xe1,0xbd,0x80},	{0xce,0xbf,0xcc,0x93}},
-    {{0xe1,0xbd,0x82},	{0xce,0xbf,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbd,0x84},	{0xce,0xbf,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbd,0x81},	{0xce,0xbf,0xcc,0x94}},
-    {{0xe1,0xbd,0x83},	{0xce,0xbf,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0x85},	{0xce,0xbf,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbf,0xb4},	{0xce,0xbf,0xcd,0x85,0xcc,0x81}},
-    {{0xe1,0xbf,0xa4},	{0xcf,0x81,0xcc,0x93}},
-    {{0xe1,0xbf,0xa5},	{0xcf,0x81,0xcc,0x94}},
-    {{0xe1,0xbd,0xba},	{0xcf,0x85,0xcc,0x80}},
-    {{0xe1,0xbd,0xbb},	{0xcf,0x85,0xcc,0x81}},
-    {{0xe1,0xbf,0xa1},	{0xcf,0x85,0xcc,0x84}},
-    {{0xe1,0xbf,0xa0},	{0xcf,0x85,0xcc,0x86}},
-    {{0xcf,0x8b},	{0xcf,0x85,0xcc,0x88}},
-    {{0xe1,0xbf,0xa2},	{0xcf,0x85,0xcc,0x88,0xcc,0x80}},
-    {{0xe1,0xbf,0xa3},	{0xcf,0x85,0xcc,0x88,0xcc,0x81}},
-    {{0xce,0xb0},	{0xcf,0x85,0xcc,0x88,0xcc,0x8d}},
-    {{0xe1,0xbf,0xa7},	{0xcf,0x85,0xcc,0x88,0xcd,0x82}},
-    {{0xcf,0x8d},	{0xcf,0x85,0xcc,0x8d}},
-    {{0xe1,0xbd,0x90},	{0xcf,0x85,0xcc,0x93}},
-    {{0xe1,0xbd,0x92},	{0xcf,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbd,0x94},	{0xcf,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbd,0x96},	{0xcf,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbd,0x91},	{0xcf,0x85,0xcc,0x94}},
-    {{0xe1,0xbd,0x93},	{0xcf,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0x95},	{0xcf,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbd,0x97},	{0xcf,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xa6},	{0xcf,0x85,0xcd,0x82}},
-    {{0xe1,0xbd,0xbc},	{0xcf,0x89,0xcc,0x80}},
-    {{0xe1,0xbd,0xbd},	{0xcf,0x89,0xcc,0x81}},
-    {{0xcf,0x8e},	{0xcf,0x89,0xcc,0x8d}},
-    {{0xe1,0xbd,0xa0},	{0xcf,0x89,0xcc,0x93}},
-    {{0xe1,0xbd,0xa2},	{0xcf,0x89,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbd,0xa4},	{0xcf,0x89,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbd,0xa6},	{0xcf,0x89,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbd,0xa1},	{0xcf,0x89,0xcc,0x94}},
-    {{0xe1,0xbd,0xa3},	{0xcf,0x89,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbd,0xa5},	{0xcf,0x89,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbd,0xa7},	{0xcf,0x89,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xb6},	{0xcf,0x89,0xcd,0x82}},
-    {{0xe1,0xbf,0xb3},	{0xcf,0x89,0xcd,0x85}},
-    {{0xe1,0xbf,0xb2},	{0xcf,0x89,0xcd,0x85,0xcc,0x80}},
-    {{0xe1,0xbe,0xa0},	{0xcf,0x89,0xcd,0x85,0xcc,0x93}},
-    {{0xe1,0xbe,0xa2},	{0xcf,0x89,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
-    {{0xe1,0xbe,0xa4},	{0xcf,0x89,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
-    {{0xe1,0xbe,0xa6},	{0xcf,0x89,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
-    {{0xe1,0xbe,0xa1},	{0xcf,0x89,0xcd,0x85,0xcc,0x94}},
-    {{0xe1,0xbe,0xa3},	{0xcf,0x89,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
-    {{0xe1,0xbe,0xa5},	{0xcf,0x89,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
-    {{0xe1,0xbe,0xa7},	{0xcf,0x89,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
-    {{0xe1,0xbf,0xb7},	{0xcf,0x89,0xcd,0x85,0xcd,0x82}},
-    {{0xcf,0x94},	{0xcf,0x92,0xcc,0x88}},
-    {{0xcf,0x93},	{0xcf,0x92,0xcc,0x8d}},
-    {{0xd0,0x87},	{0xd0,0x86,0xcc,0x88}},
-    {{0xd3,0x90},	{0xd0,0x90,0xcc,0x86}},
-    {{0xd3,0x92},	{0xd0,0x90,0xcc,0x88}},
-    {{0xd0,0x83},	{0xd0,0x93,0xcc,0x81}},
-    {{0xd3,0x96},	{0xd0,0x95,0xcc,0x86}},
-    {{0xd0,0x81},	{0xd0,0x95,0xcc,0x88}},
-    {{0xd3,0x81},	{0xd0,0x96,0xcc,0x86}},
-    {{0xd3,0x9c},	{0xd0,0x96,0xcc,0x88}},
-    {{0xd3,0x9e},	{0xd0,0x97,0xcc,0x88}},
-    {{0xd3,0xa2},	{0xd0,0x98,0xcc,0x84}},
-    {{0xd0,0x99},	{0xd0,0x98,0xcc,0x86}},
-    {{0xd3,0xa4},	{0xd0,0x98,0xcc,0x88}},
-    {{0xd0,0x8c},	{0xd0,0x9a,0xcc,0x81}},
-    {{0xd3,0xa6},	{0xd0,0x9e,0xcc,0x88}},
-    {{0xd3,0xae},	{0xd0,0xa3,0xcc,0x84}},
-    {{0xd0,0x8e},	{0xd0,0xa3,0xcc,0x86}},
-    {{0xd3,0xb0},	{0xd0,0xa3,0xcc,0x88}},
-    {{0xd3,0xb2},	{0xd0,0xa3,0xcc,0x8b}},
-    {{0xd3,0xb4},	{0xd0,0xa7,0xcc,0x88}},
-    {{0xd3,0xb8},	{0xd0,0xab,0xcc,0x88}},
-    {{0xd3,0x91},	{0xd0,0xb0,0xcc,0x86}},
-    {{0xd3,0x93},	{0xd0,0xb0,0xcc,0x88}},
-    {{0xd1,0x93},	{0xd0,0xb3,0xcc,0x81}},
-    {{0xd3,0x97},	{0xd0,0xb5,0xcc,0x86}},
-    {{0xd1,0x91},	{0xd0,0xb5,0xcc,0x88}},
-    {{0xd3,0x82},	{0xd0,0xb6,0xcc,0x86}},
-    {{0xd3,0x9d},	{0xd0,0xb6,0xcc,0x88}},
-    {{0xd3,0x9f},	{0xd0,0xb7,0xcc,0x88}},
-    {{0xd3,0xa3},	{0xd0,0xb8,0xcc,0x84}},
-    {{0xd0,0xb9},	{0xd0,0xb8,0xcc,0x86}},
-    {{0xd3,0xa5},	{0xd0,0xb8,0xcc,0x88}},
-    {{0xd1,0x9c},	{0xd0,0xba,0xcc,0x81}},
-    {{0xd3,0xa7},	{0xd0,0xbe,0xcc,0x88}},
-    {{0xd3,0xaf},	{0xd1,0x83,0xcc,0x84}},
-    {{0xd1,0x9e},	{0xd1,0x83,0xcc,0x86}},
-    {{0xd3,0xb1},	{0xd1,0x83,0xcc,0x88}},
-    {{0xd3,0xb3},	{0xd1,0x83,0xcc,0x8b}},
-    {{0xd3,0xb5},	{0xd1,0x87,0xcc,0x88}},
-    {{0xd3,0xb9},	{0xd1,0x8b,0xcc,0x88}},
-    {{0xd1,0x97},	{0xd1,0x96,0xcc,0x88}},
-    {{0xd1,0xb6},	{0xd1,0xb4,0xcc,0x8f}},
-    {{0xd1,0xb7},	{0xd1,0xb5,0xcc,0x8f}},
-    {{0xef,0xac,0xae},	{0xd7,0x90,0xd6,0xb7}},
-    {{0xef,0xac,0xaf},	{0xd7,0x90,0xd6,0xb8}},
-    {{0xef,0xac,0xb0},	{0xd7,0x90,0xd6,0xbc}},
-    {{0xef,0xac,0xb1},	{0xd7,0x91,0xd6,0xbc}},
-    {{0xef,0xad,0x8c},	{0xd7,0x91,0xd6,0xbf}},
-    {{0xef,0xac,0xb2},	{0xd7,0x92,0xd6,0xbc}},
-    {{0xef,0xac,0xb3},	{0xd7,0x93,0xd6,0xbc}},
-    {{0xef,0xac,0xb4},	{0xd7,0x94,0xd6,0xbc}},
-    {{0xef,0xad,0x8b},	{0xd7,0x95,0xd6,0xb9}},
-    {{0xef,0xac,0xb5},	{0xd7,0x95,0xd6,0xbc}},
-    {{0xef,0xac,0xb6},	{0xd7,0x96,0xd6,0xbc}},
-    {{0xef,0xac,0xb8},	{0xd7,0x98,0xd6,0xbc}},
-    {{0xef,0xac,0xb9},	{0xd7,0x99,0xd6,0xbc}},
-    {{0xef,0xac,0xba},	{0xd7,0x9a,0xd6,0xbc}},
-    {{0xef,0xac,0xbb},	{0xd7,0x9b,0xd6,0xbc}},
-    {{0xef,0xad,0x8d},	{0xd7,0x9b,0xd6,0xbf}},
-    {{0xef,0xac,0xbc},	{0xd7,0x9c,0xd6,0xbc}},
-    {{0xef,0xac,0xbe},	{0xd7,0x9e,0xd6,0xbc}},
-    {{0xef,0xad,0x80},	{0xd7,0xa0,0xd6,0xbc}},
-    {{0xef,0xad,0x81},	{0xd7,0xa1,0xd6,0xbc}},
-    {{0xef,0xad,0x83},	{0xd7,0xa3,0xd6,0xbc}},
-    {{0xef,0xad,0x84},	{0xd7,0xa4,0xd6,0xbc}},
-    {{0xef,0xad,0x8e},	{0xd7,0xa4,0xd6,0xbf}},
-    {{0xef,0xad,0x86},	{0xd7,0xa6,0xd6,0xbc}},
-    {{0xef,0xad,0x87},	{0xd7,0xa7,0xd6,0xbc}},
-    {{0xef,0xad,0x88},	{0xd7,0xa8,0xd6,0xbc}},
-    {{0xef,0xad,0x89},	{0xd7,0xa9,0xd6,0xbc}},
-    {{0xef,0xac,0xac},	{0xd7,0xa9,0xd6,0xbc,0xd7,0x81}},
-    {{0xef,0xac,0xad},	{0xd7,0xa9,0xd6,0xbc,0xd7,0x82}},
-    {{0xef,0xac,0xaa},	{0xd7,0xa9,0xd7,0x81}},
-    {{0xef,0xac,0xab},	{0xd7,0xa9,0xd7,0x82}},
-    {{0xef,0xad,0x8a},	{0xd7,0xaa,0xd6,0xbc}},
-    {{0xef,0xac,0x9f},	{0xd7,0xb2,0xd6,0xb7}},
-    {{0xe0,0xa5,0x98},	{0xe0,0xa4,0x95,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x99},	{0xe0,0xa4,0x96,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9a},	{0xe0,0xa4,0x97,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9b},	{0xe0,0xa4,0x9c,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9c},	{0xe0,0xa4,0xa1,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9d},	{0xe0,0xa4,0xa2,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa4,0xa9},	{0xe0,0xa4,0xa8,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9e},	{0xe0,0xa4,0xab,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa5,0x9f},	{0xe0,0xa4,0xaf,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa4,0xb1},	{0xe0,0xa4,0xb0,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa4,0xb4},	{0xe0,0xa4,0xb3,0xe0,0xa4,0xbc}},
-    {{0xe0,0xa7,0x9c},	{0xe0,0xa6,0xa1,0xe0,0xa6,0xbc}},
-    {{0xe0,0xa7,0x9d},	{0xe0,0xa6,0xa2,0xe0,0xa6,0xbc}},
-    {{0xe0,0xa6,0xb0},	{0xe0,0xa6,0xac,0xe0,0xa6,0xbc}},
-    {{0xe0,0xa7,0x9f},	{0xe0,0xa6,0xaf,0xe0,0xa6,0xbc}},
-    {{0xe0,0xa7,0x8b},	{0xe0,0xa7,0x87,0xe0,0xa6,0xbe}},
-    {{0xe0,0xa7,0x8c},	{0xe0,0xa7,0x87,0xe0,0xa7,0x97}},
-    {{0xe0,0xa9,0x99},	{0xe0,0xa8,0x96,0xe0,0xa8,0xbc}},
-    {{0xe0,0xa9,0x9a},	{0xe0,0xa8,0x97,0xe0,0xa8,0xbc}},
-    {{0xe0,0xa9,0x9b},	{0xe0,0xa8,0x9c,0xe0,0xa8,0xbc}},
-    {{0xe0,0xa9,0x9c},	{0xe0,0xa8,0xa1,0xe0,0xa8,0xbc}},
-    {{0xe0,0xa9,0x9e},	{0xe0,0xa8,0xab,0xe0,0xa8,0xbc}},
-    {{0xe0,0xad,0x9c},	{0xe0,0xac,0xa1,0xe0,0xac,0xbc}},
-    {{0xe0,0xad,0x9d},	{0xe0,0xac,0xa2,0xe0,0xac,0xbc}},
-    {{0xe0,0xad,0x9f},	{0xe0,0xac,0xaf,0xe0,0xac,0xbc}},
-    {{0xe0,0xad,0x8b},	{0xe0,0xad,0x87,0xe0,0xac,0xbe}},
-    {{0xe0,0xad,0x88},	{0xe0,0xad,0x87,0xe0,0xad,0x96}},
-    {{0xe0,0xad,0x8c},	{0xe0,0xad,0x87,0xe0,0xad,0x97}},
-    {{0xe0,0xae,0x94},	{0xe0,0xae,0x92,0xe0,0xaf,0x97}},
-    {{0xe0,0xaf,0x8a},	{0xe0,0xaf,0x86,0xe0,0xae,0xbe}},
-    {{0xe0,0xaf,0x8c},	{0xe0,0xaf,0x86,0xe0,0xaf,0x97}},
-    {{0xe0,0xaf,0x8b},	{0xe0,0xaf,0x87,0xe0,0xae,0xbe}},
-    {{0xe0,0xb1,0x88},	{0xe0,0xb1,0x86,0xe0,0xb1,0x96}},
-    {{0xe0,0xb3,0x80},	{0xe0,0xb2,0xbf,0xe0,0xb3,0x95}},
-    {{0xe0,0xb3,0x8a},	{0xe0,0xb3,0x86,0xe0,0xb3,0x82}},
-    {{0xe0,0xb3,0x8b},	{0xe0,0xb3,0x86,0xe0,0xb3,0x82,0xe0,0xb3,0x95}},
-    {{0xe0,0xb3,0x87},	{0xe0,0xb3,0x86,0xe0,0xb3,0x95}},
-    {{0xe0,0xb3,0x88},	{0xe0,0xb3,0x86,0xe0,0xb3,0x96}},
-    {{0xe0,0xb5,0x8a},	{0xe0,0xb5,0x86,0xe0,0xb4,0xbe}},
-    {{0xe0,0xb5,0x8c},	{0xe0,0xb5,0x86,0xe0,0xb5,0x97}},
-    {{0xe0,0xb5,0x8b},	{0xe0,0xb5,0x87,0xe0,0xb4,0xbe}},
-    {{0xe0,0xb8,0xb3},	{0xe0,0xb9,0x8d,0xe0,0xb8,0xb2}},
-    {{0xe0,0xba,0xb3},	{0xe0,0xbb,0x8d,0xe0,0xba,0xb2}},
-    {{0xe0,0xbd,0xa9},	{0xe0,0xbd,0x80,0xe0,0xbe,0xb5}},
-    {{0xe0,0xbd,0x83},	{0xe0,0xbd,0x82,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0x8d},	{0xe0,0xbd,0x8c,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0x92},	{0xe0,0xbd,0x91,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0x97},	{0xe0,0xbd,0x96,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0x9c},	{0xe0,0xbd,0x9b,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0xb3},	{0xe0,0xbd,0xb2,0xe0,0xbd,0xb1}},
-    {{0xe0,0xbd,0xb5},	{0xe0,0xbd,0xb4,0xe0,0xbd,0xb1}},
-    {{0xe0,0xbe,0x81},	{0xe0,0xbe,0x80,0xe0,0xbd,0xb1}},
-    {{0xe0,0xbe,0xb9},	{0xe0,0xbe,0x90,0xe0,0xbe,0xb5}},
-    {{0xe0,0xbe,0x93},	{0xe0,0xbe,0x92,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbe,0x9d},	{0xe0,0xbe,0x9c,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbe,0xa2},	{0xe0,0xbe,0xa1,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbe,0xa7},	{0xe0,0xbe,0xa6,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbe,0xac},	{0xe0,0xbe,0xab,0xe0,0xbe,0xb7}},
-    {{0xe0,0xbd,0xb6},	{0xe0,0xbe,0xb2,0xe0,0xbe,0x80}},
-    {{0xe0,0xbd,0xb7},	{0xe0,0xbe,0xb2,0xe0,0xbe,0x80,0xe0,0xbd,0xb1}},
-    {{0xe0,0xbd,0xb8},	{0xe0,0xbe,0xb3,0xe0,0xbe,0x80}},
-    {{0xe0,0xbd,0xb9},	{0xe0,0xbe,0xb3,0xe0,0xbe,0x80,0xe0,0xbd,0xb1}},
-    {{0xe1,0xbf,0x8d},	{0xe1,0xbe,0xbf,0xcc,0x80}},
-    {{0xe1,0xbf,0x8e},	{0xe1,0xbe,0xbf,0xcc,0x81}},
-    {{0xe1,0xbf,0x8f},	{0xe1,0xbe,0xbf,0xcd,0x82}},
-    {{0xe1,0xbf,0x9d},	{0xe1,0xbf,0xbe,0xcc,0x80}},
-    {{0xe1,0xbf,0x9e},	{0xe1,0xbf,0xbe,0xcc,0x81}},
-    {{0xe1,0xbf,0x9f},	{0xe1,0xbf,0xbe,0xcd,0x82}},
-    {{0xe3,0x82,0x94},	{0xe3,0x81,0x86,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x8c},	{0xe3,0x81,0x8b,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x8e},	{0xe3,0x81,0x8d,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x90},	{0xe3,0x81,0x8f,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x92},	{0xe3,0x81,0x91,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x94},	{0xe3,0x81,0x93,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x96},	{0xe3,0x81,0x95,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x98},	{0xe3,0x81,0x97,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x9a},	{0xe3,0x81,0x99,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x9c},	{0xe3,0x81,0x9b,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0x9e},	{0xe3,0x81,0x9d,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xa0},	{0xe3,0x81,0x9f,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xa2},	{0xe3,0x81,0xa1,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xa5},	{0xe3,0x81,0xa4,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xa7},	{0xe3,0x81,0xa6,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xa9},	{0xe3,0x81,0xa8,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xb0},	{0xe3,0x81,0xaf,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xb1},	{0xe3,0x81,0xaf,0xe3,0x82,0x9a}},
-    {{0xe3,0x81,0xb3},	{0xe3,0x81,0xb2,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xb4},	{0xe3,0x81,0xb2,0xe3,0x82,0x9a}},
-    {{0xe3,0x81,0xb6},	{0xe3,0x81,0xb5,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xb7},	{0xe3,0x81,0xb5,0xe3,0x82,0x9a}},
-    {{0xe3,0x81,0xb9},	{0xe3,0x81,0xb8,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xba},	{0xe3,0x81,0xb8,0xe3,0x82,0x9a}},
-    {{0xe3,0x81,0xbc},	{0xe3,0x81,0xbb,0xe3,0x82,0x99}},
-    {{0xe3,0x81,0xbd},	{0xe3,0x81,0xbb,0xe3,0x82,0x9a}},
-    {{0xe3,0x82,0x9e},	{0xe3,0x82,0x9d,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0xb4},	{0xe3,0x82,0xa6,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xac},	{0xe3,0x82,0xab,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xae},	{0xe3,0x82,0xad,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xb0},	{0xe3,0x82,0xaf,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xb2},	{0xe3,0x82,0xb1,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xb4},	{0xe3,0x82,0xb3,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xb6},	{0xe3,0x82,0xb5,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xb8},	{0xe3,0x82,0xb7,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xba},	{0xe3,0x82,0xb9,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xbc},	{0xe3,0x82,0xbb,0xe3,0x82,0x99}},
-    {{0xe3,0x82,0xbe},	{0xe3,0x82,0xbd,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x80},	{0xe3,0x82,0xbf,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x82},	{0xe3,0x83,0x81,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x85},	{0xe3,0x83,0x84,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x87},	{0xe3,0x83,0x86,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x89},	{0xe3,0x83,0x88,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x90},	{0xe3,0x83,0x8f,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x91},	{0xe3,0x83,0x8f,0xe3,0x82,0x9a}},
-    {{0xe3,0x83,0x93},	{0xe3,0x83,0x92,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x94},	{0xe3,0x83,0x92,0xe3,0x82,0x9a}},
-    {{0xe3,0x83,0x96},	{0xe3,0x83,0x95,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x97},	{0xe3,0x83,0x95,0xe3,0x82,0x9a}},
-    {{0xe3,0x83,0x99},	{0xe3,0x83,0x98,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x9a},	{0xe3,0x83,0x98,0xe3,0x82,0x9a}},
-    {{0xe3,0x83,0x9c},	{0xe3,0x83,0x9b,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0x9d},	{0xe3,0x83,0x9b,0xe3,0x82,0x9a}},
-    {{0xe3,0x83,0xb7},	{0xe3,0x83,0xaf,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0xb8},	{0xe3,0x83,0xb0,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0xb9},	{0xe3,0x83,0xb1,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0xba},	{0xe3,0x83,0xb2,0xe3,0x82,0x99}},
-    {{0xe3,0x83,0xbe},	{0xe3,0x83,0xbd,0xe3,0x82,0x99}},
-};
-#endif /* UNICODE_NORMALIZATION */
-#endif /* UTF8_INPUT_ENABLE */
-
-#ifdef SHIFTJIS_CP932
-const unsigned short shiftjis_cp932[3][189] = {
- {
-  0xEEEF, 0xEEF0, 0xEEF1, 0xEEF2, 0xEEF3, 0xEEF4, 0xEEF5, 0xEEF6,
-  0xEEF7, 0xEEF8, 0x8754, 0x8755, 0x8756, 0x8757, 0x8758, 0x8759,
-  0x875A, 0x875B, 0x875C, 0x875D, 0x81CA, 0xEEFA, 0xEEFB, 0xEEFC,
-  0x878A, 0x8782, 0x8784, 0x81E6, 0xED40, 0xED41, 0xED42, 0xED43,
-  0xED44, 0xED45, 0xED46, 0xED47, 0xED48, 0xED49, 0xED4A, 0xED4B,
-  0xED4C, 0xED4D, 0xED4E, 0xED4F, 0xED50, 0xED51, 0xED52, 0xED53,
-  0xED54, 0xED55, 0xED56, 0xED57, 0xED58, 0xED59, 0xED5A, 0xED5B,
-  0xED5C, 0xED5D, 0xED5E, 0xED5F, 0xED60, 0xED61, 0xED62,      0,
-  0xED63, 0xED64, 0xED65, 0xED66, 0xED67, 0xED68, 0xED69, 0xED6A,
-  0xED6B, 0xED6C, 0xED6D, 0xED6E, 0xED6F, 0xED70, 0xED71, 0xED72,
-  0xED73, 0xED74, 0xED75, 0xED76, 0xED77, 0xED78, 0xED79, 0xED7A,
-  0xED7B, 0xED7C, 0xED7D, 0xED7E, 0xED80, 0xED81, 0xED82, 0xED83,
-  0xED84, 0xED85, 0xED86, 0xED87, 0xED88, 0xED89, 0xED8A, 0xED8B,
-  0xED8C, 0xED8D, 0xED8E, 0xED8F, 0xED90, 0xED91, 0xED92, 0xED93,
-  0xED94, 0xED95, 0xED96, 0xED97, 0xED98, 0xED99, 0xED9A, 0xED9B,
-  0xED9C, 0xED9D, 0xED9E, 0xED9F, 0xEDA0, 0xEDA1, 0xEDA2, 0xEDA3,
-  0xEDA4, 0xEDA5, 0xEDA6, 0xEDA7, 0xEDA8, 0xEDA9, 0xEDAA, 0xEDAB,
-  0xEDAC, 0xEDAD, 0xEDAE, 0xEDAF, 0xEDB0, 0xEDB1, 0xEDB2, 0xEDB3,
-  0xEDB4, 0xEDB5, 0xEDB6, 0xEDB7, 0xEDB8, 0xEDB9, 0xEDBA, 0xEDBB,
-  0xEDBC, 0xEDBD, 0xEDBE, 0xEDBF, 0xEDC0, 0xEDC1, 0xEDC2, 0xEDC3,
-  0xEDC4, 0xEDC5, 0xEDC6, 0xEDC7, 0xEDC8, 0xEDC9, 0xEDCA, 0xEDCB,
-  0xEDCC, 0xEDCD, 0xEDCE, 0xEDCF, 0xEDD0, 0xEDD1, 0xEDD2, 0xEDD3,
-  0xEDD4, 0xEDD5, 0xEDD6, 0xEDD7, 0xEDD8, 0xEDD9, 0xEDDA, 0xEDDB,
-  0xEDDC, 0xEDDD, 0xEDDE, 0xEDDF, 0xEDE0,
- },
- {
-  0xEDE1, 0xEDE2, 0xEDE3, 0xEDE4, 0xEDE5, 0xEDE6, 0xEDE7, 0xEDE8,
-  0xEDE9, 0xEDEA, 0xEDEB, 0xEDEC, 0xEDED, 0xEDEE, 0xEDEF, 0xEDF0,
-  0xEDF1, 0xEDF2, 0xEDF3, 0xEDF4, 0xEDF5, 0xEDF6, 0xEDF7, 0xEDF8,
-  0xEDF9, 0xEDFA, 0xEDFB, 0xEDFC, 0xEE40, 0xEE41, 0xEE42, 0xEE43,
-  0xEE44, 0xEE45, 0xEE46, 0xEE47, 0xEE48, 0xEE49, 0xEE4A, 0xEE4B,
-  0xEE4C, 0xEE4D, 0xEE4E, 0xEE4F, 0xEE50, 0xEE51, 0xEE52, 0xEE53,
-  0xEE54, 0xEE55, 0xEE56, 0xEE57, 0xEE58, 0xEE59, 0xEE5A, 0xEE5B,
-  0xEE5C, 0xEE5D, 0xEE5E, 0xEE5F, 0xEE60, 0xEE61, 0xEE62,      0,
-  0xEE63, 0xEE64, 0xEE65, 0xEE66, 0xEE67, 0xEE68, 0xEE69, 0xEE6A,
-  0xEE6B, 0xEE6C, 0xEE6D, 0xEE6E, 0xEE6F, 0xEE70, 0xEE71, 0xEE72,
-  0xEE73, 0xEE74, 0xEE75, 0xEE76, 0xEE77, 0xEE78, 0xEE79, 0xEE7A,
-  0xEE7B, 0xEE7C, 0xEE7D, 0xEE7E, 0xEE80, 0xEE81, 0xEE82, 0xEE83,
-  0xEE84, 0xEE85, 0xEE86, 0xEE87, 0xEE88, 0xEE89, 0xEE8A, 0xEE8B,
-  0xEE8C, 0xEE8D, 0xEE8E, 0xEE8F, 0xEE90, 0xEE91, 0xEE92, 0xEE93,
-  0xEE94, 0xEE95, 0xEE96, 0xEE97, 0xEE98, 0xEE99, 0xEE9A, 0xEE9B,
-  0xEE9C, 0xEE9D, 0xEE9E, 0xEE9F, 0xEEA0, 0xEEA1, 0xEEA2, 0xEEA3,
-  0xEEA4, 0xEEA5, 0xEEA6, 0xEEA7, 0xEEA8, 0xEEA9, 0xEEAA, 0xEEAB,
-  0xEEAC, 0xEEAD, 0xEEAE, 0xEEAF, 0xEEB0, 0xEEB1, 0xEEB2, 0xEEB3,
-  0xEEB4, 0xEEB5, 0xEEB6, 0xEEB7, 0xEEB8, 0xEEB9, 0xEEBA, 0xEEBB,
-  0xEEBC, 0xEEBD, 0xEEBE, 0xEEBF, 0xEEC0, 0xEEC1, 0xEEC2, 0xEEC3,
-  0xEEC4, 0xEEC5, 0xEEC6, 0xEEC7, 0xEEC8, 0xEEC9, 0xEECA, 0xEECB,
-  0xEECC, 0xEECD, 0xEECE, 0xEECF, 0xEED0, 0xEED1, 0xEED2, 0xEED3,
-  0xEED4, 0xEED5, 0xEED6, 0xEED7, 0xEED8, 0xEED9, 0xEEDA, 0xEEDB,
-  0xEEDC, 0xEEDD, 0xEEDE, 0xEEDF, 0xEEE0,
- },
- {
-  0xEEE1, 0xEEE2, 0xEEE3, 0xEEE4, 0xEEE5, 0xEEE6, 0xEEE7, 0xEEE8,
-  0xEEE9, 0xEEEA, 0xEEEB, 0xEEEC,      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,      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,      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,
- },
-};
-const unsigned short cp932inv[2][189] = {
- {
-  0xFA5C, 0xFA5D, 0xFA5E, 0xFA5F, 0xFA60, 0xFA61, 0xFA62, 0xFA63,
-  0xFA64, 0xFA65, 0xFA66, 0xFA67, 0xFA68, 0xFA69, 0xFA6A, 0xFA6B,
-  0xFA6C, 0xFA6D, 0xFA6E, 0xFA6F, 0xFA70, 0xFA71, 0xFA72, 0xFA73,
-  0xFA74, 0xFA75, 0xFA76, 0xFA77, 0xFA78, 0xFA79, 0xFA7A, 0xFA7B,
-  0xFA7C, 0xFA7D, 0xFA7E, 0xFA80, 0xFA81, 0xFA82, 0xFA83, 0xFA84,
-  0xFA85, 0xFA86, 0xFA87, 0xFA88, 0xFA89, 0xFA8A, 0xFA8B, 0xFA8C,
-  0xFA8D, 0xFA8E, 0xFA8F, 0xFA90, 0xFA91, 0xFA92, 0xFA93, 0xFA94,
-  0xFA95, 0xFA96, 0xFA97, 0xFA98, 0xFA99, 0xFA9A, 0xFA9B,      0,
-  0xFA9C, 0xFA9D, 0xFA9E, 0xFA9F, 0xFAA0, 0xFAA1, 0xFAA2, 0xFAA3,
-  0xFAA4, 0xFAA5, 0xFAA6, 0xFAA7, 0xFAA8, 0xFAA9, 0xFAAA, 0xFAAB,
-  0xFAAC, 0xFAAD, 0xFAAE, 0xFAAF, 0xFAB0, 0xFAB1, 0xFAB2, 0xFAB3,
-  0xFAB4, 0xFAB5, 0xFAB6, 0xFAB7, 0xFAB8, 0xFAB9, 0xFABA, 0xFABB,
-  0xFABC, 0xFABD, 0xFABE, 0xFABF, 0xFAC0, 0xFAC1, 0xFAC2, 0xFAC3,
-  0xFAC4, 0xFAC5, 0xFAC6, 0xFAC7, 0xFAC8, 0xFAC9, 0xFACA, 0xFACB,
-  0xFACC, 0xFACD, 0xFACE, 0xFACF, 0xFAD0, 0xFAD1, 0xFAD2, 0xFAD3,
-  0xFAD4, 0xFAD5, 0xFAD6, 0xFAD7, 0xFAD8, 0xFAD9, 0xFADA, 0xFADB,
-  0xFADC, 0xFADD, 0xFADE, 0xFADF, 0xFAE0, 0xFAE1, 0xFAE2, 0xFAE3,
-  0xFAE4, 0xFAE5, 0xFAE6, 0xFAE7, 0xFAE8, 0xFAE9, 0xFAEA, 0xFAEB,
-  0xFAEC, 0xFAED, 0xFAEE, 0xFAEF, 0xFAF0, 0xFAF1, 0xFAF2, 0xFAF3,
-  0xFAF4, 0xFAF5, 0xFAF6, 0xFAF7, 0xFAF8, 0xFAF9, 0xFAFA, 0xFAFB,
-  0xFAFC, 0xFB40, 0xFB41, 0xFB42, 0xFB43, 0xFB44, 0xFB45, 0xFB46,
-  0xFB47, 0xFB48, 0xFB49, 0xFB4A, 0xFB4B, 0xFB4C, 0xFB4D, 0xFB4E,
-  0xFB4F, 0xFB50, 0xFB51, 0xFB52, 0xFB53, 0xFB54, 0xFB55, 0xFB56,
-  0xFB57, 0xFB58, 0xFB59, 0xFB5A, 0xFB5B,
- },
- {
-  0xFB5C, 0xFB5D, 0xFB5E, 0xFB5F, 0xFB60, 0xFB61, 0xFB62, 0xFB63,
-  0xFB64, 0xFB65, 0xFB66, 0xFB67, 0xFB68, 0xFB69, 0xFB6A, 0xFB6B,
-  0xFB6C, 0xFB6D, 0xFB6E, 0xFB6F, 0xFB70, 0xFB71, 0xFB72, 0xFB73,
-  0xFB74, 0xFB75, 0xFB76, 0xFB77, 0xFB78, 0xFB79, 0xFB7A, 0xFB7B,
-  0xFB7C, 0xFB7D, 0xFB7E, 0xFB80, 0xFB81, 0xFB82, 0xFB83, 0xFB84,
-  0xFB85, 0xFB86, 0xFB87, 0xFB88, 0xFB89, 0xFB8A, 0xFB8B, 0xFB8C,
-  0xFB8D, 0xFB8E, 0xFB8F, 0xFB90, 0xFB91, 0xFB92, 0xFB93, 0xFB94,
-  0xFB95, 0xFB96, 0xFB97, 0xFB98, 0xFB99, 0xFB9A, 0xFB9B,      0,
-  0xFB9C, 0xFB9D, 0xFB9E, 0xFB9F, 0xFBA0, 0xFBA1, 0xFBA2, 0xFBA3,
-  0xFBA4, 0xFBA5, 0xFBA6, 0xFBA7, 0xFBA8, 0xFBA9, 0xFBAA, 0xFBAB,
-  0xFBAC, 0xFBAD, 0xFBAE, 0xFBAF, 0xFBB0, 0xFBB1, 0xFBB2, 0xFBB3,
-  0xFBB4, 0xFBB5, 0xFBB6, 0xFBB7, 0xFBB8, 0xFBB9, 0xFBBA, 0xFBBB,
-  0xFBBC, 0xFBBD, 0xFBBE, 0xFBBF, 0xFBC0, 0xFBC1, 0xFBC2, 0xFBC3,
-  0xFBC4, 0xFBC5, 0xFBC6, 0xFBC7, 0xFBC8, 0xFBC9, 0xFBCA, 0xFBCB,
-  0xFBCC, 0xFBCD, 0xFBCE, 0xFBCF, 0xFBD0, 0xFBD1, 0xFBD2, 0xFBD3,
-  0xFBD4, 0xFBD5, 0xFBD6, 0xFBD7, 0xFBD8, 0xFBD9, 0xFBDA, 0xFBDB,
-  0xFBDC, 0xFBDD, 0xFBDE, 0xFBDF, 0xFBE0, 0xFBE1, 0xFBE2, 0xFBE3,
-  0xFBE4, 0xFBE5, 0xFBE6, 0xFBE7, 0xFBE8, 0xFBE9, 0xFBEA, 0xFBEB,
-  0xFBEC, 0xFBED, 0xFBEE, 0xFBEF, 0xFBF0, 0xFBF1, 0xFBF2, 0xFBF3,
-  0xFBF4, 0xFBF5, 0xFBF6, 0xFBF7, 0xFBF8, 0xFBF9, 0xFBFA, 0xFBFB,
-  0xFBFC, 0xFC40, 0xFC41, 0xFC42, 0xFC43, 0xFC44, 0xFC45, 0xFC46,
-  0xFC47, 0xFC48, 0xFC49, 0xFC4A, 0xFC4B,      0,      0, 0xFA40,
-  0xFA41, 0xFA42, 0xFA43, 0xFA44, 0xFA45, 0xFA46, 0xFA47, 0xFA48,
-  0xFA49,      0, 0xFA55, 0xFA56, 0xFA57,
- },
-};
-#endif /* SHIFTJIS_CP932 */
-
-#ifdef X0212_ENABLE
-const unsigned short shiftjis_x0212[3][189] = {
- {
-  0xF373, 0xF374, 0xF375, 0xF376, 0xF377, 0xF378, 0xF379, 0xF37A,
-  0xF37B, 0xF37C, 0xF37D, 0xF37E, 0xF421, 0xF422, 0xF423, 0xF424,
-  0xF425, 0xF426, 0xF427, 0xF428, 0x224C, 0xA243, 0xF429, 0xF42A,
-  0xF42B, 0xF42C, 0xF42D, 0x2268, 0xD463, 0xDC5F, 0xE469, 0xE378,
-  0xD921, 0xB13B, 0xF42E, 0xC22D, 0xC37C, 0xE450, 0xC23F, 0xBC74,
-  0xB029, 0xB048, 0xF42F, 0xB052, 0xB054, 0xB063, 0xB06E, 0xB127,
-  0xB123, 0xB12C, 0xB129, 0xB13E, 0xB15F, 0xB158, 0xB148, 0xB157,
-  0xB163, 0xB174, 0xB161, 0xB223, 0xF430, 0xB23B, 0xB266,      0,
-  0xB26D, 0xB275, 0xB27C, 0xF431, 0xB335, 0xB358, 0xB35B, 0xB365,
-  0xB36E, 0xB37B, 0xF432, 0xF433, 0xB440, 0xB447, 0xB450, 0xB45E,
-  0xF434, 0xB52A, 0xF435, 0xB52F, 0xB544, 0xB568, 0xF436, 0xB742,
-  0xB764, 0xB768, 0xB767, 0xF437, 0xF438, 0xF439, 0xB84E, 0xB861,
-  0xB875, 0xB877, 0xB878, 0xB87C, 0xB92F, 0xB937, 0xBA3E, 0xBA5B,
-  0xCD2A, 0xBA61, 0xF43A, 0xBA6B, 0xBB33, 0xBB38, 0xF43B, 0xBB4A,
-  0xF43C, 0xF43D, 0xBB50, 0xBB5E, 0xBB74, 0xBB75, 0xBB79, 0xBC64,
-  0xBC6D, 0xBC7E, 0xF43E, 0xBD42, 0xBD67, 0xF43F, 0xBD70, 0xBE30,
-  0xBE2C, 0xF440, 0xBE33, 0xBE3D, 0xBE4D, 0xBE49, 0xBE64, 0xBF28,
-  0xBF49, 0xC044, 0xC064, 0xC074, 0xC126, 0xF441, 0xC175, 0xC17C,
-  0xF442, 0xC178, 0xC22B, 0xC221, 0xC225, 0xF443, 0xC238, 0xC23A,
-  0xF444, 0xC244, 0xC252, 0xC257, 0xC25B, 0xC25E, 0xC26D, 0xC270,
-  0xF445, 0xC321, 0xC335, 0xC349, 0xC339, 0xF446, 0xC358, 0xC37E,
-  0xF447, 0xC44C, 0xF448, 0xC459, 0xC46A, 0xC47D, 0xF449, 0xC527,
-  0xC535, 0xC536, 0xF44A, 0xC555, 0xC638, 0xC657, 0xC660, 0xC66A,
-  0xC663, 0xC721, 0xC72B, 0xC747, 0xC743,
- },
- {
-  0xC74B, 0xC74F, 0xC759, 0xF44B, 0xF44C, 0xC766, 0xC76E, 0xC77C,
-  0xC76B, 0xC770, 0xC831, 0xC865, 0xC878, 0xC926, 0xC92B, 0xC92D,
-  0xF44D, 0xC94A, 0xC953, 0xC969, 0xC963, 0xC97C, 0xC974, 0xC975,
-  0xF44E, 0xCA33, 0xCA3D, 0xCA6F, 0xCA71, 0xCB2E, 0xF44F, 0xCB4A,
-  0xCB66, 0xCB6A, 0xCB70, 0xCB74, 0xCB6E, 0xCC25, 0xCB79, 0xCC2B,
-  0xCC2E, 0xCC2D, 0xCC32, 0xCC42, 0xCC50, 0xCC59, 0xF450, 0xCD3B,
-  0xF451, 0xCE3B, 0xF452, 0xCE3A, 0xCE43, 0xF453, 0xCE72, 0xB35D,
-  0xCF55, 0xCF62, 0xCF69, 0xCF6D, 0xF454, 0xF455, 0xF456,      0,
-  0xF457, 0xD065, 0xF458, 0xD069, 0xD168, 0xF459, 0xF45A, 0xD16C,
-  0xD23B, 0xF45B, 0xD361, 0xD368, 0xD427, 0xF45C, 0xF45D, 0xD454,
-  0xD472, 0xD52E, 0xF45E, 0xD75E, 0xF45F, 0xD822, 0xD837, 0xD841,
-  0xD851, 0xD874, 0xD946, 0xD948, 0xD951, 0xF460, 0xF461, 0xF462,
-  0xF463, 0xF464, 0xDC53, 0xDD48, 0xDD54, 0xDD6A, 0xDD7A, 0xDE24,
-  0xDE30, 0xF465, 0xDE35, 0xDE4B, 0xF466, 0xDF39, 0xF467, 0xDF43,
-  0xF468, 0xF469, 0xE059, 0xF46A, 0xF46B, 0xE162, 0xF46C, 0xF46D,
-  0xF46E, 0xE247, 0xE328, 0xE326, 0xE329, 0xE32F, 0xE330, 0xE32A,
-  0xE32B, 0xE33C, 0xE341, 0xE33F, 0xE355, 0xE358, 0xE356, 0xE35F,
-  0xE363, 0xE361, 0xE354, 0xE369, 0xE426, 0xE371, 0xE372, 0xE44B,
-  0xE441, 0xE443, 0xE43E, 0xF46F, 0xE440, 0xE447, 0xE43F, 0xE460,
-  0xE45E, 0xE451, 0xF470, 0xE45C, 0xE452, 0xE45B, 0xE454, 0xE47A,
-  0xE46F, 0xE533, 0xE53F, 0xE549, 0xE550, 0xE562, 0xE56A, 0xE56B,
-  0xF471, 0xF472, 0xF473, 0xE668, 0xE66F, 0xE72C, 0xF474, 0xE72E,
-  0xF475, 0xE731, 0xF476, 0xE732, 0xE831, 0xE836, 0xF477, 0xF478,
-  0xE85D, 0xF479, 0xF47A, 0xE951, 0xF47B,
- },
- {
-  0xE96D, 0xEA4D, 0xF47C, 0xEA5B, 0xEA66, 0xEA6A, 0xEB25, 0xEB7B,
-  0xEB7A, 0xF47D, 0xEC56, 0xF47E,      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,      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,      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,
- },
-};
-
-const unsigned short x0212_shiftjis_A2[] = {
-         0x819F,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x8143,      0,      0, 0x8150,      0,      0, 0x8160,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA55,      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,
-};
-const unsigned short x0212_shiftjis_B0[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0, 0xFA68,      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,
- 0xFA69,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFA6B,      0, 0xFA6C,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA6D,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFA6E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_B1[] = {
-              0,      0, 0xFA70,      0,      0,      0, 0xFA6F,
-      0, 0xFA72,      0,      0, 0xFA71,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA61,      0,      0, 0xFA73,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFA76,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFA77,
- 0xFA75,      0,      0,      0,      0,      0,      0, 0xFA74,
-      0, 0xFA7A,      0, 0xFA78,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFA79,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_B2[] = {
-              0,      0, 0xFA7B,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA7D,      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, 0xFA7E,      0,
-      0,      0,      0,      0,      0, 0xFA80,      0,      0,
-      0,      0,      0,      0,      0, 0xFA81,      0,      0,
-      0,      0,      0,      0, 0xFA82,      0,      0,
-};
-const unsigned short x0212_shiftjis_B3[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFA84,      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,
- 0xFA85,      0,      0, 0xFA86,      0, 0xFB77,      0,      0,
-      0,      0,      0,      0,      0, 0xFA87,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFA88,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA89,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_B4[] = {
-              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,
- 0xFA8C,      0,      0,      0,      0,      0,      0, 0xFA8D,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFA8E,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFA8F,      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,
-};
-const unsigned short x0212_shiftjis_B5[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFA91,      0,      0,      0,      0, 0xFA93,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFA94,      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,
- 0xFA95,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_B7[] = {
-              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, 0xFA97,      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, 0xFA98,      0,      0, 0xFA9A,
- 0xFA99,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_B8[] = {
-              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, 0xFA9E,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFA9F,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAA0,      0, 0xFAA1,
- 0xFAA2,      0,      0,      0, 0xFAA3,      0,      0,
-};
-const unsigned short x0212_shiftjis_B9[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFAA4,
-      0,      0,      0,      0,      0,      0,      0, 0xFAA5,
-      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,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_BA[] = {
-              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, 0xFAA6,      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, 0xFAA7,      0,      0,      0,      0,
-      0, 0xFAA9,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFAAB,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_BB[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFAAC,      0,      0,      0,      0,
- 0xFAAD,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFAAF,      0,      0,      0,      0,      0,
- 0xFAB2,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFAB3,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFAB4, 0xFAB5,      0,      0,
-      0, 0xFAB6,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_BC[] = {
-              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,
-      0,      0,      0,      0, 0xFAB7,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAB8,      0,      0,
-      0,      0,      0,      0, 0xFA67,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFAB9,
-};
-const unsigned short x0212_shiftjis_BD[] = {
-              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, 0xFABB,      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, 0xFABC,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFABE,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_BE[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFAC0,      0,      0,      0,
- 0xFABF,      0,      0, 0xFAC2,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAC3,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFAC5,      0,      0,      0, 0xFAC4,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFAC6,      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,
-};
-const unsigned short x0212_shiftjis_BF[] = {
-              0,      0,      0,      0,      0,      0,      0,
- 0xFAC7,      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, 0xFAC8,      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,
-};
-const unsigned short x0212_shiftjis_C0[] = {
-              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, 0xFAC9,      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, 0xFACA,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFACB,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_C1[] = {
-              0,      0,      0,      0,      0, 0xFACC,      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,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFACE,      0,      0,
- 0xFAD1,      0,      0,      0, 0xFACF,      0,      0,
-};
-const unsigned short x0212_shiftjis_C2[] = {
-         0xFAD3,      0,      0,      0, 0xFAD4,      0,      0,
-      0,      0,      0, 0xFAD2,      0, 0xFA63,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFAD6,      0, 0xFAD7,      0,      0,      0,      0, 0xFA66,
-      0,      0,      0,      0, 0xFAD9,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFADA,      0,      0,      0,      0, 0xFADB,
-      0,      0,      0, 0xFADC,      0,      0, 0xFADD,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFADE,      0,      0,
- 0xFADF,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_C3[] = {
-         0xFAE1,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAE2,      0,      0,
-      0, 0xFAE4,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFAE3,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFAE6,      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, 0xFA64,      0, 0xFAE7,
-};
-const unsigned short x0212_shiftjis_C4[] = {
-              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, 0xFAE9,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFAEB,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFAEC,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAED,      0,
-};
-const unsigned short x0212_shiftjis_C5[] = {
-              0,      0,      0,      0,      0,      0, 0xFAEF,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFAF0, 0xFAF1,      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, 0xFAF3,      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,
-};
-const unsigned short x0212_shiftjis_C6[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFAF4,      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, 0xFAF5,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFAF6,      0,      0, 0xFAF8,      0,      0,      0,      0,
-      0,      0, 0xFAF7,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_C7[] = {
-         0xFAF9,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFAFA,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFAFC,      0,      0,      0, 0xFAFB,
-      0,      0,      0, 0xFB40,      0,      0,      0, 0xFB41,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB42,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFB45,      0,
-      0,      0,      0, 0xFB48,      0,      0, 0xFB46,      0,
- 0xFB49,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFB47,      0,      0,
-};
-const unsigned short x0212_shiftjis_C8[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB4A,      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, 0xFB4B,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFB4C,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_C9[] = {
-              0,      0,      0,      0,      0, 0xFB4D,      0,
-      0,      0,      0, 0xFB4E,      0, 0xFB4F,      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, 0xFB51,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFB52,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFB54,      0,      0,      0,      0,
-      0, 0xFB53,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFB56, 0xFB57,      0,      0,
-      0,      0,      0,      0, 0xFB55,      0,      0,
-};
-const unsigned short x0212_shiftjis_CA[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFB59,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0xFB5A,      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, 0xFB5B,
-      0, 0xFB5C,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_CB[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFB5D,      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, 0xFB5F,      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, 0xFB60,      0,
-      0,      0, 0xFB61,      0,      0,      0, 0xFB64,      0,
- 0xFB62,      0,      0,      0, 0xFB63,      0,      0,      0,
-      0, 0xFB66,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_CC[] = {
-              0,      0,      0,      0, 0xFB65,      0,      0,
-      0,      0,      0, 0xFB67,      0, 0xFB69, 0xFB68,      0,
-      0,      0, 0xFB6A,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB6B,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFB6C,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB6D,      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,
-};
-const unsigned short x0212_shiftjis_CD[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFAA8,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFB6F,      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,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_CE[] = {
-              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, 0xFB73, 0xFB71,      0,      0,      0,      0,
-      0,      0,      0, 0xFB74,      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, 0xFB76,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_CF[] = {
-              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, 0xFB78,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB79,      0,      0,      0,      0,      0,
-      0, 0xFB7A,      0,      0,      0, 0xFB7B,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_D0[] = {
-              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,
-      0,      0,      0,      0,      0, 0xFB81,      0,      0,
-      0, 0xFB83,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_D1[] = {
-              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,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFB84,      0,      0,      0, 0xFB87,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_D2[] = {
-              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, 0xFB88,      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,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_D3[] = {
-              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,
-      0, 0xFB8A,      0,      0,      0,      0,      0,      0,
- 0xFB8B,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_D4[] = {
-              0,      0,      0,      0,      0,      0, 0xFB8C,
-      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, 0xFB8F,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA5C,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFB90,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_D5[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFB91,      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,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_D7[] = {
-              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, 0xFB93,      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,
-};
-const unsigned short x0212_shiftjis_D8[] = {
-              0, 0xFB95,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFB96,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB97,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB98,      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, 0xFB99,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_D9[] = {
-         0xFA60,      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, 0xFB9A,      0,
- 0xFB9B,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFB9C,      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,
-};
-const unsigned short x0212_shiftjis_DC[] = {
-              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, 0xFBA2,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFA5D,
-      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,
-};
-const unsigned short x0212_shiftjis_DD[] = {
-              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,
- 0xFBA3,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFBA4,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFBA5,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFBA6,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_DE[] = {
-              0,      0,      0, 0xFBA7,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFBA8,      0,      0,      0,      0, 0xFBAA,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFBAB,      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,
-};
-const unsigned short x0212_shiftjis_DF[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFBAD,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFBAF,      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,
-};
-const unsigned short x0212_shiftjis_E0[] = {
-              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, 0xFBB2,      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,
-};
-const unsigned short x0212_shiftjis_E1[] = {
-              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,
-      0,      0, 0xFBB5,      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,
-};
-const unsigned short x0212_shiftjis_E2[] = {
-              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, 0xFBB9,
-      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,
-};
-const unsigned short x0212_shiftjis_E3[] = {
-              0,      0,      0,      0,      0, 0xFBBB,      0,
- 0xFBBA, 0xFBBC, 0xFBBF, 0xFBC0,      0,      0,      0, 0xFBBD,
- 0xFBBE,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFBC1,      0,      0, 0xFBC3,
-      0, 0xFBC2,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFBCA, 0xFBC4, 0xFBC6,      0,
- 0xFBC5,      0,      0,      0,      0,      0,      0, 0xFBC7,
-      0, 0xFBC9,      0, 0xFBC8,      0,      0,      0,      0,
-      0, 0xFBCB,      0,      0,      0,      0,      0,      0,
-      0, 0xFBCD, 0xFBCE,      0,      0,      0,      0,      0,
- 0xFA5F,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_E4[] = {
-              0,      0,      0,      0,      0, 0xFBCC,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFBD2, 0xFBD6,
- 0xFBD4, 0xFBD0,      0, 0xFBD1,      0,      0,      0, 0xFBD5,
-      0,      0,      0, 0xFBCF,      0,      0,      0,      0,
- 0xFA65, 0xFBD9, 0xFBDC,      0, 0xFBDE,      0,      0,      0,
-      0,      0,      0, 0xFBDD, 0xFBDB,      0, 0xFBD8,      0,
- 0xFBD7,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFA5E,      0,      0,      0,      0,      0, 0xFBE0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFBDF,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_E5[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFBE1,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0, 0xFBE2,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFBE3,      0,      0,      0,      0,      0,      0,
- 0xFBE4,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFBE5,      0,      0,      0,      0,      0,
-      0,      0, 0xFBE6, 0xFBE7,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_E6[] = {
-              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,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0xFBEB,      0,      0,      0,      0,      0,      0, 0xFBEC,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_E7[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0xFBED,      0, 0xFBEF,      0,
-      0, 0xFBF1, 0xFBF3,      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,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_E8[] = {
-              0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0xFBF4,      0,      0,      0,      0, 0xFBF5,      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, 0xFBF8,      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,
-};
-const unsigned short x0212_shiftjis_E9[] = {
-              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, 0xFBFB,      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, 0xFC40,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_EA[] = {
-              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, 0xFC41,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFC43,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xFC44,      0,
-      0,      0, 0xFC45,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_EB[] = {
-              0,      0,      0,      0, 0xFC46,      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,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0xFC48, 0xFC47,      0,      0,      0,
-};
-const unsigned short x0212_shiftjis_EC[] = {
-              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, 0xFC4A,      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,
-};
-const unsigned short x0212_shiftjis_F3[] = {
-              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,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0xFA40, 0xFA41, 0xFA42, 0xFA43, 0xFA44,
- 0xFA45, 0xFA46, 0xFA47, 0xFA48, 0xFA49, 0xFA4A, 0xFA4B,
-};
-const unsigned short x0212_shiftjis_F4[] = {
-         0xFA4C, 0xFA4D, 0xFA4E, 0xFA4F, 0xFA50, 0xFA51, 0xFA52,
- 0xFA53, 0xFA56, 0xFA57, 0xFA58, 0xFA59, 0xFA5A, 0xFA62, 0xFA6A,
- 0xFA7C, 0xFA83, 0xFA8A, 0xFA8B, 0xFA90, 0xFA92, 0xFA96, 0xFA9B,
- 0xFA9C, 0xFA9D, 0xFAAA, 0xFAAE, 0xFAB0, 0xFAB1, 0xFABA, 0xFABD,
- 0xFAC1, 0xFACD, 0xFAD0, 0xFAD5, 0xFAD8, 0xFAE0, 0xFAE5, 0xFAE8,
- 0xFAEA, 0xFAEE, 0xFAF2, 0xFB43, 0xFB44, 0xFB50, 0xFB58, 0xFB5E,
- 0xFB6E, 0xFB70, 0xFB72, 0xFB75, 0xFB7C, 0xFB7D, 0xFB7E, 0xFB80,
- 0xFB82, 0xFB85, 0xFB86, 0xFB89, 0xFB8D, 0xFB8E, 0xFB92, 0xFB94,
- 0xFB9D, 0xFB9E, 0xFB9F, 0xFBA0, 0xFBA1, 0xFBA9, 0xFBAC, 0xFBAE,
- 0xFBB0, 0xFBB1, 0xFBB3, 0xFBB4, 0xFBB6, 0xFBB7, 0xFBB8, 0xFBD3,
- 0xFBDA, 0xFBE8, 0xFBE9, 0xFBEA, 0xFBEE, 0xFBF0, 0xFBF2, 0xFBF6,
- 0xFBF7, 0xFBF9, 0xFBFA, 0xFBFC, 0xFC42, 0xFC49, 0xFC4B,
-};
-const unsigned short *const x0212_shiftjis[] = {
-                                    0, x0212_shiftjis_A2,                 0,
-                 0,                 0,                 0,                 0,
-                 0,                 0,                 0,                 0,
-                 0,                 0,                 0,                 0,
- x0212_shiftjis_B0, x0212_shiftjis_B1, x0212_shiftjis_B2, x0212_shiftjis_B3,
- x0212_shiftjis_B4, x0212_shiftjis_B5,                 0, x0212_shiftjis_B7,
- x0212_shiftjis_B8, x0212_shiftjis_B9, x0212_shiftjis_BA, x0212_shiftjis_BB,
- x0212_shiftjis_BC, x0212_shiftjis_BD, x0212_shiftjis_BE, x0212_shiftjis_BF,
- x0212_shiftjis_C0, x0212_shiftjis_C1, x0212_shiftjis_C2, x0212_shiftjis_C3,
- x0212_shiftjis_C4, x0212_shiftjis_C5, x0212_shiftjis_C6, x0212_shiftjis_C7,
- x0212_shiftjis_C8, x0212_shiftjis_C9, x0212_shiftjis_CA, x0212_shiftjis_CB,
- x0212_shiftjis_CC, x0212_shiftjis_CD, x0212_shiftjis_CE, x0212_shiftjis_CF,
- x0212_shiftjis_D0, x0212_shiftjis_D1, x0212_shiftjis_D2, x0212_shiftjis_D3,
- x0212_shiftjis_D4, x0212_shiftjis_D5,                 0, x0212_shiftjis_D7,
- x0212_shiftjis_D8, x0212_shiftjis_D9,                 0,                 0,
- x0212_shiftjis_DC, x0212_shiftjis_DD, x0212_shiftjis_DE, x0212_shiftjis_DF,
- x0212_shiftjis_E0, x0212_shiftjis_E1, x0212_shiftjis_E2, x0212_shiftjis_E3,
- x0212_shiftjis_E4, x0212_shiftjis_E5, x0212_shiftjis_E6, x0212_shiftjis_E7,
- x0212_shiftjis_E8, x0212_shiftjis_E9, x0212_shiftjis_EA, x0212_shiftjis_EB,
- x0212_shiftjis_EC,                 0,                 0,                 0,
-                 0,                 0,                 0, x0212_shiftjis_F3,
- x0212_shiftjis_F4,                 0,                 0,                 0,
-                 0,                 0,                 0,                 0,
-                 0,                 0,                 0,
-};
-#endif /* X0212_ENABLE */
diff --git a/ext/nkf/nkf-utf8/utf8tbl.h b/ext/nkf/nkf-utf8/utf8tbl.h
deleted file mode 100644
index 1f40f0b363..0000000000
--- a/ext/nkf/nkf-utf8/utf8tbl.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _UTF8TBL_H_
-#define _UTF8TBL_H_
-
-#ifdef UTF8_OUTPUT_ENABLE
-extern const unsigned short euc_to_utf8_1byte[];
-extern const unsigned short *const euc_to_utf8_2bytes[];
-extern const unsigned short *const euc_to_utf8_2bytes_ms[];
-extern const unsigned short *const x0212_to_utf8_2bytes[];
-#endif /* UTF8_OUTPUT_ENABLE */
-
-#ifdef UTF8_INPUT_ENABLE
-extern const unsigned short *const utf8_to_euc_2bytes[];
-extern const unsigned short *const utf8_to_euc_2bytes_ms[];
-extern const unsigned short *const utf8_to_euc_2bytes_932[];
-extern const unsigned short *const *const utf8_to_euc_3bytes[];
-extern const unsigned short *const *const utf8_to_euc_3bytes_ms[];
-extern const unsigned short *const *const utf8_to_euc_3bytes_932[];
-#endif /* UTF8_INPUT_ENABLE */
-
-#ifdef UNICODE_NORMALIZATION
-extern const struct normalization_pair normalization_table[];
-#endif
-
-#ifdef SHIFTJIS_CP932
-extern const unsigned short shiftjis_cp932[3][189];
-extern const unsigned short cp932inv[2][189];
-#endif /* SHIFTJIS_CP932 */
-
-#ifdef X0212_ENABLE
-extern const unsigned short shiftjis_x0212[3][189];
-extern const unsigned short *const x0212_shiftjis[];
-#endif /* X0212_ENABLE */
-
-#endif
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 8bcb6d15f7..c71a5119aa 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -1,149 +1,51 @@
-/*
- *  NKF - Ruby extension for Network Kanji Filter
- *
- *  original nkf2.x is maintained at http://sourceforge.jp/projects/nkf/
- *
- *  $Id: nkf.c,v 1.9.2.4 2006/03/27 13:28:14 naruse Exp $
- *
- */
-
-#define RUBY_NKF_REVISION "$Revision: 1.9.2.4 $"
-#define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
-
 #include "ruby.h"
 
-/* Encoding Constants */
 #define	_AUTO		0
 #define	_JIS		1
 #define	_EUC		2
 #define	_SJIS		3
 #define	_BINARY		4
 #define	_NOCONV		4
-#define	_ASCII		5
-/* 0b011x is reserved for UTF-8 Family */
-#define	_UTF8		6
-/* 0b10xx is reserved for UTF-16 Family */
-#define	_UTF16		8
-/* 0b11xx is reserved for UTF-32 Family */
-#define	_UTF32		12
-#define	_OTHER		16
 #define	_UNKNOWN	_AUTO
 
-/* Replace nkf's getchar/putchar for variable modification */
-/* we never use getc, ungetc */
-
 #undef getc
 #undef ungetc
-#define getc(f)         (input_ctr>=i_len?-1:input[input_ctr++])
-#define ungetc(c,f)     input_ctr--
+#define getc(f)   	(input_ctr<i_len?input[input_ctr++]:-1)
+#define ungetc(c,f)	input_ctr--
 
-#define INCSIZE         32
 #undef putchar
-#undef TRUE
-#undef FALSE
-#define putchar(c)      rb_nkf_putchar(c)
-
-/* Input/Output pointers */
+#define putchar(c)	rb_nkf_putchar(c)
 
-static unsigned char *output;
-static unsigned char *input;
-static int input_ctr;
-static int i_len;
-static int output_ctr;
-static int o_len;
+#define INCSIZE		32
 static int incsize;
 
-static VALUE result;
+static unsigned char *input, *output;
+static int input_ctr, i_len;
+static int output_ctr, o_len;
+
+static VALUE dst;
 
 static int
 rb_nkf_putchar(c)
-  unsigned int c;
+     unsigned int c;
 {
   if (output_ctr >= o_len) {
     o_len += incsize;
-    rb_str_resize(result, o_len);
+    rb_str_cat(dst, 0, incsize);
+    output = RSTRING(dst)->ptr;
     incsize *= 2;
-    output = RSTRING(result)->ptr;
   }
   output[output_ctr++] = c;
 
   return c;
 }
 
-/* Include kanji filter main part */
-/* getchar and putchar will be replaced during inclusion */
-
 #define PERL_XS 1
-#include "nkf-utf8/config.h"
-#include "nkf-utf8/utf8tbl.c"
-#include "nkf-utf8/nkf.c"
-
-int nkf_split_options(arg)
-    const char* arg;
-{
-    int count = 0;
-    char option[256];
-    int i = 0, j = 0;
-    int is_escaped = FALSE;
-    int is_single_quoted = FALSE;
-    int is_double_quoted = FALSE;
-    for(i = 0; arg[i]; i++){
-	if(j == 255){
-	    return -1;
-	}else if(is_single_quoted){
-	    if(arg[i] == '\''){
-		is_single_quoted = FALSE;
-	    }else{
-		option[j++] = arg[i];
-	    }
-	}else if(is_escaped){
-	    is_escaped = FALSE;
-	    option[j++] = arg[i];
-	}else if(arg[i] == '\\'){
-	    is_escaped = TRUE;
-	}else if(is_double_quoted){
-	    if(arg[i] == '"'){
-		is_double_quoted = FALSE;
-	    }else{
-		option[j++] = arg[i];
-	    }
-	}else if(arg[i] == '\''){
-	    is_single_quoted = TRUE;
-	}else if(arg[i] == '"'){
-	    is_double_quoted = TRUE;
-	}else if(arg[i] == ' '){
-	    option[j] = '\0';
-	    options(option);
-	    j = 0;
-	}else{
-	    option[j++] = arg[i];
-	}
-    }
-    if(j){
-	option[j] = '\0';
-	options(option);
-    }
-    return count;
-}
-
-/*
- *  call-seq:
- *     NKF.nkf(opt, str)   -> string
- *
- *  Convert _str_ and return converted result.
- *  Conversion details are specified by _opt_ as String.
- *
- *     require 'nkf'
- *     output = NKF.nkf("-s", input)
- *
- *  *Note*
- *  By default, nkf decodes MIME encoded string.
- *  If you want not to decode input, use NKF.nkf with <b>-m0</b> flag.
- */
+#include "nkf1.7/nkf.c"
 
 static VALUE
 rb_nkf_kconv(obj, opt, src)
-  VALUE obj, opt, src;
+     VALUE obj, opt, src;
 {
   char *opt_ptr, *opt_end;
   volatile VALUE v;
@@ -152,61 +54,48 @@ rb_nkf_kconv(obj, opt, src)
   StringValue(opt);
   opt_ptr = RSTRING(opt)->ptr;
   opt_end = opt_ptr + RSTRING(opt)->len;
-  nkf_split_options(opt_ptr);
+  for (; opt_ptr < opt_end; opt_ptr++) {
+    if (*opt_ptr != '-') {
+      continue;
+    }
+    arguments(opt_ptr);
+  }
 
   incsize = INCSIZE;
 
-  input_ctr = 0;
+  input_ctr = 0; 
   StringValue(src);
   input = RSTRING(src)->ptr;
   i_len = RSTRING(src)->len;
-  result = rb_str_new(0, i_len*3 + 10);
-  v = result;
+  dst = rb_str_new(0, i_len*3 + 10);
+  v = dst;
 
   output_ctr = 0;
-  output     = RSTRING(result)->ptr;
-  o_len      = RSTRING(result)->len;
+  output     = RSTRING(dst)->ptr;
+  o_len      = RSTRING(dst)->len;
   *output    = '\0';
 
-  if(x0201_f == WISH_TRUE)
-    x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+  if(iso8859_f && (oconv != j_oconv || !x0201_f )) {
+    iso8859_f = FALSE;
+  } 
 
   kanji_convert(NULL);
-  RSTRING(result)->ptr[output_ctr] = '\0';
-  RSTRING(result)->len = output_ctr;
-  OBJ_INFECT(result, src);
+  RSTRING(dst)->ptr[output_ctr] = '\0';
+  RSTRING(dst)->len = output_ctr;
+  OBJ_INFECT(dst, src);
 
-  return result;
+  return dst;
 }
 
-
 /*
- *  call-seq:
- *     NKF.guess1(str)  -> integer
- *
- *  Returns guessed encoding of _str_ as integer.
- *
- *  Algorithm described in:
- *  Ken Lunde. `Understanding Japanese Information Processing'
- *  Sebastopol, CA: O'Reilly & Associates.
- *
- *      case NKF.guess1(input)
- *      when NKF::JIS
- *        "ISO-2022-JP"
- *      when NKF::SJIS
- *        "Shift_JIS"
- *      when NKF::EUC
- *        "EUC-JP"
- *      when NKF::UNKNOWN
- *        "UNKNOWN(ASCII)"
- *      when NKF::BINARY
- *        "BINARY"
- *      end
+ * Character code detection - Algorithm described in:
+ * Ken Lunde. `Understanding Japanese Information Processing'
+ * Sebastopol, CA: O'Reilly & Associates.
  */
 
 static VALUE
-rb_nkf_guess1(obj, src)
-  VALUE obj, src;
+rb_nkf_guess(obj, src)
+     VALUE obj, src;
 {
   unsigned char *p;
   unsigned char *pend;
@@ -218,16 +107,16 @@ rb_nkf_guess1(obj, src)
   if (p == pend) return INT2FIX(_UNKNOWN);
 
 #define INCR do {\
-      p++;\
-      if (p==pend) return INT2FIX(_UNKNOWN);\
-      sequence_counter++;\
-      if (sequence_counter % 2 == 1 && *p != 0xa4)\
+    p++;\
+    if (p==pend) return INT2FIX(_UNKNOWN);\
+    sequence_counter++;\
+    if (sequence_counter % 2 == 1 && *p != 0xa4)\
+	sequence_counter = 0;\
+    if (6 <= sequence_counter) {\
 	sequence_counter = 0;\
-      if (6 <= sequence_counter) {\
-	  sequence_counter = 0;\
-	  return INT2FIX(_EUC);\
-      }\
-  } while (0)
+	return INT2FIX(_EUC);\
+    }\
+} while (0)
 
   if (*p == 0xa4)
     sequence_counter = 1;
@@ -291,364 +180,19 @@ rb_nkf_guess1(obj, src)
   return INT2FIX(_UNKNOWN);
 }
 
-
-/*
- *  call-seq:
- *     NKF.guess2(str)  -> integer
- *
- *  Returns guessed encoding of _str_ as integer by nkf routine.
- *
- *     case NKF.guess(input)
- *     when NKF::ASCII
- *       "ASCII"
- *     when NKF::JIS
- *       "ISO-2022-JP"
- *     when NKF::SJIS
- *       "Shift_JIS"
- *     when NKF::EUC
- *       "EUC-JP"
- *     when NKF::UTF8
- *       "UTF-8"
- *     when NKF::UTF16
- *       "UTF-16"
- *     when NKF::UNKNOWN
- *       "UNKNOWN"
- *     when NKF::BINARY
- *       "BINARY"
- *     end
- */
-
-static VALUE
-rb_nkf_guess2(obj, src)
-  VALUE obj, src;
-{
-  int code = _BINARY;
-
-  reinit();
-
-  input_ctr = 0;
-  StringValue(src);
-  input = RSTRING(src)->ptr;
-  i_len = RSTRING(src)->len;
-
-  if(x0201_f == WISH_TRUE)
-    x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
-
-  guess_f = TRUE;
-  kanji_convert( NULL );
-  guess_f = FALSE;
-
-  if (!is_inputcode_mixed) {
-    if (strcmp(input_codename, "") == 0) {
-      code = _ASCII;
-    } else if (strcmp(input_codename, "ISO-2022-JP") == 0) {
-      code = _JIS;
-    } else if (strcmp(input_codename, "EUC-JP") == 0) {
-      code = _EUC;
-    } else if (strcmp(input_codename, "Shift_JIS") == 0) {
-      code = _SJIS;
-    } else if (strcmp(input_codename, "UTF-8") == 0) {
-      code = _UTF8;
-    } else if (strcmp(input_codename, "UTF-16") == 0) {
-      code = _UTF16;
-    } else if (strlen(input_codename) > 0) {
-      code = _UNKNOWN;
-    }
-  }
-
-  return INT2FIX( code );
-}
-
-
-/*
- *  NKF - Ruby extension for Network Kanji Filter 
- *
- *  == Description
- *
- *  This is a Ruby Extension version of nkf (Netowrk Kanji Filter).
- *  It converts the first argument and return converted result. Conversion
- *  details are specified by flags as the first argument.
- *
- *  *Nkf* is a yet another kanji code converter among networks, hosts and terminals.
- *  It converts input kanji code to designated kanji code
- *  such as ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8 or UTF-16.
- *
- *  One of the most unique faculty of *nkf* is the guess of the input kanji encodings.
- *  It currently recognizes ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8 and UTF-16.
- *  So users needn't set the input kanji code explicitly.
- *
- *  By default, X0201 kana is converted into X0208 kana.
- *  For X0201 kana, SO/SI, SSO and ESC-(-I methods are supported.
- *  For automatic code detection, nkf assumes no X0201 kana in Shift_JIS.
- *  To accept X0201 in Shift_JIS, use <b>-X</b>, <b>-x</b> or <b>-S</b>.
- *
- *  == Flags
- *
- *  === -b -u
- *
- *  Output is buffered (DEFAULT), Output is unbuffered.
- *
- *  === -j -s -e -w -w16
- *
- *  Output code is ISO-2022-JP (7bit JIS), Shift_JIS, EUC-JP,
- *  UTF-8N, UTF-16BE.
- *  Without this option and compile option, ISO-2022-JP is assumed.
- *
- *  === -J -S -E -W -W16
- *
- *  Input assumption is JIS 7 bit, Shift_JIS, EUC-JP,
- *  UTF-8, UTF-16LE.
- *
- *  ==== -J
- *
- *  Assume  JIS input. It also accepts EUC-JP.
- *  This is the default. This flag does not exclude Shift_JIS.
- *
- *  ==== -S
- *
- *  Assume Shift_JIS and X0201 kana input. It also accepts JIS.
- *  EUC-JP is recognized as X0201 kana. Without <b>-x</b> flag,
- *  X0201 kana (halfwidth kana) is converted into X0208.
- *
- *  ==== -E
- *
- *  Assume EUC-JP input. It also accepts JIS.
- *  Same as -J.
- *
- *  === -t
- *
- *  No conversion.
- *
- *  === -i_
- *
- *  Output sequence to designate JIS-kanji. (DEFAULT B)
- *
- *  === -o_
- *
- *  Output sequence to designate ASCII. (DEFAULT B)
- *
- *  === -r
- *
- *  {de/en}crypt ROT13/47
- *
- *  === -h[123] --hiragana --katakana --katakana-hiragana
- *
- *  [-h1 --hiragana] Katakana to Hiragana conversion.
- *
- *  [-h2 --katakana] Hiragana to Katakana conversion.
- *
- *  [-h3 --katakana-hiragana] Katakana to Hiragana and Hiragana to Katakana conversion.
- *
- *  === -T
- *
- *  Text mode output (MS-DOS)
- *
- *  === -l
- *
- *  ISO8859-1 (Latin-1) support
- *
- *  === -f[<code>m</code> [- <code>n</code>]]
- *
- *  Folding on <code>m</code> length with <code>n</code> margin in a line.
- *  Without this option, fold length is 60 and fold margin is 10.
- *
- *  === -F
- *
- *  New line preserving line folding.
- *
- *  === -Z[0-3]
- *
- *  Convert X0208 alphabet (Fullwidth Alphabets) to ASCII.
- *
- *  [-Z -Z0] Convert X0208 alphabet to ASCII.
- *
- *  [-Z1] Converts X0208 kankaku to single ASCII space.
- *
- *  [-Z2] Converts X0208 kankaku to double ASCII spaces.
- *
- *  [-Z3] Replacing Fullwidth >, <, ", & into '&gt;', '&lt;', '&quot;', '&amp;' as in HTML.
- *
- *  === -X -x
- *
- *  Assume X0201 kana in MS-Kanji.
- *  With <b>-X</b> or without this option, X0201 is converted into X0208 Kana.
- *  With <b>-x</b>, try to preserve X0208 kana and do not convert X0201 kana to X0208.
- *  In JIS output, ESC-(-I is used. In EUC output, SSO is used.
- *
- *  === -B[0-2]
- *
- *  Assume broken JIS-Kanji input, which lost ESC.
- *  Useful when your site is using old B-News Nihongo patch.
- *
- *  [-B1] allows any char after ESC-( or ESC-$.
- *
- *  [-B2] forces ASCII after NL.
- *
- *  === -I
- *
- *  Replacing non iso-2022-jp char into a geta character
- *  (substitute character in Japanese).
- *
- *  === -d -c
- *
- *  Delete \r in line feed, Add \r in line feed.
- *
- *  === -m[BQN0]
- *
- *  MIME ISO-2022-JP/ISO8859-1 decode. (DEFAULT)
- *  To see ISO8859-1 (Latin-1) -l is necessary.
- *
- *  [-mB] Decode MIME base64 encoded stream. Remove header or other part before
- *  conversion. 
- *
- *  [-mQ] Decode MIME quoted stream. '_' in quoted stream is converted to space.
- *
- *  [-mN] Non-strict decoding.
- *  It allows line break in the middle of the base64 encoding.
- *
- *  [-m0] No MIME decode.
- *
- *  === -M
- *
- *  MIME encode. Header style. All ASCII code and control characters are intact.
- *  Kanji conversion is performed before encoding, so this cannot be used as a picture encoder.
- *
- *  [-MB] MIME encode Base64 stream.
- *
- *  [-MQ] Perfome quoted encoding.
- *
- *  === -l
- *
- *  Input and output code is ISO8859-1 (Latin-1) and ISO-2022-JP.
- *  <b>-s</b>, <b>-e</b> and <b>-x</b> are not compatible with this option.
- *
- *  === -L[uwm]
- *
- *  new line mode
- *  Without this option, nkf doesn't convert line breaks.
- *
- *  [-Lu] unix (LF)
- *
- *  [-Lw] windows (CRLF)
- *
- *  [-Lm] mac (CR)
- *
- *  === --fj --unix --mac --msdos --windows
- *
- *  convert for these system
- *
- *  === --jis --euc --sjis --mime --base64
- *
- *  convert for named code
- *
- *  === --jis-input --euc-input --sjis-input --mime-input --base64-input
- *
- *  assume input system
- *
- *  === --ic=<code>input codeset</code> --oc=<code>output codeset</code>
- *
- *  Set the input or output codeset.
- *  NKF supports following codesets and those codeset name are case insensitive.
- *
- *  [ISO-2022-JP] a.k.a. RFC1468, 7bit JIS, JUNET
- *
- *  [EUC-JP (eucJP-nkf)] a.k.a. AT&T JIS, Japanese EUC, UJIS
- *
- *  [eucJP-ascii] a.k.a. x-eucjp-open-19970715-ascii
- *
- *  [eucJP-ms] a.k.a. x-eucjp-open-19970715-ms
- *
- *  [CP51932] Microsoft Version of EUC-JP.
- *
- *  [Shift_JIS] SJIS, MS-Kanji
- *
- *  [CP932] a.k.a. Windows-31J
- *
- *  [UTF-8] same as UTF-8N
- *
- *  [UTF-8N] UTF-8 without BOM
- *
- *  [UTF-8-BOM] UTF-8 with BOM
- *
- *  [UTF-16] same as UTF-16BE
- *
- *  [UTF-16BE] UTF-16 Big Endian without BOM
- *
- *  [UTF-16BE-BOM] UTF-16 Big Endian with BOM
- *
- *  [UTF-16LE] UTF-16 Little Endian without BOM
- *
- *  [UTF-16LE-BOM] UTF-16 Little Endian with BOM
- *
- *  [UTF8-MAC] NKDed UTF-8, a.k.a. UTF8-NFD (input only)
- *
- *  === --fb-{skip, html, xml, perl, java, subchar}
- *
- *  Specify the way that nkf handles unassigned characters.
- *  Without this option, --fb-skip is assumed.
- *
- *  === --prefix= <code>escape character</code> <code>target character</code> ..
- *
- *  When nkf converts to Shift_JIS,
- *  nkf adds a specified escape character to specified 2nd byte of Shift_JIS characters.
- *  1st byte of argument is the escape character and following bytes are target characters.
- *
- *  === --disable-cp932ext
- *
- *  Handle the characters extended in CP932 as unassigned characters.
- *
- *  === --cap-input
- *
- *  Decode hex encoded characters.
- *
- *  === --url-input
- *
- *  Unescape percent escaped characters.
- *
- *  === --
- *
- *  Ignore rest of -option.
- */
-
 void
 Init_nkf()
 {
-    /* hoge */
     VALUE mKconv = rb_define_module("NKF");
-    /* hoge */
 
     rb_define_module_function(mKconv, "nkf", rb_nkf_kconv, 2);
-    rb_define_module_function(mKconv, "guess1", rb_nkf_guess1, 1);
-    rb_define_module_function(mKconv, "guess2", rb_nkf_guess2, 1);
-    rb_define_alias(mKconv, "guess", "guess2");
-    rb_define_alias(rb_singleton_class(mKconv), "guess", "guess2");
+    rb_define_module_function(mKconv, "guess", rb_nkf_guess, 1);
 
-    /* Auto-Detect */
     rb_define_const(mKconv, "AUTO", INT2FIX(_AUTO));
-    /* ISO-2022-JP */
     rb_define_const(mKconv, "JIS", INT2FIX(_JIS));
-    /* EUC-JP */
     rb_define_const(mKconv, "EUC", INT2FIX(_EUC));
-    /* Shift_JIS */
     rb_define_const(mKconv, "SJIS", INT2FIX(_SJIS));
-    /* BINARY */
     rb_define_const(mKconv, "BINARY", INT2FIX(_BINARY));
-    /* No conversion */
     rb_define_const(mKconv, "NOCONV", INT2FIX(_NOCONV));
-    /* ASCII */
-    rb_define_const(mKconv, "ASCII", INT2FIX(_ASCII));
-    /* UTF-8 */
-    rb_define_const(mKconv, "UTF8", INT2FIX(_UTF8));
-    /* UTF-16 */
-    rb_define_const(mKconv, "UTF16", INT2FIX(_UTF16));
-    /* UTF-32 */
-    rb_define_const(mKconv, "UTF32", INT2FIX(_UTF32));
-    /* UNKNOWN */
     rb_define_const(mKconv, "UNKNOWN", INT2FIX(_UNKNOWN));
-    /* Full version string of nkf */
-    rb_define_const(mKconv, "VERSION", rb_str_new2(RUBY_NKF_VERSION));
-    /* Version of nkf */
-    rb_define_const(mKconv, "NKF_VERSION", rb_str_new2(NKF_VERSION));
-    /* Release date of nkf */
-    rb_define_const(mKconv, "NKF_RELEASE_DATE", rb_str_new2(NKF_RELEASE_DATE));
 }
diff --git a/ext/nkf/nkf1.7/nkf.c b/ext/nkf/nkf1.7/nkf.c
new file mode 100644
index 0000000000..09419f40a7
--- /dev/null
+++ b/ext/nkf/nkf1.7/nkf.c
@@ -0,0 +1,1900 @@
+/** Network Kanji Filter. (PDS Version)
+************************************************************************
+** Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
+** $BO"Mm@h!'(B $B!J3t!KIY;NDL8&5f=j!!%=%U%H#38&!!;T@n!!;j(B 
+** $B!J(BE-Mail Address: ichikawa@flab.fujitsu.co.jp$B!K(B
+** Copyright (C) 1996,1998
+** $BO"Mm@h!'(B $BN05eBg3X>pJs9)3X2J(B $B2OLn(B $B??<#(B  mine/X0208 support
+** $B!J(BE-Mail Address: kono@ie.u-ryukyu.ac.jp$B!K(B
+** $BO"Mm@h!'(B COW for DOS & Win16 & Win32 & OS/2
+** $B!J(BE-Mail Address: GHG00637@niftyserve.or.p$B!K(B
+**    $B$3$N%=!<%9$N$$$+$J$kJ#<L!$2~JQ!$=$@5$b5vBz$7$^$9!#$?$@$7!"(B
+**    $B$=$N:]$K$O!"C/$,9W8%$7$?$r<($9$3$NItJ,$r;D$9$3$H!#(B
+**    $B:FG[I[$d;(;o$NIUO?$J$I$NLd$$9g$o$;$bI,MW$"$j$^$;$s!#(B
+**    $B$3$N%W%m%0%i%`$K$D$$$F$OFC$K2?$NJ]>Z$b$7$J$$!"0-$7$+$i$:!#(B
+**    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.
+***********************************************************************/
+
+static char *CopyRight =
+      "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),1998 S. Kono, COW";
+static char *Version =
+      "1.7";
+static char *Patchlevel =
+      "0/9711/Shinji Kono";
+
+/*
+**
+**
+**
+** USAGE:       nkf [flags] [file] 
+**
+** Flags:
+** b    Output is bufferred             (DEFAULT)
+** u    Output is unbufferred
+**
+** t    no operation
+**
+** j    Outout code is JIS 7 bit        (DEFAULT SELECT) 
+** s    Output code is MS Kanji         (DEFAULT SELECT) 
+** e    Output code is AT&T JIS         (DEFAULT SELECT) 
+** l    Output code is JIS 7bit and ISO8859-1 Latin-1
+**
+** m    MIME conversion for ISO-2022-JP
+** i_ Output sequence to designate JIS-kanji (DEFAULT_J)
+** o_ Output sequence to designate single-byte roman characters (DEFAULT_R)
+**
+** r  {de/en}crypt ROT13/47
+**
+** v  display Version
+**
+** T  Text mode output        (for MS-DOS)
+**
+** x    Do not convert X0201 kana into X0208
+** Z    Convert X0208 alphabet to ASCII
+**
+** f60  fold option
+**
+** m    MIME decode
+** B    try to fix broken JIS, missing Escape
+** B[1-9]  broken level
+**
+** O   Output to 'nkf.out' file 
+** d   Delete \r in line feed 
+** c   Add \r in line feed 
+**/
+/******************************/
+/* $B%G%U%)%k%H$N=PNO%3!<%IA*Br(B */
+/* Select DEFAULT_CODE */
+#define DEFAULT_CODE_JIS
+/* #define DEFAULT_CODE_SJIS */
+/* #define DEFAULT_CODE_EUC */
+/******************************/
+
+#if (defined(__TURBOC__) || defined(LSI_C)) && !defined(MSDOS)
+#define MSDOS
+#endif
+
+#ifndef PERL_XS
+#include <stdio.h>
+#endif
+
+#if defined(MSDOS) || defined(__OS2__) 
+#include <stdlib.h>
+#include <fcntl.h>
+#include <io.h>
+#endif
+
+#ifdef MSDOS
+#ifdef LSI_C
+#define setbinmode(fp) fsetbin(fp)
+#else /* Microsoft C, Turbo C */
+#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
+#endif
+#else /* UNIX,OS/2 */
+#define setbinmode(fp)
+#endif
+
+#ifdef _IOFBF /* SysV and MSDOS */
+#define       setvbuffer(fp, buf, size)       setvbuf(fp, buf, _IOFBF, size)
+#else /* BSD */
+#define       setvbuffer(fp, buf, size)       setbuffer(fp, buf, size)
+#endif
+
+/*Borland C++ 4.5 EasyWin*/
+#if defined(__TURBOC__) && defined(_Windows) && !defined(__WIN32__) /*Easy Win */
+#define         EASYWIN
+#include <windows.h>
+#endif
+
+#define         FALSE   0
+#define         TRUE    1
+
+/* state of output_mode and input_mode  */
+
+#define         ASCII           0
+#define         X0208           1
+#define         X0201           2
+#define         NO_X0201        3
+#define         JIS_INPUT       4
+#define         SJIS_INPUT      5
+#define         LATIN1_INPUT    6
+#define         FIXED_MIME      7
+#define         DOUBLE_SPACE    -2
+
+#define         NL      0x0a
+#define         ESC     0x1b
+#define         SPACE   0x20
+#define         AT      0x40
+#define         SSP     0xa0
+#define         DEL     0x7f
+#define         SI      0x0f
+#define         SO      0x0e
+#define         SSO     0x8e
+
+#define         HOLD_SIZE       32
+#define         IOBUF_SIZE      16384
+
+#define         DEFAULT_J       'B'
+#define         DEFAULT_R       'B'
+
+#define         SJ0162  0x00e1          /* 01 - 62 ku offset */
+#define         SJ6394  0x0161          /* 63 - 94 ku offset */
+
+
+/* MIME preprocessor */
+
+#undef STRICT_MIME       /* do stupid strict mime integrity check */
+#define GETC(p) ((!mime_mode)?getc(p):mime_getc(p))
+#define UNGETC(c,p)     ((!mime_mode)?ungetc(c,p):mime_ungetc(c))
+
+
+#ifdef EASYWIN /*Easy Win */
+extern POINT _BufferSize;
+#endif
+
+/*      function prototype  */
+
+#ifndef _
+# ifdef __STDC__
+#  define _(args) args
+# else
+#  define _(args) ()
+# endif
+#endif
+
+#ifndef PERL_XS
+static  void    noconvert _((FILE *f));
+static  int     mime_integrity _((FILE *f,unsigned char *p));
+static  int     usage _((void));
+static char            stdibuf[IOBUF_SIZE];
+static char            stdobuf[IOBUF_SIZE];
+static unsigned int            mime_input = 0; /* undecoded */
+static int             end_check;
+#endif
+
+static  void    kanji_convert _((FILE *f));
+static  void    h_conv _((FILE *f,int c2,int c1));
+static  int     push_hold_buf _((int c2,int c1));
+static  void    s_iconv _((int c2,int c1));
+static  void    e_oconv _((int c2,int c1));
+static  void    s_oconv _((int c2,int c1));
+static  void    j_oconv _((int c2,int c1));
+static  int     line_fold _((int c2,int c1));
+static  int     pre_convert _((int c1,int c2));
+static  int     mime_begin _((FILE *f));
+static  int     mime_getc _((FILE *f));
+static  int     mime_ungetc _((unsigned int c));
+static  int     base64decode _((int c));
+static  void    arguments _((char *c));
+static  void    reinit _((void));
+
+/* buffers */
+
+static unsigned char   hold_buf[HOLD_SIZE*2];
+static int             hold_count;
+
+/* MIME preprocessor fifo */
+
+#define MIME_BUF_SIZE   (1024)    /* 2^n ring buffer */
+#define MIME_BUF_MASK   (MIME_BUF_SIZE-1)   
+#define Fifo(n)         mime_buf[(n)&MIME_BUF_MASK]
+static unsigned char           mime_buf[MIME_BUF_SIZE];
+static unsigned int            mime_top = 0;
+static unsigned int            mime_last = 0;  /* decoded */
+
+/* flags */
+static int             unbuf_f = FALSE;
+static int             estab_f = FALSE;
+static int             nop_f = FALSE;
+static int             binmode_f = TRUE;       /* binary mode */
+static int             rot_f = FALSE;          /* rot14/43 mode */
+static int             input_f = FALSE;        /* non fixed input code  */
+static int             alpha_f = FALSE;        /* convert JIx0208 alphbet to ASCII */
+static int             mime_f = TRUE;         /* convert MIME B base64 or Q */
+static int             mimebuf_f = FALSE;      /* MIME buffered input */
+static int             broken_f = FALSE;       /* convert ESC-less broken JIS */
+static int             iso8859_f = FALSE;      /* ISO8859 through */
+#if defined(MSDOS) || defined(__OS2__) 
+static int             x0201_f = TRUE;         /* Assume JISX0201 kana */
+#else
+static int             x0201_f = NO_X0201;     /* Assume NO JISX0201 */
+#endif
+
+/* X0208 -> ASCII converter */
+
+static int             c1_return;
+
+/* fold parameter */
+static int line = 0;    /* chars in line */
+static int prev = 0;
+static int             fold_f  = FALSE;
+static int             fold_len  = 0;
+
+/* options */
+static char            kanji_intro = DEFAULT_J,
+                ascii_intro = DEFAULT_R;
+
+/* Folding */
+
+int line_fold();
+#define FOLD_MARGIN  10
+#define DEFAULT_FOLD 60
+
+/* converters */
+
+#ifdef DEFAULT_CODE_JIS
+#   define  DEFAULT_CONV j_oconv
+#endif
+#ifdef DEFAULT_CODE_SJIS
+#   define  DEFAULT_CONV s_oconv
+#endif
+#ifdef DEFAULT_CODE_EUC
+#   define  DEFAULT_CONV e_oconv
+#endif
+
+static void            (*iconv) _((int c2,int c1));
+					/* s_iconv or oconv */
+static void            (*oconv) _((int c2,int c1)) = DEFAULT_CONV; 
+					  /* [ejs]_oconv */
+
+/* Global states */
+static int             output_mode = ASCII,    /* output kanji mode */
+                input_mode =  ASCII,    /* input kanji mode */
+                shift_mode =  FALSE;    /* TRUE shift out, or X0201  */
+static int             mime_mode =   FALSE;    /* MIME mode B base64, Q hex */
+
+/* X0201 / X0208 conversion tables */
+
+/* X0201 kana conversion table */
+/* 90-9F A0-DF */
+unsigned char cv[]= {
+0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57,
+0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21,
+0x25,0x23,0x25,0x25,0x25,0x27,0x25,0x29,
+0x25,0x63,0x25,0x65,0x25,0x67,0x25,0x43,
+0x21,0x3c,0x25,0x22,0x25,0x24,0x25,0x26,
+0x25,0x28,0x25,0x2a,0x25,0x2b,0x25,0x2d,
+0x25,0x2f,0x25,0x31,0x25,0x33,0x25,0x35,
+0x25,0x37,0x25,0x39,0x25,0x3b,0x25,0x3d,
+0x25,0x3f,0x25,0x41,0x25,0x44,0x25,0x46,
+0x25,0x48,0x25,0x4a,0x25,0x4b,0x25,0x4c,
+0x25,0x4d,0x25,0x4e,0x25,0x4f,0x25,0x52,
+0x25,0x55,0x25,0x58,0x25,0x5b,0x25,0x5e,
+0x25,0x5f,0x25,0x60,0x25,0x61,0x25,0x62,
+0x25,0x64,0x25,0x66,0x25,0x68,0x25,0x69,
+0x25,0x6a,0x25,0x6b,0x25,0x6c,0x25,0x6d,
+0x25,0x6f,0x25,0x73,0x21,0x2b,0x21,0x2c,
+0x00,0x00};
+
+
+/* X0201 kana conversion table for daguten */
+/* 90-9F A0-DF */
+unsigned char dv[]= { 
+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,0x25,0x2c,0x25,0x2e,
+0x25,0x30,0x25,0x32,0x25,0x34,0x25,0x36,
+0x25,0x38,0x25,0x3a,0x25,0x3c,0x25,0x3e,
+0x25,0x40,0x25,0x42,0x25,0x45,0x25,0x47,
+0x25,0x49,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x25,0x50,0x25,0x53,
+0x25,0x56,0x25,0x59,0x25,0x5c,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};
+
+/* X0201 kana conversion table for han-daguten */
+/* 90-9F A0-DF */
+unsigned char ev[]= { 
+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,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,0x25,0x51,0x25,0x54,
+0x25,0x57,0x25,0x5a,0x25,0x5d,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};
+
+
+/* X0208 kigou conversion table */
+/* 0x8140 - 0x819e */
+unsigned char fv[] = {
+
+0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a,
+0x3b,0x3f,0x21,0x00,0x00,0x27,0x60,0x00,
+0x5e,0x00,0x5f,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x2d,0x00,0x2f,
+0x5c,0x00,0x00,0x7c,0x00,0x00,0x60,0x27,
+0x22,0x22,0x28,0x29,0x00,0x00,0x5b,0x5d,
+0x7b,0x7d,0x3c,0x3e,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x2b,0x2d,0x00,0x00,
+0x00,0x3d,0x00,0x3c,0x3e,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x24,0x00,0x00,0x25,0x23,0x26,0x2a,0x40,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+} ;
+
+
+static int             file_out = FALSE;
+static int             add_cr = FALSE;
+static int             del_cr = FALSE;
+
+#ifndef PERL_XS
+int
+main(argc, argv)
+    int             argc;
+    char          **argv;
+{
+    FILE  *fin;
+    char  *cp;
+
+#ifdef EASYWIN /*Easy Win */
+    _BufferSize.y = 400;/*Set Scroll Buffer Size*/
+#endif
+
+    for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) {
+        cp = *argv;
+	arguments(cp);
+    }
+
+    if(iso8859_f && (oconv != j_oconv || !x0201_f )) {
+        fprintf(stderr,"Mixed ISO8859/JISX0201/SJIS/EUC output is not allowed.\n");
+        exit(1);
+    }
+
+    if(binmode_f == TRUE)
+#ifdef __OS2__
+    if(freopen("","wb",stdout) == NULL) 
+        return (-1);
+#else
+    setbinmode(stdout);
+#endif
+
+    if(unbuf_f)
+      setbuf(stdout, (char *) NULL);
+    else
+      setvbuffer(stdout, stdobuf, IOBUF_SIZE);
+
+    if(argc == 0) {
+      if(binmode_f == TRUE)
+#ifdef __OS2__
+      if(freopen("","rb",stdin) == NULL) return (-1);
+#else
+      setbinmode(stdin);
+#endif
+      setvbuffer(stdin, stdibuf, IOBUF_SIZE);
+      if(nop_f)
+          noconvert(stdin);
+      else
+          kanji_convert(stdin);
+    } else {
+      while (argc--) {
+          if((fin = fopen(*argv++, "r")) == NULL) {
+              perror(*--argv);
+              return(-1);
+          } else {
+/* reopen file for stdout */
+              if(file_out == TRUE){ 
+                  if(argc == 1 ) {
+                      if(freopen(*argv++, "w", stdout) == NULL) {
+                          perror(*--argv);
+                          return (-1);
+                      }
+                      argc--;
+                  } else {
+                      if(freopen("nkf.out", "w", stdout) == NULL) {
+                         perror(*--argv);
+                         return (-1);
+                      }
+                  }
+                  if(binmode_f == TRUE) {
+#ifdef __OS2__
+                      if(freopen("","wb",stdout) == NULL) 
+                           return (-1);
+#else
+                      setbinmode(stdout);
+#endif
+                  }
+              }
+              if(binmode_f == TRUE)
+#ifdef __OS2__
+                 if(freopen("","rb",fin) == NULL) 
+                    return (-1);
+#else
+                 setbinmode(fin);
+#endif 
+              setvbuffer(fin, stdibuf, IOBUF_SIZE);
+              if(nop_f)
+                  noconvert(fin);
+              else
+                  kanji_convert(fin);
+              fclose(fin);
+          }
+      }
+    }
+#ifdef EASYWIN /*Easy Win */
+    if(file_out == FALSE) 
+        scanf("%d",&end_check);
+    else 
+        fclose(stdout);
+#else /* for Other OS */
+    if(file_out == TRUE) 
+        fclose(stdout);
+#endif 
+    return (0);
+}
+#endif
+
+static void
+arguments(cp) 
+    char *cp;
+{
+    while (*cp) {
+	switch (*cp++) {
+	case 'b':           /* buffered mode */
+	    unbuf_f = FALSE;
+	    continue;
+	case 'u':           /* non bufferd mode */
+	    unbuf_f = TRUE;
+	    continue;
+	case 't':           /* transparent mode */
+	    nop_f = TRUE;
+	    continue;
+	case 'j':           /* JIS output */
+	case 'n':
+	    oconv = j_oconv;
+	    continue;
+	case 'e':           /* AT&T EUC output */
+	    oconv = e_oconv;
+	    continue;
+	case 's':           /* SJIS output */
+	    oconv = s_oconv;
+	    continue;
+	case 'l':           /* ISO8859 Latin-1 support, no conversion */
+	    iso8859_f = TRUE;  /* Only compatible with ISO-2022-JP */
+	    input_f = LATIN1_INPUT;
+	    continue;
+	case 'i':           /* Kanji IN ESC-$-@/B */
+	    if(*cp=='@'||*cp=='B') 
+		kanji_intro = *cp++;
+	    continue;
+	case 'o':           /* ASCII IN ESC-(-J/B */
+	    if(*cp=='J'||*cp=='B'||*cp=='H') 
+		ascii_intro = *cp++;
+	    continue;
+	case 'r':
+	    rot_f = TRUE;
+	    continue;
+#if defined(MSDOS) || defined(__OS2__) 
+	case 'T':
+	    binmode_f = FALSE;
+	    continue;
+#endif
+#ifndef PERL_XS
+	case 'v':
+	    usage();
+	    exit(1);
+	    break;
+#endif
+	/* Input code assumption */
+	case 'J':   /* JIS input */
+	case 'E':   /* AT&T EUC input */
+	    input_f = JIS_INPUT;
+	    continue;
+	case 'S':   /* MS Kanji input */
+	    input_f = SJIS_INPUT;
+	    if(x0201_f==NO_X0201) x0201_f=TRUE;
+	    continue;
+	case 'Z':   /* Convert X0208 alphabet to asii */
+	    /*  bit:0   Convert X0208
+		bit:1   Convert Kankaku to one space
+		bit:2   Convert Kankaku to two spaces
+	    */
+	    if('9'>= *cp && *cp>='0') 
+		alpha_f |= 1<<(*cp++ -'0');
+	    else 
+		alpha_f |= TRUE;
+	    continue;
+	case 'x':   /* Convert X0201 kana to X0208 or X0201 Conversion */
+	    x0201_f = FALSE;    /* No X0201->X0208 conversion */
+	    /* accept  X0201
+		    ESC-(-I     in JIS, EUC, MS Kanji
+		    SI/SO       in JIS, EUC, MS Kanji
+		    SSO         in EUC, JIS, not in MS Kanji
+		    MS Kanji (0xa0-0xdf) 
+	       output  X0201
+		    ESC-(-I     in JIS (0x20-0x5f)
+		    SSO         in EUC (0xa0-0xdf)
+		    0xa0-0xd    in MS Kanji (0xa0-0xdf) 
+	    */
+	    continue;
+	case 'X':   /* Assume X0201 kana */
+	    /* Default value is NO_X0201 for EUC/MS-Kanji mix */
+	    x0201_f = TRUE;
+	    continue;
+	case 'f':   /* folding -f60 or -f */
+	    fold_f = TRUE;
+	    fold_len = atoi(cp);
+	    if(!(0<fold_len && fold_len<BUFSIZ)) 
+		fold_len = DEFAULT_FOLD;
+	    while('0'<= *cp && *cp <='9') cp++;
+	    continue;
+	case 'm':   /* MIME support */
+	    mime_f = TRUE;
+	    if(*cp=='B'||*cp=='Q') {
+		mime_mode = *cp++;
+		mimebuf_f = FIXED_MIME;
+	    } else if (*cp=='0') {
+		mime_f = FALSE;
+	    }
+	    continue;
+	case 'M':   /* MIME output */
+	    oconv = j_oconv;    /* sorry... not yet done.. */
+	    continue;
+	case 'B':   /* Broken JIS support */
+	    /*  bit:0   no ESC JIS
+		bit:1   allow any x on ESC-(-x or ESC-$-x
+		bit:2   reset to ascii on NL
+	    */
+	    if('9'>= *cp && *cp>='0') 
+		broken_f |= 1<<(*cp++ -'0');
+	    else 
+		broken_f |= TRUE;
+	    continue;
+#ifndef PERL_XS
+	case 'O':/* for Output file */
+	    file_out = TRUE;
+	    continue;
+#endif
+	case 'c':/* add cr code */
+	    add_cr = TRUE;
+	    continue;
+	case 'd':/* delete cr code */
+	    del_cr = TRUE;
+	    continue;
+	default:
+	    /* bogus option but ignored */
+	    continue;
+	}
+    }
+}
+
+#ifndef PERL_XS
+static void
+noconvert(f)
+    FILE  *f;
+{
+    int    c;
+
+    while ((c = getc(f)) != EOF)
+      putchar(c);
+}
+#endif
+
+
+static void
+kanji_convert(f)
+    FILE  *f;
+{
+    int    c1, c2;
+
+    c2 = 0;
+
+    if(input_f == JIS_INPUT || input_f == LATIN1_INPUT) {
+        estab_f = TRUE; iconv = oconv;
+    } else if(input_f == SJIS_INPUT) {
+        estab_f = TRUE;  iconv = s_iconv;
+    } else {
+        estab_f = FALSE; iconv = oconv;
+    }
+    input_mode = ASCII;
+    output_mode = ASCII;
+    shift_mode = FALSE;
+
+#define NEXT continue      /* no output, get next */
+#define SEND ;             /* output c1 and c2, get next */
+#define LAST break         /* end of loop, go closing  */
+
+    while ((c1 = GETC(f)) != EOF) {
+        if(c2) {
+            /* second byte */
+            if(c2 > DEL) {
+                /* in case of 8th bit is on */
+                if(!estab_f) {
+                    /* in case of not established yet */
+                    if(c1 > SSP) {
+                        /* It is still ambiguious */
+                        h_conv(f, c2, c1);
+                        c2 = 0;
+                        NEXT;
+                    } else if(c1 < AT) {
+                        /* ignore bogus code */
+                        c2 = 0;
+                        NEXT;
+                    } else {
+                        /* established */
+                        /* it seems to be MS Kanji */
+                        estab_f = TRUE;
+                        iconv = s_iconv;
+                        SEND;
+                    }
+                } else
+                    /* in case of already established */
+                    if(c1 < AT) {
+                        /* ignore bogus code */
+                        c2 = 0;
+                        NEXT;
+                    } else
+                        SEND;
+            } else
+                /* 7 bit code */
+                /* it might be kanji shitfted */
+                if((c1 == DEL) || (c1 <= SPACE)) {
+                    /* ignore bogus first code */
+                    c2 = 0;
+                    NEXT;
+                } else
+                    SEND;
+        } else {
+            /* first byte */
+            if(c1 > DEL) {
+                /* 8 bit code */
+                if(!estab_f && !iso8859_f) {
+                    /* not established yet */
+                    if(c1 < SSP) {
+                        /* it seems to be MS Kanji */
+                        estab_f = TRUE;
+                        iconv = s_iconv;
+                    } else if(c1 < 0xe0) {
+                        /* it seems to be EUC */
+                        estab_f = TRUE;
+                        iconv = oconv;
+                    } else {
+                        /* still ambiguious */
+                    }
+                    c2 = c1;
+                    NEXT;
+                } else { /* estab_f==TRUE */
+                    if(iso8859_f) {
+                        SEND;
+                    } else if(SSP<=c1 && c1<0xe0 && iconv == s_iconv) {
+                        /* SJIS X0201 Case... */
+                        /* This is too arrogant, but ... */
+                        if(x0201_f==NO_X0201) {
+                            iconv = oconv;
+                            c2 = c1;
+                            NEXT;
+                        } else 
+                        if(x0201_f) {
+                            if(dv[(c1-SSP)*2]||ev[(c1-SSP)*2]) {
+                            /* look ahead for X0201/X0208conversion */
+                                if((c2 = GETC(f)) == EOF) {
+                                    (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                    LAST;
+                                } else if(c2==(0xde)) { /* $BByE@(B */
+                                    (*oconv)(dv[(c1-SSP)*2],dv[(c1-SSP)*2+1]);
+                                    c2=0; 
+                                    NEXT;
+                                } else if(c2==(0xdf)&&ev[(c1-SSP)*2]) { 
+                                    /* $BH>ByE@(B */
+                                    (*oconv)(ev[(c1-SSP)*2],ev[(c1-SSP)*2+1]);
+                                    c2=0; 
+                                    NEXT;
+                                } 
+                                UNGETC(c2,f); c2 = 0;
+                            }
+                            (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                            NEXT;
+                        } else
+                            SEND;
+                    } else if(c1==SSO && iconv != s_iconv) {
+                        /* EUC X0201 Case */
+                        /* This is too arrogant
+                        if(x0201_f == NO_X0201) {
+                            estab_f = FALSE; 
+                            c2 = 0;  
+                            NEXT;
+                        } */
+                        c1 = GETC(f);  /* skip SSO */
+                        euc_1byte_check:
+                        if(x0201_f && SSP<=c1 && c1<0xe0) {
+                            if(dv[(c1-SSP)*2]||ev[(c1-SSP)*2]) {
+                                if((c2 = GETC(f)) == EOF) {
+                                    (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                    LAST;
+                                }
+                                /* forward lookup $BByE@(B/$BH>ByE@(B */
+                                if(c2 != SSO) {
+                                    UNGETC(c2,f); c2 = 0; 
+                                    (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                    NEXT;
+                                } else if((c2 = GETC(f)) == EOF) {
+                                    (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                    (*oconv)(0,SSO); 
+                                    LAST;
+                                } else if(c2==(0xde)) { /* $BByE@(B */
+                                    (*oconv)(dv[(c1-SSP)*2],dv[(c1-SSP)*2+1]);
+                                    c2=0; 
+                                    NEXT;
+                                } else if(c2==(0xdf)&&ev[(c1-SSP)*2]) { 
+                                    /* $BH>ByE@(B */
+                                    (*oconv)(ev[(c1-SSP)*2],ev[(c1-SSP)*2+1]);
+                                    c2=0; 
+                                    NEXT;
+                                } else {
+                                    (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                    /* we have to check this c2 */
+                                    /* and no way to push back SSO */
+                                    c1 = c2; c2 = 0;
+                                    goto euc_1byte_check;
+                                }
+                            }
+                            (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                            NEXT;
+                        } else 
+                            SEND;
+                    } else if(c1 < SSP && iconv != s_iconv) {
+                        /* strange code in EUC */
+                        iconv = s_iconv;  /* try SJIS */
+                        c2 = c1;
+                        NEXT;
+                    } else {
+                       /* already established */
+                       c2 = c1;
+                       NEXT;
+                    }
+                }
+            } else if((c1 > SPACE) && (c1 != DEL)) {
+                /* in case of Roman characters */
+                if(shift_mode) { 
+                    c1 |= 0x80;
+                    /* output 1 shifted byte */
+                    if(x0201_f && (!iso8859_f||input_mode==X0201) && 
+                            SSP<=c1 && c1<0xe0 ) {
+                        if(dv[(c1-SSP)*2]||ev[(c1-SSP)*2]) {
+                            if((c2 = GETC(f)) == EOF) {
+                                (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                                LAST;
+                            } else if(c2==(0xde&0x7f)) { /* $BByE@(B */
+                                (*oconv)(dv[(c1-SSP)*2],dv[(c1-SSP)*2+1]);
+                                c2=0; 
+                                NEXT;
+                            } else if(c2==(0xdf&0x7f)&&ev[(c1-SSP)*2]) {  
+                                /* $BH>ByE@(B */
+                                (*oconv)(ev[(c1-SSP)*2],ev[(c1-SSP)*2+1]);
+                                c2=0; 
+                                NEXT;
+                            }
+                            UNGETC(c2,f); c2 = 0;
+                        }
+                        (*oconv)(cv[(c1-SSP)*2],cv[(c1-SSP)*2+1]);
+                        NEXT;
+                    } else
+                        SEND;
+                } else if(c1 == '(' && broken_f && input_mode == X0208
+                        && !mime_mode ) {
+                    /* Try to recover missing escape */
+                    if((c1 = GETC(f)) == EOF) {
+                        (*oconv)(0, '(');
+                        LAST;
+                    } else {
+                        if(c1 == 'B' || c1 == 'J' || c1 == 'H') {
+                            input_mode = ASCII; shift_mode = FALSE;
+                            NEXT;
+                        } else {
+                            (*oconv)(0, '(');
+                            /* do not modify various input_mode */
+                            /* It can be vt100 sequence */
+                            SEND;
+                        }
+                    }
+                } else if(input_mode == X0208) {
+                    /* in case of Kanji shifted */
+                    c2 = c1;
+                    NEXT;
+                    /* goto next_byte */
+                } else if(c1 == '=' && mime_f && !mime_mode ) {
+                    if((c1 = getc(f)) == EOF) {
+                        (*oconv)(0, '=');
+                        LAST;
+                    } else if(c1 == '?') {
+                        /* =? is mime conversiooon start sequence */
+                        if(mime_begin(f) == EOF) /* check in detail */
+                            LAST;
+                        else
+                            NEXT;
+                    } else {
+                        (*oconv)(0, '=');
+                        ungetc(c1,f);
+                        NEXT;
+                    }
+                } else if(c1 == '$' && broken_f && !mime_mode) {
+                    /* try to recover missing escape */
+                    if((c1 = GETC(f)) == EOF) {
+                        (*oconv)(0, '$');
+                        LAST;
+                    } else if(c1 == '@'|| c1 == 'B') {
+                        /* in case of Kanji in ESC sequence */
+                        input_mode = X0208;
+                        shift_mode = FALSE;
+                        NEXT;
+                    } else {
+                        /* sorry */
+                        (*oconv)(0, '$');
+                        (*oconv)(0, c1);
+                        NEXT;
+                    }
+                } else
+                    SEND;
+            } else if(c1 == SI) {
+                shift_mode = FALSE; 
+                NEXT;
+            } else if(c1 == SO) {
+                shift_mode = TRUE; 
+                NEXT;
+            } else if(c1 == ESC) {
+                if((c1 = GETC(f)) == EOF) {
+                    (*oconv)(0, ESC);
+                    LAST;
+                } else if(c1 == '$') {
+                    if((c1 = GETC(f)) == EOF) {
+                        (*oconv)(0, ESC);
+                        (*oconv)(0, '$');
+                        LAST;
+                    } else if(c1 == '@'|| c1 == 'B') {
+                        /* This is kanji introduction */
+                        input_mode = X0208;
+                        shift_mode = FALSE;
+                        NEXT;
+                    } else if(c1 == '(') {
+			if((c1 = GETC(f)) == EOF) {
+			    (*oconv)(0, ESC);
+			    (*oconv)(0, '$');
+			    (*oconv)(0, '(');
+			    LAST;
+			} else if(c1 == '@'|| c1 == 'B') {
+			    /* This is kanji introduction */
+			    input_mode = X0208;
+			    shift_mode = FALSE;
+			    NEXT;
+			} else {
+			    (*oconv)(0, ESC);
+			    (*oconv)(0, '$');
+			    (*oconv)(0, '(');
+			    (*oconv)(0, c1);
+			    NEXT;
+			}
+                    } else if(broken_f&0x2) {
+                        input_mode = X0208;
+                        shift_mode = FALSE;
+                        NEXT;
+                    } else {
+                        (*oconv)(0, ESC);
+                        (*oconv)(0, '$');
+                        (*oconv)(0, c1);
+                        NEXT;
+                    }
+                } else if(c1 == '(') {
+                    if((c1 = GETC(f)) == EOF) {
+                        (*oconv)(0, ESC);
+                        (*oconv)(0, '(');
+                        LAST;
+                    } else {
+                        if(c1 == 'I') {
+                            /* This is X0201 kana introduction */
+                            input_mode = X0201; shift_mode = X0201;
+                            NEXT;
+                        } else if(c1 == 'B' || c1 == 'J' || c1 == 'H') {
+                            /* This is X0208 kanji introduction */
+                            input_mode = ASCII; shift_mode = FALSE;
+                            NEXT;
+                        } else if(broken_f&0x2) {
+                            input_mode = ASCII; shift_mode = FALSE;
+                            NEXT;
+                        } else {
+                            (*oconv)(0, ESC);
+                            (*oconv)(0, '(');
+                            /* maintain various input_mode here */
+                            SEND;
+                        }
+                    }
+                } else {
+                    /* lonely ESC  */
+                    (*oconv)(0, ESC);
+                    SEND;
+                }
+            } else if(c1 == NL && broken_f&4) {
+                input_mode = ASCII; 
+                SEND;
+            } else
+                SEND;
+        }
+        /* send: */
+        if(input_mode == X0208) 
+            (*oconv)(c2, c1);  /* this is JIS, not SJIS/EUC case */
+        else
+            (*iconv)(c2, c1);  /* can be EUC/SJIS */
+        c2 = 0;
+        continue;
+        /* goto next_word */
+    }
+
+    /* epilogue */
+    (*iconv)(EOF, 0);
+}
+
+
+
+
+static void
+h_conv(f, c2, c1)
+    FILE  *f;
+    int    c1, c2;
+{
+    int    wc;
+
+
+    /** it must NOT be in the kanji shifte sequence      */
+    /** it must NOT be written in JIS7                   */
+    /** and it must be after 2 byte 8bit code            */
+
+    hold_count = 0;
+    push_hold_buf(c2, c1);
+    c2 = 0;
+
+    while ((c1 = GETC(f)) != EOF) {
+        if(c2) {
+            /* second byte */
+            if(!estab_f) {
+                /* not established */
+                if(c1 > SSP) {
+                    /* it is still ambiguious yet */
+                    SEND;
+                } else if(c1 < AT) {
+                    /* ignore bogus first byte */
+                    c2 = 0;
+                    SEND;
+                } else {
+                    /* now established */
+                    /* it seems to be MS Kanji */
+                    estab_f = TRUE;
+                    iconv = s_iconv;
+                    SEND;
+                }
+            } else
+                SEND;
+        } else {
+            /* First byte */
+            if(c1 > DEL) {
+                /* 8th bit is on */
+                if(c1 < SSP) {
+                    /* it seems to be MS Kanji */
+                    estab_f = TRUE;
+                    iconv = s_iconv;
+                } else if(c1 < 0xe0) {
+                    /* it seems to be EUC */
+                    estab_f = TRUE;
+                    iconv = oconv;
+                } else {
+                    /* still ambiguious */
+                }
+                c2 = c1;
+                NEXT;
+            } else
+            /* 7 bit code , then send without any process */
+                SEND;
+        }
+        /* send: */
+        if((push_hold_buf(c2, c1) == EOF) || estab_f)
+            break;
+        c2 = 0;
+        continue;
+    }
+
+    /** now,
+     ** 1) EOF is detected, or
+     ** 2) Code is established, or
+     ** 3) Buffer is FULL (but last word is pushed)
+     **
+     ** in 1) and 3) cases, we continue to use
+     ** Kanji codes by oconv and leave estab_f unchanged.
+     **/
+
+    for (wc = 0; wc < hold_count; wc += 2) {
+        c2 = hold_buf[wc];
+        c1 = hold_buf[wc+1];
+        (*iconv)(c2, c1);
+    }
+    return;
+}
+
+
+
+static int
+push_hold_buf(c2, c1)
+    int c2, c1;
+{
+    if(hold_count >= HOLD_SIZE*2)
+        return (EOF);
+    hold_buf[hold_count++] = c2;
+    hold_buf[hold_count++] = c1;
+    return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count);
+}
+
+
+static void
+s_iconv(c2, c1)
+    int    c2,
+                    c1;
+{
+    if((c2 == EOF) || (c2 == 0)) {
+        /* NOP */
+    } else {
+        c2 = c2 + c2 - ((c2 <= 0x9f) ? SJ0162 : SJ6394);
+        if(c1 < 0x9f)
+            c1 = c1 - ((c1 > DEL) ? SPACE : 0x1f);
+        else {
+            c1 = c1 - 0x7e;
+            c2++;
+        }
+    }
+    (*oconv)(c2, c1);
+}
+
+
+static void
+e_oconv(c2, c1)
+    int    c2, c1;
+{
+    c2 = pre_convert(c1,c2); c1 = c1_return;
+    if(fold_f) {
+        switch(line_fold(c2,c1)) {
+            case '\n': 
+                if(add_cr == TRUE) {
+                    putchar('\r');
+                    c1 = '\n';
+                }
+                putchar('\n');
+                break;
+            case 0:    return;
+            case '\r': 
+                c1 = '\n'; c2 = 0;
+                break;
+            case '\t': 
+            case ' ': 
+                c1 = ' '; c2 = 0;
+                break;
+        }
+    }
+    if(c2==DOUBLE_SPACE) {
+        putchar(' '); putchar(' ');
+        return;
+    }
+    if(c2 == EOF)
+        return;
+    else if(c2 == 0 && (c1&0x80)) {
+        putchar(SSO); putchar(c1);
+    } else if(c2 == 0) {
+        if(c1 == '\n' && add_cr == TRUE) 
+            putchar('\r');
+        if(c1 != '\r') 
+            putchar(c1);
+        else if(del_cr == FALSE) 
+            putchar(c1);
+    } else {
+        if((c1<0x20 || 0x7e<c1) ||
+           (c2<0x20 || 0x7e<c2)) {
+            estab_f = FALSE;
+            return; /* too late to rescue this char */
+        }
+        putchar(c2 | 0x080);
+        putchar(c1 | 0x080);
+    }
+    return;
+}
+
+
+static void
+s_oconv(c2, c1)
+    int    c2, c1;
+{
+    c2 = pre_convert(c1,c2); c1 = c1_return;
+    if(fold_f) {
+        switch(line_fold(c2,c1)) {
+            case '\n': 
+                if(add_cr == TRUE) {
+                   putchar('\r');
+                   c1 = '\n';
+                }
+                putchar('\n');
+                break;
+            case '\r': 
+                c1 = '\n'; c2 = 0;
+                break;
+            case 0:    return;
+            case '\t': 
+            case ' ': 
+                c1 = ' '; c2 = 0;
+                break;
+        }
+    }
+    if(c2==DOUBLE_SPACE) {
+        putchar(' '); putchar(' ');
+        return;
+    }
+    if(c2 == EOF)
+        return;
+    else if(c2 == 0) {
+        if(c1 == '\n' && add_cr == TRUE) 
+            putchar('\r');
+        if(c1 != '\r') 
+            putchar(c1);
+        else if(del_cr == FALSE) 
+            putchar(c1);
+    } else {
+        if((c1<0x20 || 0x7e<c1) ||
+           (c2<0x20 || 0x7e<c2)) {
+            estab_f = FALSE;
+            return; /* too late to rescue this char */
+        }
+        putchar((((c2 - 1) >> 1) + ((c2 <= 0x5e) ? 0x71 : 0xb1)));
+        putchar((c1 + ((c2 & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e)));
+    }
+    return;
+}
+
+
+static void
+j_oconv(c2, c1)
+    int    c2, c1;
+{
+    c2 = pre_convert(c1,c2); c1 = c1_return;
+    if(fold_f) {
+        switch(line_fold(c2,c1)) {
+            case '\n': 
+                if(output_mode) {
+                    putchar(ESC);
+                    putchar('(');
+                    putchar(ascii_intro);
+                }
+                if(add_cr == TRUE) {
+                    putchar('\r');
+                    c1 = '\n';
+                }
+                putchar('\n');
+                output_mode = ASCII;
+                break;
+            case '\r': 
+                c1 = '\n'; c2 = 0;
+                break;
+            case '\t': 
+            case ' ': 
+                c1 = ' '; c2 = 0;
+                break;
+            case 0:    return;
+        }
+     }
+    if(c2 == EOF) {
+        if(output_mode) {
+            putchar(ESC);
+            putchar('(');
+            putchar(ascii_intro);
+        }
+    } else if(c2 == 0 && (c1 & 0x80)) {
+        if(input_mode==X0201 || !iso8859_f) {
+            if(output_mode!=X0201) {
+                putchar(ESC);
+                putchar('(');
+                putchar('I');
+                output_mode = X0201;
+            }
+            c1 &= 0x7f;
+        } else {
+            /* iso8859 introduction, or 8th bit on */
+            /* Can we convert in 7bit form using ESC-'-'-A ? 
+               Is this popular? */
+        }
+        putchar(c1);
+    } else if(c2 == 0) {
+        if(output_mode) {
+            putchar(ESC);
+            putchar('(');
+            putchar(ascii_intro);
+            output_mode = ASCII;
+        }
+        if(c1 == '\n' && add_cr == TRUE) 
+            putchar('\r');
+        if(c1 != '\r') 
+            putchar(c1);
+        else if(del_cr == FALSE) 
+            putchar(c1);
+    } else if(c2 == DOUBLE_SPACE) {
+        if(output_mode) {
+            putchar(ESC);
+            putchar('(');
+            putchar(ascii_intro);
+            output_mode = ASCII;
+        }
+        putchar(' ');
+        if(c1 == '\n' && add_cr == TRUE) 
+            putchar('\r');
+        if(c1 != '\r') 
+            putchar(c1);
+        else if(del_cr == FALSE) 
+            putchar(c1);
+    } else {
+        if(output_mode != X0208) {
+            putchar(ESC);
+            putchar('$');
+            putchar(kanji_intro);
+            output_mode = X0208;
+        }
+        if(c1<0x20 || 0x7e<c1) 
+            return;
+        if(c2<0x20 || 0x7e<c2) 
+            return;
+        putchar(c2);
+        if(c1 == '\n' && add_cr == TRUE) 
+            putchar('\r');
+        if(c1 != '\r') 
+            putchar(c1);
+        else if(del_cr == FALSE) 
+            putchar(c1);
+    }
+    return;
+}
+
+
+
+#define rot13(c)  ( \
+      ( c < 'A' ) ? c: \
+      (c <= 'M')  ? (c + 13): \
+      (c <= 'Z')  ? (c - 13): \
+      (c < 'a')   ? (c): \
+      (c <= 'm')  ? (c + 13): \
+      (c <= 'z')  ? (c - 13): \
+      (c) \
+)
+
+#define  rot47(c) ( \
+      ( c < '!' ) ? c: \
+      ( c <= 'O' ) ? (c + 47) : \
+      ( c <= '~' ) ?  (c - 47) : \
+      c \
+)
+
+
+/* 
+  Return value of line_fold()
+
+       \n  add newline  and output char
+       \r  add newline  and output nothing
+       ' ' space
+       0   skip  
+       1   (or else) normal output 
+
+  fold state in prev (previous character)
+
+      >0x80 Japanese (X0208/X0201)
+      <0x80 ASCII
+      \n    new line 
+      ' '   space
+
+  This fold algorthm does not preserve heading space in a line.
+  This is the main difference from fmt.
+*/
+
+static int
+line_fold(c2,c1) 
+int c2,c1;
+{ 
+    int prev0;
+    if(c1=='\r') 
+        return 0;               /* ignore cr */
+    if(c1== 8) {
+        if(line>0) line--;
+        return 1;
+    }
+    if(c2==EOF && line != 0)    /* close open last line */
+        return '\n';
+    /* new line */
+    if(c1=='\n') {
+        if(prev == c1) {        /* duplicate newline */
+            if(line) {
+                line = 0;
+                return '\n';    /* output two newline */
+            } else {
+                line = 0;
+                return 1;
+            }
+        } else  {
+            if(prev&0x80) {     /* Japanese? */
+                prev = c1;
+                return 0;       /* ignore given single newline */
+            } else if(prev==' ') {
+                return 0;
+            } else {
+                prev = c1;
+                if(++line<=fold_len) 
+                    return ' ';
+                else {
+                    line = 0;
+                    return '\r';        /* fold and output nothing */
+                }
+            }
+        }
+    }
+    if(c1=='\f') {
+        prev = '\n';
+        if(line==0)
+            return 1;
+        line = 0;
+        return '\n';            /* output newline and clear */
+    }
+    /* X0208 kankaku or ascii space */
+    if( (c2==0&&c1==' ')||
+        (c2==0&&c1=='\t')||
+        (c2==DOUBLE_SPACE)||
+        (c2=='!'&& c1=='!')) {
+        if(prev == ' ') {
+            return 0;           /* remove duplicate spaces */
+        } 
+        prev = ' ';    
+        if(++line<=fold_len) 
+            return ' ';         /* output ASCII space only */
+        else {
+            prev = ' '; line = 0;
+            return '\r';        /* fold and output nothing */
+        }
+    } 
+    prev0 = prev; /* we still need this one... , but almost done */
+    prev = c1;
+    if(c2 || (SSP<=c1 && c1<=0xdf)) 
+        prev |= 0x80;  /* this is Japanese */
+    line += (c2==0)?1:2;
+    if(line<=fold_len) {   /* normal case */
+        return 1;
+    }
+    if(line>=fold_len+FOLD_MARGIN) { /* too many kinsou suspension */
+        line = (c2==0)?1:2;
+        return '\n';       /* We can't wait, do fold now */
+    }
+    /* simple kinsoku rules  return 1 means no folding  */
+    if(c2==0) {
+        if(c1==0xde) return 1; /* $B!+(B*/
+        if(c1==0xdf) return 1; /* $B!,(B*/
+        if(c1==0xa4) return 1; /* $B!#(B*/
+        if(c1==0xa3) return 1; /* $B!$(B*/
+        if(c1==0xa1) return 1; /* $B!W(B*/
+        if(c1==0xb0) return 1; /* - */
+        if(SSP<=c1 && c1<=0xdf) {               /* X0201 */
+            line = 1;
+            return '\n';/* add one new line before this character */
+        }
+        /* fold point in ASCII { [ ( */
+        if(( c1!=')'&&
+             c1!=']'&&
+             c1!='}'&&
+             c1!='.'&&
+             c1!=','&&
+             c1!='!'&&
+             c1!='?'&&
+             c1!='/'&&
+             c1!=':'&&
+             c1!=';')&&
+            ((prev0=='\n')|| (prev0==' ')||     /* ignored new line */
+            (prev0&0x80))                       /* X0208 - ASCII */
+            ) {
+            line = 1;
+            return '\n';/* add one new line before this character */
+        }
+        return 1;  /* default no fold in ASCII */
+    } else {
+        if(c2=='!') {
+            if(c1=='"')  return 1; /* $B!"(B */
+            if(c1=='#')  return 1; /* $B!#(B */
+            if(c1=='$')  return 1; /* $B!$(B */
+            if(c1=='%')  return 1; /* $B!%(B */
+            if(c1=='\'') return 1; /* $B!\(B */
+            if(c1=='(')  return 1; /* $B!((B */
+            if(c1==')')  return 1; /* $B!)(B */
+            if(c1=='*')  return 1; /* $B!*(B */
+            if(c1=='+')  return 1; /* $B!+(B */
+            if(c1==',')  return 1; /* $B!,(B */
+        }
+        line = 2;
+        return '\n'; /* add one new line before this character */
+    }
+}
+
+static int
+pre_convert(c1,c2)
+    int c1,c2;
+{
+        if(c2) c1 &= 0x7f;
+        c1_return = c1;
+        if(c2==EOF) return c2;
+        c2 &= 0x7f;
+        if(rot_f) {
+            if(c2) {
+                c1 = rot47(c1);
+                c2 = rot47(c2);
+            } else {
+                if(!(c1 & 0x80)) 
+                    c1 = rot13(c1);
+            }
+            c1_return = c1;
+        }
+        /* JISX0208 Alphabet */
+        if(alpha_f && c2 == 0x23 ) return 0; 
+        /* JISX0208 Kigou */
+        if(alpha_f && c2 == 0x21 ) { 
+           if(0x21==c1) {
+               if(alpha_f&0x2) {
+                   c1_return = ' ';
+                   return 0;
+               } else if(alpha_f&0x4) {
+                   c1_return = ' ';
+                   return DOUBLE_SPACE;
+               } else {
+                   return c2;
+               }
+           } else if(0x20<c1 && c1<0x7f && fv[c1-0x20]) {
+               c1_return = fv[c1-0x20];
+               return 0;
+           } 
+        }
+        return c2;
+}
+
+
+#ifdef STRICT_MIME
+/* This converts  */
+
+unsigned char *mime_pattern[] = {
+   (unsigned char *)"\075?ISO-8859-1?Q?",
+   (unsigned char *)"\075?ISO-2022-JP?B?",
+   (unsigned char *)"\075?ISO-2022-JP?Q?",
+   (unsigned char *)"\075?JAPANESE_EUC?B?",
+   (unsigned char *)"\075?SHIFT_JIS?B?",
+   NULL
+};
+
+int      mime_encode[] = {
+    'Q', 'B', 'Q',
+    0
+};
+#endif
+
+#define MAXRECOVER 20
+int iso8859_f_save;
+
+#ifdef STRICT_MIME
+
+#define nkf_toupper(c)  (('a'<=c && c<='z')?(c-('a'-'A')):c)
+/* I don't trust portablity of toupper */
+
+static int
+mime_begin(f)
+    FILE *f;
+{
+    int c1;
+    int i,j,k;
+    unsigned char *p,*q;
+    int r[MAXRECOVER];    /* recovery buffer, max mime pattern lenght */
+
+    mime_mode = FALSE;
+    /* =? has been checked   */
+    j = 0;
+    p = mime_pattern[j];
+    r[0]='='; r[1]='?';
+
+    for(i=2;p[i]>' ';i++) {                   /* start at =? */
+        if( ((((r[i] = c1 = getc(f))==EOF) || nkf_toupper(c1) != p[i] ) {
+            /* pattern fails, try next one */
+            q = p;
+            while (p = mime_pattern[++j]) {
+                for(k=2;k<i;k++)              /* assume length(p) > i */
+                    if(p[k]!=q[k]) break;
+                if(k==i && nkf_toupper(c1)==p[k]) break;
+            }
+            if(p) continue;  /* found next one, continue */
+            /* all fails, output from recovery buffer */
+            ungetc(c1,f);
+            for(j=0;j<i;j++) {
+                (*oconv)(0,r[j]);
+            }
+            return c1;
+        }
+    }
+    mime_mode = mime_encode[j];
+    iso8859_f_save = iso8859_f;
+    if(j==0) {
+        iso8859_f = TRUE;
+    }
+    if(mime_mode=='B') {
+        mimebuf_f = unbuf_f;
+        if(!unbuf_f) {
+            /* do MIME integrity check */
+            return mime_integrity(f,mime_pattern[j]);
+        } 
+    }
+    mimebuf_f = TRUE;
+    return c1;
+}
+
+#define mime_getc0(f)   (mimebuf_f?getc(f):Fifo(mime_input++))
+#define mime_ungetc0(c,f) (mimebuf_f?ungetc(c,f):mime_input--)
+
+#else
+static int
+mime_begin(f)
+FILE *f;
+{
+    int c1;
+    int i,j;
+    int r[MAXRECOVER];    /* recovery buffer, max mime pattern lenght */
+
+    mime_mode = FALSE;
+    /* =? has been checked   */
+    j = 0;
+    r[0]='='; r[1]='?';
+    for(i=2;i<MAXRECOVER;i++) {                   /* start at =? */
+	/* We accept any charcter type even if it is breaked by new lines */
+        if( (r[i] = c1 = getc(f))==EOF) break;
+	if(c1=='=') break;
+	if(c1<' '&& c1!='\r' && c1!='\n') break;
+	if(c1=='?') {
+	    i++;
+	    if(!(i<MAXRECOVER) || (r[i] = c1 = getc(f))==EOF) break;
+	    if(c1=='b'||c1=='B') {
+		mime_mode = 'B';
+	    } else if(c1=='q'||c1=='Q') {
+		mime_mode = 'Q';
+	    } else {
+		break;
+	    }
+	    i++;
+	    if(!(i<MAXRECOVER) || (r[i] = c1 = getc(f))==EOF) break;
+	    if(c1=='?') {
+		break;
+	    } else {
+		mime_mode = FALSE;
+	    }
+	    break;
+	}
+    }
+    if(!mime_mode || c1==EOF || i==MAXRECOVER) {
+	ungetc(c1,f);
+	if (i == MAXRECOVER)
+	    i--;
+	for(j=0;j<i;j++) {
+	    (*oconv)(0,r[j]);
+	}
+	return c1;
+    }
+    iso8859_f_save = iso8859_f;
+    /* do no MIME integrity check */
+    return c1;   /* used only for checking EOF */
+}
+
+#define mime_getc0(f)   getc(f)
+#define mime_ungetc0(c,f) ungetc(c,f)
+
+#endif
+
+static int 
+mime_getc(f)
+    FILE *f;
+{
+    int c1, c2, c3, c4, cc;
+    int t1, t2, t3, t4, mode, exit_mode;
+
+    if(mime_top != mime_last) {  /* Something is in FIFO */
+        return  Fifo(mime_top++);
+    }
+
+    if(mimebuf_f == FIXED_MIME)
+        exit_mode = mime_mode;
+    else
+        exit_mode = FALSE;
+    if(mime_mode == 'Q') {
+        if((c1 = mime_getc0(f)) == EOF) return (EOF);
+        if(c1=='_') return ' ';
+        if(c1!='=' && c1!='?') 
+            return c1;
+        mime_mode = exit_mode; /* prepare for quit */
+        if(c1<=' ') return c1;
+        if((c2 = mime_getc0(f)) == EOF) return (EOF);
+        if(c2<=' ') return c2;
+        if(c1=='?'&&c2=='=') {
+            /* end Q encoding */
+            input_mode = exit_mode;
+            iso8859_f = iso8859_f_save;
+            return getc(f);
+        }
+        if(c1=='?') {
+            mime_mode = 'Q'; /* still in MIME */
+            mime_ungetc0(c2,f);
+            return c1;
+        }
+        if((c3 = mime_getc0(f)) == EOF) return (EOF);
+        if(c2<=' ') return c2;
+        mime_mode = 'Q'; /* still in MIME */
+#define hex(c)   (('0'<=c&&c<='9')?(c-'0'):\
+     ('A'<=c&&c<='F')?(c-'A'+10):('a'<=c&&c<='f')?(c-'a'+10):0)
+        return ((hex(c2)<<4) + hex(c3));
+    }
+
+    if(mime_mode != 'B') {
+        mime_mode = FALSE;
+        return getc(f);
+    }
+
+
+    /* Base64 encoding */
+    /* 
+        MIME allows line break in the middle of 
+        Base64, but we are very pessimistic in decoding
+        in unbuf mode because MIME encoded code may broken by 
+        less or editor's control sequence (such as ESC-[-K in unbuffered
+        mode. ignore incomplete MIME.
+    */
+    mode = mime_mode;
+    mime_mode = exit_mode;  /* prepare for quit */
+
+    while ((c1 = mime_getc0(f))<=' ') {
+        if(c1==EOF)
+            return (EOF);
+    }
+    if((c2 = mime_getc0(f))<=' ') {
+        if(c2==EOF)
+            return (EOF);
+        if(mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c2;
+    }
+    if((c1 == '?') && (c2 == '=')) {
+        input_mode = ASCII;
+        while((c1 =  getc(f))==' ' /* || c1=='\n' || c1=='\r' */);
+        return c1;
+    }
+    if((c3 = mime_getc0(f))<=' ') {
+        if(c3==EOF)
+            return (EOF);
+        if(mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c3;
+    }
+    if((c4 = mime_getc0(f))<=' ') {
+        if(c4==EOF)
+            return (EOF);
+        if(mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c4;
+    }
+
+    mime_mode = mode; /* still in MIME sigh... */
+
+    /* BASE 64 decoding */
+
+    t1 = 0x3f & base64decode(c1);
+    t2 = 0x3f & base64decode(c2);
+    t3 = 0x3f & base64decode(c3);
+    t4 = 0x3f & base64decode(c4);
+    cc = ((t1 << 2) & 0x0fc) | ((t2 >> 4) & 0x03);
+    if(c2 != '=') {
+        Fifo(mime_last++) = cc;
+        cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
+        if(c3 != '=') {
+            Fifo(mime_last++) = cc;
+            cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
+            if(c4 != '=') 
+                Fifo(mime_last++) = cc;
+        }
+    } else {
+        return c1;
+    }
+    return  Fifo(mime_top++);
+}
+
+static int
+mime_ungetc(c) 
+    unsigned int c;
+{
+    Fifo(mime_last++) = c;
+    return c;
+}
+
+#ifdef STRICT_MIME
+int
+mime_integrity(f,p)
+    FILE *f;
+    unsigned char *p;
+{
+    int c,d;
+    unsigned int q;
+    /* In buffered mode, read until =? or NL or buffer fffull
+     */
+    mime_input = mime_top;
+    mime_last = mime_top;
+    while(*p) Fifo(mime_input++) = *p++;
+    d = 0;
+    q = mime_input;
+    while((c=getc(f))!=EOF) {
+        if(((mime_input-mime_top)&MIME_BUF_MASK)==0) break;
+        if(c=='=' && d=='?') {
+            /* checked. skip header, start decode */
+            Fifo(mime_input++) = c;
+            mime_input = q; 
+            return 1;
+        }
+        if(!( (c=='+'||c=='/'|| c=='=' || c=='?' ||
+            ('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))))
+            break;
+        /* Should we check length mod 4? */
+        Fifo(mime_input++) = c;
+        d=c;
+    }
+    /* In case of Incomplete MIME, no MIME decode  */
+    Fifo(mime_input++) = c;
+    mime_last = mime_input;     /* point undecoded buffer */
+    mime_mode = 1;              /* no decode on Fifo last in mime_getc */
+    return 1;
+}
+#endif
+
+static int
+base64decode(c)
+    int c;
+{
+    int             i;
+    if(c > '@')
+        if(c < '[')
+            i = c - 'A';                        /* A..Z 0-25 */
+        else
+            i = c - 'G'     /* - 'a' + 26 */ ;  /* a..z 26-51 */
+    else if(c > '/')
+        i = c - '0' + '4'   /* - '0' + 52 */ ;  /* 0..9 52-61 */
+    else if(c == '+')
+        i = '>'             /* 62 */ ;          /* +  62 */
+    else
+        i = '?'             /* 63 */ ;          /* / 63 */
+    return (i);
+}
+
+static void 
+reinit()
+{
+    unbuf_f = FALSE;
+    estab_f = FALSE;
+    nop_f = FALSE;
+    binmode_f = TRUE;       
+    rot_f = FALSE;         
+    input_f = FALSE;      
+    alpha_f = FALSE;     
+    mime_f = TRUE;      
+    mimebuf_f = FALSE; 
+    broken_f = FALSE;  
+    iso8859_f = FALSE; 
+    x0201_f = TRUE;    
+    x0201_f = NO_X0201; 
+    fold_f  = FALSE;
+    kanji_intro = DEFAULT_J;
+    ascii_intro = DEFAULT_R;
+    oconv = DEFAULT_CONV; 
+    output_mode = ASCII;
+    input_mode =  ASCII;
+    shift_mode =  FALSE;
+    mime_mode =   FALSE;
+    file_out = FALSE;
+    add_cr = FALSE;
+    del_cr = FALSE;
+    line = 0;
+}
+
+#ifndef PERL_XS
+int 
+usage()   
+{
+    fprintf(stderr,"USAGE:  nkf(nkf32,wnkf,nkf2) -[flags] [in file] .. [out file for -O flag]\n");
+    fprintf(stderr,"Flags:\n");
+    fprintf(stderr,"b,u      Output is bufferred (DEFAULT),Output is unbufferred\n");
+#ifdef DEFAULT_CODE_SJIS
+    fprintf(stderr,"j,s,e    Outout code is JIS 7 bit, Shift JIS (DEFAULT), AT&T JIS (EUC)\n");
+#endif
+#ifdef DEFAULT_CODE_JIS
+    fprintf(stderr,"j,s,e    Outout code is JIS 7 bit (DEFAULT), Shift JIS, AT&T JIS (EUC)\n");
+#endif
+#ifdef DEFAULT_CODE_EUC
+    fprintf(stderr,"j,s,e    Outout code is JIS 7 bit, Shift JIS, AT&T JIS (EUC) (DEFAULT)\n");
+#endif
+    fprintf(stderr,"J,S,E    Input assumption is JIS 7 bit , Shift JIS, AT&T JIS (EUC)\n");
+    fprintf(stderr,"t        no conversion\n");
+    fprintf(stderr,"i_       Output sequence to designate JIS-kanji (DEFAULT B)\n");
+    fprintf(stderr,"o_       Output sequence to designate ASCII (DEFAULT B)\n");
+    fprintf(stderr,"r        {de/en}crypt ROT13/47\n");
+    fprintf(stderr,"v        Show this usage\n");
+    fprintf(stderr,"m[BQ0]   MIME decode [B:base64,Q:quoted,0:no decode]\n");
+    fprintf(stderr,"l        ISO8859-1 (Latin-1) support\n");
+    fprintf(stderr,"f        Folding: -f60 or -f\n");
+    fprintf(stderr,"Z[0-2]   Convert X0208 alphabet to ASCII  1: Kankaku to space,2: 2 spaces\n");
+    fprintf(stderr,"X,x      Assume X0201 kana in MS-Kanji, -x preserves X0201\n");
+    fprintf(stderr,"B[0-2]   Broken input  0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n");
+#ifdef MSDOS
+    fprintf(stderr,"T        Text mode output\n");
+#endif
+    fprintf(stderr,"O        Output to File (DEFAULT 'nkf.out')\n");
+    fprintf(stderr,"d,c      Delete \\r in line feed, Add \\r in line feed\n");
+    fprintf(stderr,"Network Kanji Filter Version %s (%s) "
+#if defined(MSDOS) && !defined(_Windows)
+                  "for DOS"
+#endif
+#if !defined(__WIN32__) && defined(_Windows)
+                  "for Win16"
+#endif
+#if defined(__WIN32__) && defined(_Windows)
+                  "for Win32"
+#endif
+#ifdef __OS2__
+                  "for OS/2"
+#endif
+                  ,Version,Patchlevel);
+    fprintf(stderr,"\n%s\n",CopyRight);
+    return 0;
+}
+#endif
+
+/**
+ ** $B%Q%C%A@):n<T(B
+ **  void@merope.pleiades.or.jp (Kusakabe Youichi)
+ **  NIDE Naoyuki <nide@ics.nara-wu.ac.jp>
+ **  ohta@src.ricoh.co.jp (Junn Ohta)
+ **  inouet@strl.nhk.or.jp (Tomoyuki Inoue)
+ **  kiri@pulser.win.or.jp (Tetsuaki Kiriyama)
+ **  Kimihiko Sato <sato@sail.t.u-tokyo.ac.jp>
+ **  a_kuroe@kuroe.aoba.yokohama.jp (Akihiko Kuroe)
+ **  kono@ie.u-ryukyu.ac.jp (Shinji Kono)
+ **  GHG00637@nifty-serve.or.jp (COW)
+ **
+ ** $B:G=*99?7F|(B
+ **  1998.11.7
+ **/
+
+/* end */
diff --git a/ext/nkf/test.rb b/ext/nkf/test.rb
new file mode 100644
index 0000000000..4519f8ba7e
--- /dev/null
+++ b/ext/nkf/test.rb
@@ -0,0 +1,318 @@
+$counter = 0
+def result(result, message = nil)
+  $counter += 1
+  printf("%s %d%s\n",
+	 result ? 'ok' : 'no', 
+	 $counter, 
+	 message ? ' ... ' + message : '')
+end
+
+begin
+  require 'nkf'
+  include NKF
+rescue LoadError
+  result(false)
+end
+result(true)
+
+if nkf('-me', '1')
+  result(true);
+else
+  result(false);
+end
+
+output = nkf('-e', "\033\$@#1#3#2%B")
+if output
+  # print output, "\n"
+  result(true, output)
+else
+  result(false)
+end
+
+output = nkf('-Zj', "\033\$@#1#3#2%B")
+if output
+  # print output, "\n"
+  result(true, output)
+else
+  result(false)
+end
+
+output = "\244\306 " * 1024
+old =  output.length
+output = nkf("-j", output)
+if output
+  # print output, "\n"
+  result(true, "#{old} #{output.length}")
+else
+    result(false)
+end
+
+
+$detail = false
+def test(opt, input, expect)
+  print "\nINPUT:\n", input if $detail
+  print "\nEXPECT:\n", expect if $detail
+  result = nkf(opt, input)
+  print "\nGOT:\n", result if $detail
+
+  print result == expect ? "Ok\n" : "Fail\n"
+  return result
+end
+
+# Basic Conversion
+print "\nBasic Conversion test\n\n"
+
+example = {}
+example['jis'] = <<'eofeof'.unpack('u')[0]
+M1FER<W0@4W1A9V4@&R1"(3DQ(3%^2R%+?D]3&RA"(%-E8V]N9"!3=&%G92`;
+M)$)0)TU:&RA"($AI<F%G86YA(!LD0B0B)"0D)B0H)"HD;R1R)',;*$(*2V%T
+M86MA;F$@&R1")2(E)"4F)2@E*B5O)7(E<QLH0B!+:6=O=2`;)$(A)B%G(S`C
+/029!)E@G(B=!*$`;*$(*
+eofeof
+#'
+
+example['sjis'] = <<'eofeof'.unpack('u')[0]
+M1FER<W0@4W1A9V4@@5B)0(F>ED"6GIAR(%-E8V]N9"!3=&%G92"8I9=Y($AI
+M<F%G86YA((*@@J*"I(*F@JB"[8+P@O$*2V%T86MA;F$@@T&#0X-%@T>#28./
+>@Y*#DR!+:6=O=2"!18&'@D^"8(._@]:$081@A+X*
+eofeof
+#'
+
+example['euc'] = <<'eofeof'.unpack('u')[0]
+M1FER<W0@4W1A9V4@H;FQH;'^RZ'+_L_3(%-E8V]N9"!3=&%G92#0I\W:($AI
+M<F%G86YA(*2BI*2DIJ2HI*JD[Z3RI/,*2V%T86MA;F$@I:*EI*6FI:BEJJ7O
+>I?*E\R!+:6=O=2"AIJ'GH["CP:;!IMBGHJ?!J,`*
+eofeof
+#'
+
+example['amb'] = <<'eofeof'.unpack('u')[0]
+MI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&E
+MPK"QI<*PL:7"L+&EPK"QI<(*I<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*P
+ML:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<(*I<*PL:7"L+&E
+MPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"
+ML+&EPK"QI<(*I<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"Q
+MI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<(*I<*PL:7"L+&EPK"QI<*PL:7"
+ML+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<*PL:7"L+&EPK"QI<(*
+eofeof
+
+example['amb.euc'] = <<'eofeof'.unpack('u')[0]
+M&R1")4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25"
+M,#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*&R1")4(P,25",#$E0C`Q)4(P,25"
+M,#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;
+M*$(*&R1")4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P
+M,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*&R1")4(P,25",#$E0C`Q)4(P
+M,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q
+M)4(;*$(*&R1")4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q
+>)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*
+eofeof
+
+example['amb.sjis'] = <<'eofeof'.unpack('u')[0]
+M&RA))4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25"
+M,#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*&RA))4(P,25",#$E0C`Q)4(P,25"
+M,#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;
+M*$(*&RA))4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P
+M,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*&RA))4(P,25",#$E0C`Q)4(P
+M,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q
+M)4(;*$(*&RA))4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q
+>)4(P,25",#$E0C`Q)4(P,25",#$E0C`Q)4(;*$(*
+eofeof
+
+example['x0201.sjis'] = <<'eofeof'.unpack('u')[0]
+MD5.*<(-*@TR#3H-0@U*#2X--@T^#48-3"I%3B7""8()A@F*"8X)D@F6"9H*!
+M@H*"@X*$@H6"AH*'"I%3BTR-AH%)@9>!E(&0@9.!3X&5@9:!:8%J@7R!>X&!
+M@6V!;H%O@7"!CPJ4O(IPMK>X/;FZMMZWWKC>N=ZZWH+&"I2\BG#*W\O?S-_-
+MW\[?M]^QW@K*W\O?S`IH86YK86MU(,K?R]_,I`K*W\O?S-VA"I2\BG""S(SC
+!"@!"
+eofeof
+#'
+
+example['x0201.euc'] = <<'eofeof'.unpack('u')[0]
+MP;2ST:6KI:VEKZ6QI;.EK*6NI;"ELJ6T"L&TL=&CP:/"H\.CQ*/%H\:CQZ/A
+MH^*CXZ/DH^6CYJ/G"L&TM:VYYJ&JH?>A]*'PH?.AL*'UH?:ARJ'+H=VAW*'A
+MH<ZASZ'0H=&A[PK(OK/1CK:.MXZX/8ZYCKJ.MH[>CK>.WHZXCMZ.N8[>CKJ.
+MWJ3("LB^L]&.RH[?CLN.WX[,CM^.S8[?CLZ.WXZWCM^.L8[>"H[*CM^.RX[?
+MCLP*:&%N:V%K=2".RH[?CLN.WX[,CJ0*CLJ.WX[+CM^.S([=CJ$*R+ZST:3.
+#N.4*
+eofeof
+#'
+
+example['x0201.jis'] = <<'eofeof'.unpack('u')[0]
+M&R1"030S424K)2TE+R4Q)3,E+"4N)3`E,B4T&RA""ALD0D$T,5$C02-"(T,C
+M1"-%(T8C1R-A(V(C8R-D(V4C9B-G&RA""ALD0D$T-2TY9B$J(7<A="%P(7,A
+M,"%U(78A2B%+(5TA7"%A(4XA3R%0(5$A;QLH0@H;)$)(/C-1&RA)-C<X&RA"
+M/1LH23DZ-EXW7CA>.5XZ7ALD0B1(&RA""ALD0D@^,U$;*$E*7TM?3%]-7TY?
+M-U\Q7ALH0@H;*$E*7TM?3!LH0@IH86YK86MU(!LH24I?2U],)!LH0@H;*$E*
+97TM?3%TA&RA""ALD0D@^,U$D3CAE&RA""@``
+eofeof
+#`
+
+example['x0201.sosi'] = <<'eofeof'.unpack('u')[0]
+M&R1"030S424K)2TE+R4Q)3,E+"4N)3`E,B4T&RA*"ALD0D$T,5$C02-"(T,C
+M1"-%(T8C1R-A(V(C8R-D(V4C9B-G&RA*"ALD0D$T-2TY9B$J(7<A="%P(7,A
+M,"%U(78A2B%+(5TA7"%A(4XA3R%0(5$A;QLH2@H;)$)(/C-1&RA*#C8W.`\;
+M*$H]#CDZ-EXW7CA>.5XZ7@\;)$(D2!LH2@H;)$)(/C-1&RA*#DI?2U],7TU?
+M3E\W7S%>#PH.2E]+7TP/&RA*"FAA;FMA:W4@#DI?2U],)`\;*$H*#DI?2U],
+672$/&RA*"ALD0D@^,U$D3CAE&RA""@``
+eofeof
+#"
+
+example['x0201.x0208'] = <<'eofeof'.unpack('u')[0]
+M&R1"030S424K)2TE+R4Q)3,E+"4N)3`E,B4T&RA""ALD0D$T,5$;*$)!0D-$
+M149'86)C9&5F9PH;)$)!-#4M.68;*$(A0",D)5XF*B@I+2L]6UU[?1LD0B%O
+M&RA""ALD0D@^,U$E*R4M)2\;*$(]&R1")3$E,R4L)2XE,"4R)30D2!LH0@H;
+M)$)(/C-1)5$E5"57)5HE724M(2PE(B$K&RA""ALD0B51)50E51LH0@IH86YK
+M86MU(!LD0B51)50E52$B&RA""ALD0B51)50E525S(2,;*$(*&R1"2#XS421.
+&.&4;*$(*
+eofeof
+#`
+
+example['mime.iso2022'] = <<'eofeof'.unpack('u')[0]
+M/3])4T\M,C`R,BU*4#]"/T=Y4D%.144W96E23TI566Q/4U9)1WEH2S\]"CT_
+M:7-O+3(P,C(M2E`_0C]'>5)!3D5%-V5I4D]*55EL3U-624=Y:$L_/0H]/VES
+M;RTR,#(R+4I0/U$_/3%")$(D1B11/3%"*$)?96YD/ST*&R1`)#TD)B0K)$H;
+M*$H@/3])4T\M,C`R,BU*4#]"/T=Y4D%.144W96E23U!Y:S=D:'-O4V<]/3\]
+M(&5N9"!O9B!L:6YE"CT_25-/+3(P,C(M2E`_0C]'>5)!3D5%-V5I4D]0>6LW
+M9&AS;U-G/3T_/2`]/TE33RTR,#(R+4I0/T(_1WE204Y%13=E:5)/4'EK-V1H
+M<V]39ST]/ST*0G)O:V5N(&-A<V4*/3])4T\M,C`R,BU*4#]"/T=Y4D%.144W
+M96E23U!Y:S=D"FAS;U-G/3T_/2`]/TE33RTR,`HR,BU*4#]"/T=Y4D%.144W
+M96E23U!Y:S=D:'-O4V<]/3\]"CT_25-/+3(P,C(M2E`_0C]'>5)!3D5%-V5I
+44D]*55EL3QM;2U-624=Y:$L_/0H_
+eofeof
+#'
+
+example['mime.ans.strict'] = <<'eofeof'.unpack('u')[0]
+M&R1"-$$[>B1.)48E.25(&RA""ALD0C1!.WHD3B5&)3DE2!LH0@H;)$(D1B11
+M&RA"(&5N9`H;)$(D/20F)"LD2ALH0B`;)$(T03MZ)$X_*3MV&RA"96YD(&]F
+M(&QI;F4*&R1"-$$[>B1./RD[=C1!.WHD3C\I.W8;*$(*0G)O:V5N(&-A<V4*
+M/3])4T\M,C`R,BU*4#]"/T=Y4D%.144W96E23U!Y:S=D"FAS;U-G/3T_/2`]
+M/TE33RTR,`HR,BU*4#]"/T=Y4D%.144W96E23U!Y:S=D:'-O4V<]/3\]"CT_
+L25-/+3(P,C(M2E`_0C]'>5)!3D5%-V5I4D]*55EL3QM;2U-624=Y:$L_/0H_
+eofeof
+#'
+
+example['mime.unbuf.strict'] = <<'eofeof'.unpack('u')[0]
+M&R1"-$$[>B1.)48E.25(&RA""ALD0C1!.WHD3B5&)3DE2!LH0@H;)$(D1B11
+M&RA"(&5N9`H;)$(D/20F)"LD2ALH0B`;)$(T03MZ)$X_*3MV&RA"96YD(&]F
+M(&QI;F4*&R1"-$$[>B1./RD[=C1!.WHD3C\I.W8;*$(*0G)O:V5N(&-A<V4*
+M&R1"-$$[>B1./RD;*$)H<V]39ST]/ST@/3])4T\M,C`*,C(M2E`_0C]'>5)!
+M3D5%-V5I4D]0>6LW9&AS;U-G/3T_/0H;)$(T03MZ)$XE1ALH0EM+4U9)1WEH
+$2S\]"F5I
+eofeof
+
+example['mime.ans'] = <<'eofeof'.unpack('u')[0]
+M&R1"-$$[>B1.)48E.25(&RA""ALD0C1!.WHD3B5&)3DE2!LH0@H;)$(D1B11
+M&RA"(&5N9`H;)$(D/20F)"LD2ALH0B`;)$(T03MZ)$X_*3MV&RA"96YD(&]F
+M(&QI;F4*&R1"-$$[>B1./RD[=C1!.WHD3C\I.W8;*$(*0G)O:V5N(&-A<V4*
+M&R1"-$$[>B1./RD;*$)H<V]39ST]/ST@&R1"-$$[>B1./RD[=ALH0@H;)$(T
+603MZ)$XE1ALH0EM+4U9)1WEH2S\]"@`*
+eofeof
+#"
+
+example['mime.unbuf'] = <<'eofeof'.unpack('u')[0]
+M&R1"-$$[>B1.)48E.25(&RA""ALD0C1!.WHD3B5&)3DE2!LH0@H;)$(D1B11
+M&RA"(&5N9`H;)$(D/20F)"LD2ALH0B`;)$(T03MZ)$X_*3MV&RA"96YD(&]F
+M(&QI;F4*&R1"-$$[>B1./RD[=C1!.WHD3C\I.W8;*$(*0G)O:V5N(&-A<V4*
+M&R1"-$$[>B1./RD;*$)H<V]39ST]/ST@&R1"-$$[>B1./RD[=ALH0@H;)$(T
+603MZ)$XE1ALH0EM+4U9)1WEH2S\]"@`*
+eofeof
+#"
+
+example['mime.base64'] = <<'eofeof'.unpack('u')[0]
+M9W-M5"])3&YG<FU#>$I+-&=Q=4,S24LS9W%Q0E%:3TUI-39,,S0Q-&=S5T)1
+M43!+9VUA1%9O3T@*9S)+1%1O3'=K8C)1;$E+;V=Q2T-X24MG9W5M0W%*3EEG
+<<T=#>$E+9V=U;4,X64Q&9W)70S592VMG<6U""F=Q
+eofeof
+#"
+
+example['mime.base64.ans'] = <<'eofeof'.unpack('u')[0]
+M&R1")$M&?B1I)#LD1D0Z)"TD7B0Y)"PA(D5L-7XV83E9)$<A(ALH0@T*&R1"
+M(T<E-R5G)4,E+R1R0C\_="0J)"0D1B0B)&LD*D4Y)$,D1B0B)&LD<R1')#<D
+(9R0F)"L;*$(E
+eofeof
+#'
+
+example['mime.is8859'] = <<'eofeof'.unpack('u')[0]
+M/3])4T\M.#@U.2TQ/U$_*CU#-V%V83\_/2`*4&5E<B!4]G)N9W)E;@I,87-S
+M92!(:6QL97+X92!0971E<G-E;B`@7"`B36EN(&MA97!H97-T(&AA<B!F86%E
+M="!E="!F;V5L(2(*06%R:'5S(%5N:79E<G-I='DL($1%3DU!4DL@(%P@(DUI
+<;B!KYG!H97-T(&AA<B!FY65T(&5T(&;X;"$B"@!K
+eofeof
+
+example['mime.is8859.ans'] = <<'eofeof'.unpack('u')[0]
+M*L=A=F$_(`I0965R(%3V<FYG<F5N"DQA<W-E($AI;&QE<OAE(%!E=&5R<V5N
+M("!<(")-:6X@:V%E<&AE<W0@:&%R(&9A865T(&5T(&9O96PA(@I!87)H=7,@
+M56YI=F5R<VET>2P@1$5.34%22R`@7"`B36EN(&OF<&AE<W0@:&%R(&;E970@
+)970@9OAL(2(*
+eofeof
+#"
+
+print 'JIS  to JIS ... '; test('  ', example['jis'], example['jis'])
+print 'JIS  to SJIS... '; test('-s', example['jis'], example['sjis'])
+print 'JIS  to EUC ... '; test('-e', example['jis'], example['euc'])
+
+print 'SJIS to JIS ... '; test('-j', example['sjis'], example['jis'])
+print 'SJIS to SJIS... '; test('-s', example['sjis'], example['sjis'])
+print 'SJIS to EUC ... '; test('-e', example['sjis'], example['euc'])
+
+print 'EUC  to JIS ... '; test('  ', example['euc'], example['jis'])
+print 'EUC  to SJIS... '; test('-s', example['euc'], example['sjis'])
+print 'EUC  to EUC ... '; test('-e', example['euc'], example['euc'])
+
+
+# Ambigous Case
+print 'Ambiguous Case. '; test(''  , example['amb'], example['amb.euc'])
+
+# Input assumption
+print 'SJIS  Input assumption '
+test('-Sx', example['amb'], example['amb.sjis'])
+
+# X0201 ��̾
+# X0201->X0208 conversion
+# X0208 aphabet -> ASCII
+# X0201 ����Ѵ�
+
+print "\nX0201 test\n\n"
+
+# -X is necessary to allow X0201 in SJIS
+# -Z convert X0208 alphabet to ASCII
+print 'X0201 conversion: SJIS '
+test('-XZ', example['x0201.sjis'], example['x0201.x0208'])
+print 'X0201 conversion: JIS  '
+test('-Z',  example['x0201.jis'],  example['x0201.x0208'])
+print 'X0201 conversion:SI/SO '
+test('-Z',  example['x0201.sosi'], example['x0201.x0208'])
+print 'X0201 conversion: EUC  '
+test('-Z',  example['x0201.euc'],  example['x0201.x0208'])
+# -x means X0201 output
+print 'X0201 output: SJIS     '
+test('-xs', example['x0201.euc'],  example['x0201.sjis'])
+print 'X0201 output: JIS      '
+test('-xj', example['x0201.sjis'], example['x0201.jis'])
+print 'X0201 output: EUC      '
+test('-xe', example['x0201.jis'],  example['x0201.euc'])
+
+# MIME decode
+
+print "\nMIME test\n\n"
+
+# MIME ISO-2022-JP
+
+print "Next test is expeced to Fail.\n"
+
+print 'MIME decode (strict)   '
+tmp = test('-m', example['mime.iso2022'], example['mime.ans.strict'])
+print 'MIME decode (nonstrict)'
+tmp = test('-m', example['mime.iso2022'], example['mime.ans'])
+#    open(OUT,'>tmp1');print OUT pack('u',$tmp);close(OUT);
+# unbuf mode implies more pessimistic decode
+print 'MIME decode (unbuf)    '
+test('-mu', example['mime.iso2022'], example['mime.unbuf'])
+print 'MIME decode (base64)   '
+t = test('-mB', example['mime.base64'],  example['mime.base64.ans'])
+
+# MIME ISO-8859-1
+
+# Without -l, ISO-8859-1 was handled as X0201.
+
+print 'MIME ISO-8859-1 (Q)    '
+test('-ml', example['mime.is8859'], example['mime.is8859.ans'])
diff --git a/ext/openssl/.cvsignore b/ext/openssl/.cvsignore
deleted file mode 100644
index 3a9a9f341f..0000000000
--- a/ext/openssl/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-GNUmakefile
-Makefile
-mkmf.log
-dep
-extconf.h
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
deleted file mode 100644
index b2c5ca5ef8..0000000000
--- a/ext/openssl/extconf.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-=begin
-= $RCSfile: extconf.rb,v $ -- 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: extconf.rb,v 1.21.2.9 2006/06/20 11:18:15 gotoyuzo Exp $
-=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
-
-unless have_header("openssl/conf_api.h")
-  message "OpenSSL 0.9.6 or later required.\n"
-  exit 1
-end
-
-message "=== Checking for OpenSSL features... ===\n"
-have_func("ERR_peek_last_error")
-have_func("BN_mod_add")
-have_func("BN_mod_sqr")
-have_func("BN_mod_sub")
-have_func("BN_pseudo_rand_range")
-have_func("BN_rand_range")
-have_func("CONF_get1_default_config_file")
-have_func("EVP_CIPHER_CTX_copy")
-have_func("EVP_CIPHER_CTX_set_padding")
-have_func("EVP_CipherFinal_ex")
-have_func("EVP_CipherInit_ex")
-have_func("EVP_DigestFinal_ex")
-have_func("EVP_DigestInit_ex")
-have_func("EVP_MD_CTX_cleanup")
-have_func("EVP_MD_CTX_create")
-have_func("EVP_MD_CTX_destroy")
-have_func("EVP_MD_CTX_init")
-have_func("HMAC_CTX_cleanup")
-have_func("HMAC_CTX_copy")
-have_func("HMAC_CTX_init")
-have_func("PEM_def_callback")
-have_func("X509V3_set_nconf")
-have_func("X509V3_EXT_nconf_nid")
-have_func("X509_CRL_add0_revoked")
-have_func("X509_CRL_set_issuer_name")
-have_func("X509_CRL_set_version")
-have_func("X509_CRL_sort")
-have_func("X509_STORE_get_ex_data")
-have_func("X509_STORE_set_ex_data")
-have_func("OBJ_NAME_do_all_sorted")
-have_func("OPENSSL_cleanse")
-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_add")
-  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
-if try_compile(<<SRC)
-#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
-# error "OpenSSL version is less than 0.9.7."
-#endif
-SRC
-  have_header("openssl/ocsp.h")
-end
-have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h")
-have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h")
-have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h")
-
-message "=== Checking done. ===\n"
-
-create_header
-create_makefile("openssl")
-message "Done.\n"
diff --git a/ext/openssl/lib/net/ftptls.rb b/ext/openssl/lib/net/ftptls.rb
deleted file mode 100644
index e82eff72fa..0000000000
--- a/ext/openssl/lib/net/ftptls.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-=begin
-= $RCSfile: ftptls.rb,v $ -- 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: ftptls.rb,v 1.1 2003/07/23 16:11:30 gotoyuzo Exp $
-  
-= 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 connect(host, port=FTP_PORT)
-      @hostname = host
-      super
-    end
-
-    def login(user = "anonymous", passwd = nil, acct = nil)
-       store = OpenSSL::X509::Store.new
-       store.set_default_paths
-       ctx = OpenSSL::SSL::SSLContext.new('SSLv23')
-       ctx.cert_store = store
-       ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-       ctx.key = nil
-       ctx.cert = nil
-       voidcmd("AUTH TLS")
-       @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
-       @sock.connect
-       @sock.post_connection_check(@hostname)
-       super(user, passwd, acct)
-       voidcmd("PBSZ 0")
-    end
-  end
-end
diff --git a/ext/openssl/lib/net/telnets.rb b/ext/openssl/lib/net/telnets.rb
deleted file mode 100644
index c869b5da1c..0000000000
--- a/ext/openssl/lib/net/telnets.rb
+++ /dev/null
@@ -1,251 +0,0 @@
-=begin
-= $RCSfile: telnets.rb,v $ -- 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: telnets.rb,v 1.1.2.1 2004/12/20 03:49:16 gotoyuzo Exp $
-  
-  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            = @options['Cert'] unless @sock.cert
-            @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
-            if @options['VerifyMode'] != OpenSSL::SSL::VERIFY_NONE
-              @sock.post_connection_check(@options['Host'])
-            end
-            @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 58fd3887e3..0000000000
--- a/ext/openssl/lib/openssl.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-=begin
-= $RCSfile: openssl.rb,v $ -- 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: openssl.rb,v 1.1 2003/07/23 16:11:29 gotoyuzo Exp $
-=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 4a1595c7ab..0000000000
--- a/ext/openssl/lib/openssl/bn.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-=begin
-= $RCSfile: bn.rb,v $ -- 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: bn.rb,v 1.1 2003/07/23 16:11:30 gotoyuzo Exp $
-=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 9eeb19d959..0000000000
--- a/ext/openssl/lib/openssl/buffering.rb
+++ /dev/null
@@ -1,239 +0,0 @@
-=begin
-= $RCSfile: buffering.rb,v $ -- 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: buffering.rb,v 1.5.2.4 2005/09/04 22:03:24 gotoyuzo Exp $
-=end
-
-module Buffering
-  include Enumerable
-  attr_accessor :sync
-  BLOCK_SIZE = 1024*16
-
-  def initialize(*args)
-    @eof = false
-    @rbuffer = ""
-    @sync = @io.sync
-  end
-
-  #
-  # for reading.
-  #
-  private
-
-  def fill_rbuff
-    begin
-      @rbuffer << self.sysread(BLOCK_SIZE)
-    rescue Errno::EAGAIN
-      retry
-    rescue EOFError
-      @eof = true
-    end
-  end
-
-  def consume_rbuff(size=nil)
-    if @rbuffer.empty?
-      nil
-    else
-      size = @rbuffer.size unless size
-      ret = @rbuffer[0, size]
-      @rbuffer[0, size] = ""
-      ret
-    end
-  end
-
-  public
-
-  def read(size=nil, buf=nil)
-    if size == 0
-      if buf
-        buf.clear
-      else
-        buf = ""
-      end
-      return @eof ? nil : buf
-    end
-    until @eof
-      break if size && size <= @rbuffer.size
-      fill_rbuff
-    end
-    ret = consume_rbuff(size) || ""
-    if buf
-      buf.replace(ret)
-      ret = buf
-    end
-    (size && ret.empty?) ? nil : ret
-  end
-
-  def readpartial(maxlen, buf=nil)
-    if maxlen == 0
-      if buf
-        buf.clear
-      else
-        buf = ""
-      end
-      return @eof ? nil : buf
-    end
-    if @rbuffer.empty?
-      begin
-        return sysread(maxlen, buf)
-      rescue Errno::EAGAIN
-        retry
-      end
-    end
-    ret = consume_rbuff(maxlen)
-    if buf
-      buf.replace(ret)
-      ret = buf
-    end
-    raise EOFError if ret.empty?
-    ret
-  end
-
-  def gets(eol=$/)
-    idx = @rbuffer.index(eol)
-    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 EOFError if eof?
-    gets(eol)
-  end
-
-  def getc
-    c = read(1)
-    c ? c[0] : nil
-  end
-
-  def each_byte
-    while c = getc
-      yield(c)
-    end
-  end
-
-  def readchar
-    raise EOFError if eof?
-    getc
-  end
-
-  def ungetc(c)
-    @rbuffer[0,0] = c.chr
-  end
-
-  def eof?
-    fill_rbuff if !@eof && @rbuffer.empty?
-    @eof && @rbuffer.empty?
-  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
-        str = @wbuffer[nwritten,remain]
-        begin
-          nwrote = syswrite(str)
-        rescue Errno::EAGAIN
-          retry
-        end
-        remain -= nwrote
-        nwritten += nwrote
-      end
-      @wbuffer[0,nwritten] = ""
-    end
-  end
-
-  public
-
-  def write(s)
-    do_write(s)
-    s.length
-  end
-
-  def << (s)
-    do_write(s)
-    self
-  end
-
-  def puts(*args)
-    s = ""
-    if args.empty?
-      s << "\n"
-    end
-    args.each{|arg|
-      s << arg.to_s
-      if $/ && /\n\z/ !~ s
-        s << "\n"
-      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 7825e5e9e6..0000000000
--- a/ext/openssl/lib/openssl/cipher.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-=begin
-= $RCSfile: cipher.rb,v $ -- 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: cipher.rb,v 1.1.2.2 2006/06/20 11:18:15 gotoyuzo Exp $
-=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{|name|
-      klass = Class.new(Cipher){
-        define_method(:initialize){|*args|
-          cipher_name = args.inject(name){|n, arg| "#{n}-#{arg}" }
-          super(cipher_name)
-        }
-      }
-      const_set(name, klass)
-    }
-
-    %w(128 192 256).each{|keylen|
-      klass = Class.new(Cipher){
-        define_method(:initialize){|mode|
-          mode ||= "CBC"
-          cipher_name = "AES-#{keylen}-#{mode}"
-          super(cipher_name)
-        }
-      }
-      const_set("AES#{keylen}", klass)
-    }
-
-    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 6f2c998ff6..0000000000
--- a/ext/openssl/lib/openssl/digest.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-=begin
-= $RCSfile: digest.rb,v $ -- 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: digest.rb,v 1.1.2.2 2006/06/20 11:18:15 gotoyuzo Exp $
-=end
-
-##
-# Should we care what if somebody require this file directly?
-#require 'openssl'
-
-module OpenSSL
-  module Digest
-
-    alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
-    if OPENSSL_VERSION_NUMBER > 0x00908000
-      alg += %w(SHA224 SHA256 SHA384 SHA512)
-    end
-
-    alg.each{|name|
-      klass = Class.new(Digest){
-        define_method(:initialize){|*data|
-          if data.length > 1
-            raise ArgumentError,
-              "wrong number of arguments (#{data.length} for 1)"
-          end
-          super(name, data.first)
-        }
-      }
-      singleton = (class <<klass; self; end)
-      singleton.class_eval{
-        define_method(:digest){|data| Digest.digest(name, data) }
-        define_method(:hexdigest){|data| Digest.hexdigest(name, data) }
-      }
-      const_set(name, klass)
-    }
-
-  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 d1007ce6d0..0000000000
--- a/ext/openssl/lib/openssl/ssl.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-=begin
-= $RCSfile: ssl.rb,v $ -- 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: ssl.rb,v 1.5.2.6 2006/05/23 18:14:05 gotoyuzo Exp $
-=end
-
-require "openssl"
-require "openssl/buffering"
-require "fcntl"
-
-module OpenSSL
-  module SSL
-    module SocketForwarder
-      def addr
-        to_io.addr
-      end
-
-      def peeraddr
-        to_io.peeraddr
-      end
-
-      def setsockopt(level, optname, optval)
-        to_io.setsockopt(level, optname, optval)
-      end
-
-      def getsockopt(level, optname)
-        to_io.getsockopt(level, optname)
-      end
-
-      def fcntl(*args)
-        to_io.fcntl(*args)
-      end
-
-      def closed?
-        to_io.closed?
-      end
-
-      def do_not_reverse_lookup=(flag)
-        to_io.do_not_reverse_lookup = flag
-      end
-    end
-
-    module Nonblock
-      def initialize(*args)
-        flag = File::NONBLOCK
-        flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
-        @io.fcntl(Fcntl::F_SETFL, flag)
-        super
-      end
-    end
-
-    class SSLSocket
-      include Buffering
-      include SocketForwarder
-      include Nonblock
-
-      def post_connection_check(hostname)
-        check_common_name = true
-        cert = peer_cert
-        cert.extensions.each{|ext|
-          next if ext.oid != "subjectAltName"
-          ext.value.split(/,\s+/).each{|general_name|
-            if /\ADNS:(.*)/ =~ general_name
-              check_common_name = false
-              reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
-              return true if /\A#{reg}\z/i =~ hostname
-            elsif /\AIP Address:(.*)/ =~ general_name
-              check_common_name = false
-              return true if $1 == hostname
-            end
-          }
-        }
-        if check_common_name
-          cert.subject.to_a.each{|oid, value|
-            if oid == "CN"
-              reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
-              return true if /\A#{reg}\z/i =~ hostname
-            end
-          }
-        end
-        raise SSLError, "hostname was not match with the server certificate"
-      end
-    end
-
-    class SSLServer
-      include SocketForwarder
-      attr_accessor :start_immediately
-
-      def initialize(svr, ctx)
-        @svr = svr
-        @ctx = ctx
-        unless ctx.session_id_context
-          session_id = OpenSSL::Digest::MD5.hexdigest($0)
-          @ctx.session_id_context = session_id
-        end
-        @start_immediately = true
-      end
-
-      def to_io
-        @svr
-      end
-
-      def listen(backlog=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 2ad3f8e96e..0000000000
--- a/ext/openssl/lib/openssl/x509.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-=begin
-= $RCSfile: x509.rb,v $ -- 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: x509.rb,v 1.4.2.2 2004/12/19 08:28:33 gotoyuzo Exp $
-=end
-
-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
-    
-    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
-
-    class Name
-      module RFC2253DN
-        Special = ',=+<>#;'
-        HexChar = /[0-9a-fA-F]/
-        HexPair = /#{HexChar}#{HexChar}/
-        HexString = /#{HexPair}+/
-        Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
-        StringChar = /[^#{Special}\\"]/
-        QuoteChar = /[^\\"]/
-        AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
-        AttributeValue = /
-          (?!["#])((?:#{StringChar}|#{Pair})*)|
-          \#(#{HexString})|
-          "((?:#{QuoteChar}|#{Pair})*)"
-        /x
-        TypeAndValue = /\A(#{AttributeType})=#{AttributeValue}/
-
-        module_function
-
-        def expand_pair(str)
-          return nil unless str
-          return str.gsub(Pair){|pair|
-            case pair.size
-            when 2 then pair[1,1]
-            when 3 then Integer("0x#{pair[1,2]}").chr
-            else raise OpenSSL::X509::NameError, "invalid pair: #{str}"
-            end
-          }
-        end
-
-        def expand_hexstring(str)
-          return nil unless str
-          der = str.gsub(HexPair){|hex| Integer("0x#{hex}").chr }
-          a1 = OpenSSL::ASN1.decode(der)
-          return a1.value, a1.tag
-        end
-
-        def expand_value(str1, str2, str3)
-          value = expand_pair(str1)
-          value, tag = expand_hexstring(str2) unless value
-          value = expand_pair(str3) unless value
-          return value, tag
-        end
-
-        def scan(dn)
-          str = dn
-          ary = []
-          while true
-            if md = TypeAndValue.match(str)
-              matched = md.to_s
-              remain = md.post_match
-              type = md[1]
-              value, tag = expand_value(md[2], md[3], md[4]) rescue nil
-              if value
-                type_and_value = [type, value]
-                type_and_value.push(tag) if tag
-                ary.unshift(type_and_value)
-                if remain.length > 2 && remain[0] == ?,
-                  str = remain[1..-1]
-                  next
-                elsif remain.length > 2 && remain[0] == ?+
-                  raise OpenSSL::X509::NameError,
-                    "multi-valued RDN is not supported: #{dn}"
-                elsif remain.empty?
-                  break
-                end
-              end
-            end
-            msg_dn = dn[0, dn.length - str.length] + " =>" + str
-            raise OpenSSL::X509::NameError, "malformed RDN: #{msg_dn}"
-          end
-          return ary
-        end
-      end
-
-      class <<self
-        def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE)
-          ary = OpenSSL::X509::Name::RFC2253DN.scan(str)
-          self.new(ary, template)
-        end
-
-        def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
-          ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=", 2) }
-          self.new(ary, template)
-        end
-
-        alias parse parse_openssl
-      end
-    end
-  end
-end
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
deleted file mode 100644
index 2c005f41e5..0000000000
--- a/ext/openssl/openssl_missing.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * $Id: openssl_missing.c,v 1.2.2.4 2006/06/02 10:02:56 gotoyuzo Exp $
- * '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 RUBY_EXTCONF_H
-
-#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ST_ENGINE)
-# include <openssl/engine.h>
-#endif
-#include <openssl/x509_vfy.h>
-
-#if !defined(OPENSSL_NO_HMAC)
-#include <string.h> /* memcpy() */
-#include <openssl/hmac.h>
-
-#include "openssl_missing.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)
-
-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_EVP_CIPHER_CTX_COPY)
-/* 
- * this function does not exist in OpenSSL yet... or ever?.
- * a future version may break this function.
- * tested on 0.9.7d.
- */
-int
-EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in)
-{
-    memcpy(out, in, sizeof(EVP_CIPHER_CTX));
-
-#if defined(HAVE_ENGINE_ADD) && defined(HAVE_ST_ENGINE)
-    if (in->engine) ENGINE_add(out->engine);
-    if (in->cipher_data) {
-	out->cipher_data = OPENSSL_malloc(in->cipher->ctx_size);
-	memcpy(out->cipher_data, in->cipher_data, in->cipher->ctx_size);
-    }
-#endif
-
-    return 1;
-}
-#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 8d580f5ee8..0000000000
--- a/ext/openssl/openssl_missing.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * $Id: openssl_missing.h,v 1.2.2.2 2005/04/15 19:16:18 gotoyuzo Exp $
- * '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
-
-void HMAC_CTX_init(HMAC_CTX *ctx);
-int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-void HMAC_CTX_cleanup(HMAC_CTX *ctx);
-
-EVP_MD_CTX *EVP_MD_CTX_create(void);
-void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-
-#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
-int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
-#endif
-
-#if !defined(HAVE_EVP_DIGESTINIT_EX)
-#  define EVP_DigestInit_ex(ctx, md, engine) EVP_DigestInit(ctx, md)
-#endif
-#if !defined(HAVE_EVP_DIGESTFINAL_EX)
-#  define EVP_DigestFinal_ex(ctx, buf, len) EVP_DigestFinal(ctx, buf, len)
-#endif
-
-#if !defined(HAVE_EVP_CIPHERINIT_EX)
-#  define EVP_CipherInit_ex(ctx, type, impl, key, iv, enc) EVP_CipherInit(ctx, type, key, iv, enc)
-#endif
-#if !defined(HAVE_EVP_CIPHERFINAL_EX)
-#  define EVP_CipherFinal_ex(ctx, outm, outl) EVP_CipherFinal(ctx, outm, outl)
-#endif
-
-#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
-
-#if !defined(HAVE_EVP_HMAC_INIT_EX)
-#  define HMAC_Init_ex(ctx, key, len, digest, engine) HMAC_Init(ctx, key, len, digest)
-#endif
-
-#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
-
-#if !defined(HAVE_OPENSSL_CLEANSE)
-#define OPENSSL_cleanse(p, l) memset(p, 0, l)
-#endif
-
-void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
-int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
-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 01c5ca2a04..0000000000
--- a/ext/openssl/ossl.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * $Id: ossl.c,v 1.11.2.6 2005/11/01 01:52:13 gotoyuzo Exp $
- * '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 not X509 cert 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;
-}
-
-#define OSSL_IMPL_SK2ARY(name, type)	        \
-VALUE						\
-ossl_##name##_sk2ary(STACK *sk)			\
-{						\
-    type *t;					\
-    int i, num;					\
-    VALUE ary;					\
-						\
-    if (!sk) {					\
-	OSSL_Debug("empty sk!");		\
-	return Qnil;				\
-    }						\
-    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_IMPL_SK2ARY(x509, X509)
-OSSL_IMPL_SK2ARY(x509crl, X509_CRL)
-
-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;
-    int len = 0;
-
-#ifdef HAVE_ERR_PEEK_LAST_ERROR
-    e = ERR_peek_last_error();
-#else
-    e = ERR_peek_error();
-#endif
-    if (fmt) {
-	va_start(args, fmt);
-	len = vsnprintf(buf, BUFSIZ, fmt, args);
-	va_end(args);
-    }
-    if (len < BUFSIZ && e) {
-	if (dOSSL == Qtrue) /* FULL INFO */
-	    msg = ERR_error_string(e, NULL);
-	else
-	    msg = ERR_reason_error_string(e);
-	fmt = len ? ": %s" : "%s";
-	len += snprintf(buf+len, BUFSIZ-len, fmt, msg);
-    }
-    if (dOSSL == Qtrue){ /* show all errors on the stack */
-	while ((e = ERR_get_error()) != 0){
-	    rb_warn("error on stack: %s", ERR_error_string(e, NULL));
-	}
-    }
-    ERR_clear_error();
-
-    if(len > BUFSIZ) len = strlen(buf);
-    rb_exc_raise(rb_exc_new(exc, buf, len));
-}
-
-VALUE
-ossl_get_errors()
-{
-    VALUE ary;
-    long e;
-
-    ary = rb_ary_new();
-    while ((e = ERR_get_error()) != 0){
-        rb_ary_push(ary, rb_str_new2(ERR_error_string(e, NULL)));
-    }
-
-    return ary;
-}
-
-/*
- * 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_ssl_algorithms();
-    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);
-    rb_define_module_function(mOSSL, "errors", ossl_get_errors, 0);
-
-    /*
-     * 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_pkcs12();
-    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 336b468eb2..0000000000
--- a/ext/openssl/ossl.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * $Id: ossl.h,v 1.14.2.4.2.1 2006/12/25 11:16:49 shyouhei Exp $
- * '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_
-
-#include RUBY_EXTCONF_H
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- *_FILE_OFFSET_BITS needs to be defined before some system headers on
- * Solaris.
- */
-#include "config.h"
-
-/*
- * 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/pkcs12.h>
-#include <openssl/pkcs7.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(HAVE_ST_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_x509_sk2ary(STACK_OF(X509) *certs);
-VALUE ossl_x509crl_sk2ary(STACK_OF(X509_CRL) *crl);
-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, " [%s:%d]\n", __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_pkcs12.h"
-#include "ossl_pkcs7.h"
-#include "ossl_pkcs5.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 6bc5b88e8f..0000000000
--- a/ext/openssl/ossl_asn1.c
+++ /dev/null
@@ -1,1166 +0,0 @@
-/*
- * $Id: ossl_asn1.c,v 1.5.2.9 2006/04/29 13:52:15 gotoyuzo Exp $
- * '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 || !time->data) return Qnil;
-    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;
-	}
-	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" );
-	} 
-	break;
-    default:
-	rb_warning("unknown time format");
-        return Qnil;
-    }
-    argv[0] = INT2NUM(tm.tm_year);
-    argv[1] = INT2NUM(tm.tm_mon);
-    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));
-}
-
-/*
- * STRING conversion
- */
-VALUE
-asn1str_to_str(ASN1_STRING *str)
-{
-    return rb_str_new(str->data, str->length);
-}
-
-/*
- * 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) ? 0xff : 0x100;
-}
-
-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, "universal tag for %s not found",
-	       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, "tag number for Universal too large");
-    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 = 0;
-	    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;
-    volatile VALUE tmp;
-
-    obj = ossl_to_der_if_possible(obj);
-    tmp = rb_str_new4(StringValue(obj));
-    p = RSTRING(tmp)->ptr;
-    ossl_asn1_decode0(&p, RSTRING(tmp)->len, &offset, 0, 0, 1);
-
-    return Qnil;
-}
-
-static VALUE
-ossl_asn1_decode(VALUE self, VALUE obj)
-{
-    VALUE ret, ary;
-    unsigned char *p;
-    long offset = 0;
-    volatile VALUE tmp;
-
-    obj = ossl_to_der_if_possible(obj);
-    tmp = rb_str_new4(StringValue(obj));
-    p = RSTRING(tmp)->ptr;
-    ary = ossl_asn1_decode0(&p, RSTRING(tmp)->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;
-    volatile VALUE tmp;
-
-    obj = ossl_to_der_if_possible(obj);
-    tmp = rb_str_new4(StringValue(obj));
-    p = RSTRING(tmp)->ptr;
-    ret = ossl_asn1_decode0(&p, RSTRING(tmp)->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, "invalid tag default");
-	if(NIL_P(tag_class))
-	    tag_class = ID2SYM(sCONTEXT_SPECIFIC);
-	if(!SYMBOL_P(tag_class))
-	    ossl_raise(eASN1Error, "invalid tag class");
-	if(SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
-	    ossl_raise(eASN1Error, "tag number for Universal too large");
-    }
-    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 int
-ossl_i2d_ASN1_TYPE(ASN1_TYPE *a, unsigned char **pp)
-{
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
-    if(!a) return 0;
-    if(a->type == V_ASN1_BOOLEAN)
-        return i2d_ASN1_BOOLEAN(a->value.boolean, pp);
-#endif
-    return i2d_ASN1_TYPE(a, pp);
-}
-
-static void
-ossl_ASN1_TYPE_free(ASN1_TYPE *a)
-{
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
-    if(!a) return;
-    if(a->type == V_ASN1_BOOLEAN){
-        OPENSSL_free(a);
-        return;
-    }
-#endif
-    ASN1_TYPE_free(a);
-}
-
-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, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
-    if(!(buf = OPENSSL_malloc(length))){
-	ossl_ASN1_TYPE_free(asn1);
-	ossl_raise(eASN1Error, "cannot alloc buffer");
-    }
-    p = buf;
-    if(tc == V_ASN1_UNIVERSAL) ossl_i2d_ASN1_TYPE(asn1, &p);
-    else{
-	if(explicit){
-	    ASN1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
-	    ossl_i2d_ASN1_TYPE(asn1, &p);
-	}
-	else{
-	    ossl_i2d_ASN1_TYPE(asn1, &p);
-	    *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
-	}
-    }
-    ossl_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(VALUE 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 6a1c97b902..0000000000
--- a/ext/openssl/ossl_asn1.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $Id: ossl_asn1.h,v 1.3.2.1 2005/09/10 01:17:00 gotoyuzo Exp $
- * '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_STRING conversions
- */
-VALUE asn1str_to_str(ASN1_STRING *);
-
-/*
- * 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 4e3248eb1d..0000000000
--- a/ext/openssl/ossl_bio.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * $Id: ossl_bio.c,v 1.2.2.1 2005/06/19 16:29:17 gotoyuzo Exp $
- * '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"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-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 ca312679fa..0000000000
--- a/ext/openssl/ossl_bio.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * $Id: ossl_bio.h,v 1.2 2003/09/17 09:05:01 gotoyuzo Exp $
- * '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 fb86c8721c..0000000000
--- a/ext/openssl/ossl_bn.c
+++ /dev/null
@@ -1,715 +0,0 @@
-/*
- * $Id: ossl_bn.c,v 1.5.2.1 2004/12/15 01:54:39 matz Exp $
- * '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;
-
-    if (rb_scan_args(argc, argv, "11", &str, &bs) == 2) {
-	base = NUM2INT(bs);
-    }
-    StringValue(str);
-    GetBN(self, bn);
-    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;
-    }
-
-    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;
-
-    if (rb_scan_args(argc, argv, "01", &bs) == 1) {
-	base = NUM2INT(bs);
-    }
-    GetBN(self, bn);
-    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)
-{
-    int b;
-    BIGNUM *bn;
-
-    b = NUM2INT(bit);
-    GetBN(self, bn);
-    if (BN_is_bit_set(bn, b)) {
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
-#define BIGNUM_SHIFT(func)				\
-    static VALUE					\
-    ossl_bn_##func(VALUE self, VALUE bits)		\
-    {							\
-	BIGNUM *bn, *result;				\
-	int b;						\
-	VALUE obj;					\
-	b = NUM2INT(bits);				\
-	GetBN(self, bn);				\
-	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;
-
-    if (rb_scan_args(argc, argv, "01", &vchecks) == 0) {
-	checks = NUM2INT(vchecks);
-    }
-    GetBN(self, bn);
-    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;
-
-    rb_scan_args(argc, argv, "02", &vchecks, &vtrivdiv);
-
-    if (!NIL_P(vchecks)) {
-	checks = NUM2INT(vchecks);
-    }
-    GetBN(self, bn);
-    /* 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 bccdbc0cd6..0000000000
--- a/ext/openssl/ossl_bn.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * $Id: ossl_bn.h,v 1.1 2003/07/23 16:11:29 gotoyuzo Exp $
- * '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 8d96d0b35a..0000000000
--- a/ext/openssl/ossl_cipher.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * $Id: ossl_cipher.c,v 1.4.2.6 2006/06/20 11:18:15 gotoyuzo Exp $
- * '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_ex(ctx, cipher, NULL, 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);
-    EVP_CIPHER_CTX_init(ctx);
-	
-    return obj;
-}
-
-static VALUE
-ossl_cipher_initialize(VALUE self, VALUE str)
-{
-    EVP_CIPHER_CTX *ctx;
-    const EVP_CIPHER *cipher;
-    char *name;
-
-    name = StringValuePtr(str);
-    GetCipher(self, ctx);
-    if (!(cipher = EVP_get_cipherbyname(name))) {
-	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%s)", name);
-    }
-    if (EVP_CipherInit_ex(ctx, cipher, NULL, 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);
-    if (EVP_CIPHER_CTX_copy(ctx1, ctx2) != 1)
-	ossl_raise(eCipherError, NULL);
-
-    return self;
-}
-
-static void*
-add_cipher_name_to_ary(const OBJ_NAME *name, VALUE ary)
-{
-    rb_ary_push(ary, rb_str_new2(name->name));
-    return NULL;
-}
-
-static VALUE
-ossl_s_ciphers(VALUE self)
-{
-#ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
-    VALUE ary;
-
-    ary = rb_ary_new();
-    OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
-                    (void(*)(const OBJ_NAME*,void*))add_cipher_name_to_ary,
-                    (void*)ary);
-
-    return ary;
-#else
-    rb_notimplement();
-#endif
-}
-
-static VALUE
-ossl_cipher_reset(VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-
-    GetCipher(self, ctx);
-    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, -1) != 1)
-	ossl_raise(eCipherError, NULL);
-		
-    return self;
-}
-
-static VALUE
-ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
-{
-    EVP_CIPHER_CTX *ctx;
-    unsigned char key[EVP_MAX_KEY_LENGTH], *p_key = NULL;
-    unsigned char iv[EVP_MAX_IV_LENGTH], *p_iv = NULL;
-    VALUE pass, init_v;
-
-    if(rb_scan_args(argc, argv, "02", &pass, &init_v) > 0){
-	/*
-	 * oops. this code mistakes salt for IV.
-	 * We deprecated the arguments for this method, but we decided
-	 * keeping this behaviour for backward compatibility.
-	 */
-	StringValue(pass);
-	GetCipher(self, ctx);
-	if (NIL_P(init_v)) memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv));
-	else{
-	    char *cname  = rb_class2name(rb_obj_class(self));
-	    rb_warning("key derivation by %s#encrypt is deprecated; "
-		       "use %s::pkcs5_keyivgen instead", cname, cname);
-	    StringValue(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));
-	}
-	EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
-		       RSTRING(pass)->ptr, RSTRING(pass)->len, 1, key, NULL);
-	p_key = key;
-	p_iv = iv;
-    }
-    else {
-	GetCipher(self, ctx);
-    }
-    if (EVP_CipherInit_ex(ctx, NULL, NULL, p_key, p_iv, mode) != 1) {
-	ossl_raise(eCipherError, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
-{
-    return ossl_cipher_init(argc, argv, self, 1);
-}
-
-static VALUE
-ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
-{
-    return ossl_cipher_init(argc, argv, self, 0);
-}
-
-static VALUE
-ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-    const EVP_MD *digest;
-    VALUE vpass, vsalt, viter, vdigest;
-    unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH], *salt = NULL;
-    int iter;
-
-    rb_scan_args(argc, argv, "13", &vpass, &vsalt, &viter, &vdigest);
-    StringValue(vpass);
-    if(!NIL_P(vsalt)){
-	StringValue(vsalt);
-	if(RSTRING(vsalt)->len != PKCS5_SALT_LEN)
-	    rb_raise(eCipherError, "salt must be an 8-octet string");
-	salt = RSTRING(vsalt)->ptr;
-    }
-    iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
-    digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
-    GetCipher(self, ctx);
-    EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
-		   RSTRING(vpass)->ptr, RSTRING(vpass)->len, iter, key, iv); 
-    if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, -1) != 1)
-	ossl_raise(eCipherError, NULL);
-    OPENSSL_cleanse(key, sizeof key);
-    OPENSSL_cleanse(iv, sizeof iv);
-
-    return Qnil;
-}
-
-static VALUE 
-ossl_cipher_update(VALUE self, VALUE data)
-{
-    EVP_CIPHER_CTX *ctx;
-    char *in;
-    int in_len, out_len;
-    VALUE str;
-
-    StringValue(data);
-    in = RSTRING(data)->ptr;
-    if ((in_len = RSTRING(data)->len) == 0)
-        rb_raise(rb_eArgError, "data must not be empty");
-    GetCipher(self, ctx);
-    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_update_deprecated(VALUE self, VALUE data)
-{
-    char *cname;
-
-    cname = rb_class2name(rb_obj_class(self));
-    rb_warning("%s#<< is deprecated; use %s#update instead", cname, cname);
-    return ossl_cipher_update(self, data);
-}
-
-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_ex(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_ex(ctx, NULL, 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_ex(ctx, NULL, NULL, NULL, RSTRING(iv)->ptr, -1) != 1)
-	ossl_raise(eCipherError, NULL);
-
-    return iv;
-}
-
-static VALUE
-ossl_cipher_set_key_length(VALUE self, VALUE key_length)
-{
-    EVP_CIPHER_CTX *ctx;
-    int len = NUM2INT(key_length);
- 
-    GetCipher(self, ctx);
-    if (EVP_CIPHER_CTX_set_key_length(ctx, len) != 1)
-        ossl_raise(eCipherError, NULL);
-
-    return key_length;
-}
-
-static VALUE
-ossl_cipher_set_padding(VALUE self, VALUE padding)
-{
-#if defined(HAVE_EVP_CIPHER_CTX_SET_PADDING)
-    EVP_CIPHER_CTX *ctx;
-    int pad = NUM2INT(padding);
-
-    GetCipher(self, ctx);
-    if (EVP_CIPHER_CTX_set_padding(ctx, pad) != 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_copy_func(cCipher, ossl_cipher_copy);
-    rb_define_module_function(mCipher, "ciphers", ossl_s_ciphers, 0);
-    rb_define_method(cCipher, "initialize", ossl_cipher_initialize, 1);
-    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, "pkcs5_keyivgen", ossl_cipher_pkcs5_keyivgen, -1);
-    rb_define_method(cCipher, "update", ossl_cipher_update, 1);
-    rb_define_method(cCipher, "<<", ossl_cipher_update_deprecated, 1);
-    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_set_key_length, 1);
-    rb_define_method(cCipher, "key_len", ossl_cipher_key_length, 0);
-    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);
-}
diff --git a/ext/openssl/ossl_cipher.h b/ext/openssl/ossl_cipher.h
deleted file mode 100644
index 870927c37c..0000000000
--- a/ext/openssl/ossl_cipher.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * $Id: ossl_cipher.h,v 1.2 2003/09/05 09:08:40 gotoyuzo Exp $
- * '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 64998bb86a..0000000000
--- a/ext/openssl/ossl_config.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * $Id: ossl_config.c,v 1.8.2.3 2004/12/15 01:54:39 matz Exp $
- * '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;
-
-    str = rb_funcall(self, rb_intern("to_s"), 0);
-    GetConfig(other, conf);
-    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;
-
-    rb_scan_args(argc, argv, "01", &path);
-    if(!NIL_P(path)){
-	SafeStringValue(path);
-        filename = StringValuePtr(path);
-	GetConfig(self, conf);
-	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 {
-	GetConfig(self, conf);
-	_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;
-
-    StringValue(section);
-    StringValue(name);
-    StringValue(value);
-    GetConfig(self, conf);
-    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;
-
-    StringValue(section);
-    StringValue(name);
-    GetConfig(self, conf);
-    str = NCONF_get_string(conf, RSTRING(section)->ptr, RSTRING(name)->ptr);
-    if(!str){
-	ERR_clear_error();
-	return Qnil;
-    }
-
-    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];
-
-    arg[0] = self;
-    arg[1] = 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;
-
-    hash = rb_hash_new();
-    StringValue(section);
-    GetConfig(self, conf);
-    if (!(sk = NCONF_get_section(conf, StringValuePtr(section)))) {
-	ERR_clear_error();
-	return hash;
-    }
-    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;
-}
-
-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);
-}
-
-static void
-each_conf_value(CONF_VALUE *cv, void* dummy)
-{
-    STACK_OF(CONF_VALUE) *sk;
-    CONF_VALUE *v;
-    VALUE section, name, value, args;
-    int i, num;
-
-    if (cv->name) return;
-    sk = (STACK_OF(CONF_VALUE)*)cv->value;
-    num = sk_CONF_VALUE_num(sk);
-    section = rb_str_new2(cv->section);
-    for(i = 0; i < num; i++){
-	v = sk_CONF_VALUE_value(sk, i);
-	name = v->name ? rb_str_new2(v->name) : Qnil;
-	value = v->value ? rb_str_new2(v->value) : Qnil;
-        args = rb_ary_new3(3, section, name, value);
-	rb_yield(args);
-    }
-}
-
-static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE*, void*);
-
-static VALUE
-ossl_config_each(VALUE self)
-{
-    CONF *conf;
-
-    GetConfig(self, conf);
-    lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL);
-
-    return self;
-}
-#else
-static VALUE
-ossl_config_get_sections(VALUE self)
-{
-    rb_warn("#sections don't work with %s", OPENSSL_VERSION_TEXT);
-    return rb_ary_new();
-}
-
-static VALUE
-ossl_config_to_s(VALUE self)
-{
-    rb_warn("#to_s don't work with %s", OPENSSL_VERSION_TEXT);
-    return rb_str_new(0, 0);
-}
-
-static VALUE
-ossl_config_each(VALUE self)
-{
-    rb_warn("#each don't work with %s", OPENSSL_VERSION_TEXT);
-    return self;
-}
-#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_include_module(cConfig, rb_mEnumerable);
-    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, "each", ossl_config_each, 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 452d430b5e..0000000000
--- a/ext/openssl/ossl_config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * $Id: ossl_config.h,v 1.2 2003/09/08 10:31:38 gotoyuzo Exp $
- * '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 8b9c273f4d..0000000000
--- a/ext/openssl/ossl_digest.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * $Id: ossl_digest.c,v 1.4.2.2 2004/12/15 01:54:39 matz Exp $
- * '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_ex(ctx, md, NULL);
-   
-    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");
-    EVP_MD_CTX_init(ctx);
-    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;
-
-    rb_scan_args(argc, argv, "11", &type, &data);
-    StringValue(type);
-    if (!NIL_P(data)) StringValue(data);
-    name = StringValuePtr(type);
-    
-    md = EVP_get_digestbyname(name);
-    if (!md) {
-	ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
-    }
-    GetDigest(self, ctx);
-    EVP_DigestInit_ex(ctx, md, NULL);
-    
-    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_ex(ctx, EVP_MD_CTX_md(ctx), NULL);
-
-    return self;
-}
-
-VALUE
-ossl_digest_update(VALUE self, VALUE data)
-{
-    EVP_MD_CTX *ctx;
-
-    StringValue(data);
-    GetDigest(self, ctx);
-    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)))) {
-	EVP_MD_CTX_cleanup(&final);
-	ossl_raise(eDigestError, "Cannot allocate mem for digest");
-    }
-    EVP_DigestFinal_ex(&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;
-
-    if (rb_obj_is_kind_of(other, cDigest) == Qtrue) {
-	str2 = ossl_digest_digest(other);
-    } else {
-	StringValue(other);
-	str2 = other;
-    }
-    GetDigest(self, ctx);
-    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 b35bd217b3..0000000000
--- a/ext/openssl/ossl_digest.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * $Id: ossl_digest.h,v 1.2 2003/09/05 09:08:40 gotoyuzo Exp $
- * '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 6cc0183c0e..0000000000
--- a/ext/openssl/ossl_engine.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * $Id: ossl_engine.c,v 1.4.2.6 2005/09/18 22:56:11 gotoyuzo Exp $
- * '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();
-        return Qtrue;
-    }
-    StringValue(name);
-#ifndef OPENSSL_NO_STATIC_ENGINE
-    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);
-#endif
-#ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
-    OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
-#endif
-    OSSL_ENGINE_LOAD_IF_MATCH(openssl);
-    rb_warning("no such builtin loader for `%s'", RSTRING(name)->ptr);
-    return Qnil;
-#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);
-    WrapEngine(klass, obj, e);
-    if(rb_block_given_p()) rb_yield(obj);
-    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();
-
-    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, obj;
-    char *sid, *sdata;
-
-    rb_scan_args(argc, argv, "02", &id, &data);
-    sid = NIL_P(id) ? NULL : 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);
-    obj = ossl_pkey_new(pkey);
-    OSSL_PKEY_SET_PRIVATE(obj);
-
-    return obj;
-}
-
-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, "02", &id, &data);
-    sid = NIL_P(id) ? NULL : 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;
-    int f = NUM2INT(flag);
-
-    GetEngine(self, e);
-    ENGINE_set_default(e, f);
-
-    return Qtrue;
-}
-
-static VALUE
-ossl_engine_ctrl_cmd(int argc, VALUE *argv, VALUE self)
-{
-    ENGINE *e;
-    VALUE cmd, val;
-    int ret;
-
-    GetEngine(self, e);
-    rb_scan_args(argc, argv, "11", &cmd, &val);
-    StringValue(cmd);
-    if (!NIL_P(val)) StringValue(val);
-    ret = ENGINE_ctrl_cmd_string(e, RSTRING(cmd)->ptr,
-				 NIL_P(val) ? NULL : RSTRING(val)->ptr, 0);
-    if (!ret) ossl_raise(eEngineError, NULL);
-
-    return self;
-}
-
-static VALUE
-ossl_engine_cmd_flag_to_name(int flag)
-{
-    switch(flag){
-    case ENGINE_CMD_FLAG_NUMERIC:  return rb_str_new2("NUMERIC");
-    case ENGINE_CMD_FLAG_STRING:   return rb_str_new2("STRING");
-    case ENGINE_CMD_FLAG_NO_INPUT: return rb_str_new2("NO_INPUT");
-    case ENGINE_CMD_FLAG_INTERNAL: return rb_str_new2("INTERNAL");
-    default: return rb_str_new2("UNKNOWN");
-    }
-}
-
-static VALUE
-ossl_engine_get_cmds(VALUE self)
-{
-    ENGINE *e;
-    const ENGINE_CMD_DEFN *defn, *p;
-    VALUE ary, tmp;
-
-    GetEngine(self, e);
-    ary = rb_ary_new();
-    if ((defn = ENGINE_get_cmd_defns(e)) != NULL){
-	for (p = defn; p->cmd_num > 0; p++){
-	    tmp = rb_ary_new();
-	    rb_ary_push(tmp, rb_str_new2(p->cmd_name));
-	    rb_ary_push(tmp, rb_str_new2(p->cmd_desc));
-	    rb_ary_push(tmp, ossl_engine_cmd_flag_to_name(p->cmd_flags));
-	    rb_ary_push(ary, tmp);
-	}
-    }
-
-    return ary;
-}
-
-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, "ctrl_cmd", ossl_engine_ctrl_cmd, -1);
-    rb_define_method(cEngine, "cmds", ossl_engine_get_cmds, 0);
-    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 ccc426481a..0000000000
--- a/ext/openssl/ossl_engine.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * $Id: ossl_engine.h,v 1.1 2003/10/02 08:47:11 gotoyuzo Exp $
- * '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 cd66ab6e2c..0000000000
--- a/ext/openssl/ossl_hmac.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * $Id: ossl_hmac.c,v 1.4.2.2 2004/12/15 01:54:39 matz Exp $
- * '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);
-    HMAC_CTX_init(ctx);
-	
-    return obj;
-}
-
-static VALUE
-ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
-{
-    HMAC_CTX *ctx;
-
-    StringValue(key);
-    GetHMAC(self, ctx);
-    HMAC_Init_ex(ctx, RSTRING(key)->ptr, RSTRING(key)->len,
-		 GetDigestPtr(digest), NULL);
-
-    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;
-
-    StringValue(data);
-    GetHMAC(self, ctx);
-    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)))) {
-	HMAC_CTX_cleanup(&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 2c8d69c177..0000000000
--- a/ext/openssl/ossl_hmac.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * $Id: ossl_hmac.h,v 1.1 2003/07/23 16:11:29 gotoyuzo Exp $
- * '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 bd8c59faf9..0000000000
--- a/ext/openssl/ossl_ns_spki.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * $Id: ossl_ns_spki.c,v 1.3.2.5 2006/03/17 10:10:53 gotoyuzo Exp $
- * '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;
-    unsigned char *p;
-	
-    if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
-	return self;
-    }
-    StringValue(buffer);
-    if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING(buffer)->ptr, -1))) {
-	p = RSTRING(buffer)->ptr;
-	if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING(buffer)->len))) {
-	    ossl_raise(eSPKIError, NULL);
-	}
-    }
-    NETSCAPE_SPKI_free(DATA_PTR(self));
-    DATA_PTR(self) = spki;
-
-    return self;
-}
-
-static VALUE
-ossl_spki_to_der(VALUE self)
-{
-    NETSCAPE_SPKI *spki;
-    VALUE str;
-    long len;
-    unsigned char *p;
-
-    GetSPKI(self, spki);
-    if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0)
-        ossl_raise(eX509CertError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
-        ossl_raise(eX509CertError, NULL);
-    ossl_str_adjust(str, p);
-    
-    return str;
-}
-
-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_new(0, 0);
-    }
-
-    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;
-
-    StringValue(str);
-    GetSPKI(self, spki);
-    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;
-
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
-    GetSPKI(self, spki);
-    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_der", ossl_spki_to_der, 0);
-    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 2ca1fdcd62..0000000000
--- a/ext/openssl/ossl_ns_spki.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * $Id: ossl_ns_spki.h,v 1.1 2003/07/23 16:11:29 gotoyuzo Exp $
- * '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 f2097b967e..0000000000
--- a/ext/openssl/ossl_ocsp.c
+++ /dev/null
@@ -1,769 +0,0 @@
-/*
- * $Id: ossl_ocsp.c,v 1.4.2.2 2005/01/22 20:28:02 gotoyuzo Exp $
- * '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);
-    if(NIL_P(val)) {
-	GetOCSPReq(self, req);
-	ret = OCSP_request_add1_nonce(req, NULL, -1);
-    }
-    else{
-	StringValue(val);
-	GetOCSPReq(self, req);
-	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);
-    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);
-    GetOCSPReq(self, req);
-    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);
-    x509st = GetX509StorePtr(store);
-    flg = NIL_P(flags) ? 0 : INT2NUM(flags);
-    x509s = ossl_x509_ary2sk(certs);
-    GetOCSPReq(self, req);
-    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;
-    int st = NUM2INT(status);
-
-    if(NIL_P(basic_resp)) bs = NULL;
-    else GetOCSPBasicRes(basic_resp, bs); /* NO NEED TO DUP */
-    if(!(res = OCSP_response_create(st, 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;
-
-    rb_scan_args(argc, argv, "01", &val);
-    if(NIL_P(val)) {
-	GetOCSPBasicRes(self, bs);
-	ret = OCSP_basic_add1_nonce(bs, NULL, -1);
-    }
-    else{
-	StringValue(val);
-	GetOCSPBasicRes(self, bs);
-	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;
-
-    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));
-
-    GetOCSPBasicRes(self, bs);
-    SafeGetOCSPCertId(cid, id);
-    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);
-    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);
-    }
-    GetOCSPBasicRes(self, bs);
-    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);
-    x509st = GetX509StorePtr(store);
-    flg = NIL_P(flags) ? 0 : INT2NUM(flags);
-    x509s = ossl_x509_ary2sk(certs);
-    GetOCSPBasicRes(self, bs);
-    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;
-
-    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);
-    GetOCSPCertId(self, id);
-    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 244fbb2a74..0000000000
--- a/ext/openssl/ossl_ocsp.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * $Id: ossl_ocsp.h,v 1.1 2003/07/23 16:11:29 gotoyuzo Exp $
- * '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_pkcs12.c b/ext/openssl/ossl_pkcs12.c
deleted file mode 100644
index e4b334c67e..0000000000
--- a/ext/openssl/ossl_pkcs12.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- * $Id: ossl_pkcs12.c,v 1.2 2003/12/15 00:30:12 usa Exp $
- */
-#include "ossl.h"
-
-#define WrapPKCS12(klass, obj, p12) do { \
-    if(!p12) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
-    obj = Data_Wrap_Struct(klass, 0, PKCS12_free, p12); \
-} while (0)
-
-#define GetPKCS12(obj, p12) do { \
-    Data_Get_Struct(obj, PKCS12, p12); \
-    if(!p12) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
-} while (0)
-
-#define SafeGetPKCS12(obj, p12) do { \
-    OSSL_Check_Kind(obj, cPKCS12); \
-    GetPKCS12(obj, p12); \
-} while (0)
-
-#define ossl_pkcs12_set_key(o,v)      rb_iv_set((o), "@key", (v))
-#define ossl_pkcs12_set_cert(o,v)     rb_iv_set((o), "@certificate", (v))
-#define ossl_pkcs12_set_ca_certs(o,v) rb_iv_set((o), "@ca_certs", (v))
-#define ossl_pkcs12_get_key(o)        rb_iv_get((o), "@key")
-#define ossl_pkcs12_get_cert(o)       rb_iv_get((o), "@certificate")
-#define ossl_pkcs12_get_ca_certs(o)   rb_iv_get((o), "@ca_certs")
-
-/*
- * Classes
- */
-VALUE mPKCS12;
-VALUE cPKCS12;
-VALUE ePKCS12Error;
-
-/*
- * Private
- */
-static VALUE
-ossl_pkcs12_s_allocate(VALUE klass)
-{
-    PKCS12 *p12;
-    VALUE obj;
-
-    if(!(p12 = PKCS12_new())) ossl_raise(ePKCS12Error, NULL);
-    WrapPKCS12(klass, obj, p12);
-
-    return obj;
-}
-
-static VALUE
-ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
-{
-    VALUE pass, name, pkey, cert, ca;
-    VALUE obj;
-    char *passphrase, *friendlyname;
-    EVP_PKEY *key;
-    X509 *x509;
-    STACK_OF(X509) *x509s;
-    PKCS12 *p12;
-    
-    rb_scan_args(argc, argv, "41", &pass, &name, &pkey, &cert, &ca);
-    passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
-    friendlyname = NIL_P(name) ? NULL : StringValuePtr(name);
-    key = GetPKeyPtr(pkey);
-    x509 = GetX509CertPtr(cert);
-    x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
-    p12 = PKCS12_create(passphrase, friendlyname, key, x509, x509s,
-                        0, 0, 0, 0, 0);
-    sk_X509_pop_free(x509s, X509_free);
-    if(!p12) ossl_raise(ePKCS12Error, NULL);
-    WrapPKCS12(cPKCS12, obj, p12);
-
-    return obj;
-}
-
-static VALUE
-ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
-{
-    BIO *in;
-    VALUE arg, pass, pkey, cert, ca;
-    char *passphrase;
-    EVP_PKEY *key;
-    X509 *x509;
-    STACK_OF(X509) *x509s = NULL;
-    int st = 0;
-
-    if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
-    passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
-    in = ossl_obj2bio(arg);
-    d2i_PKCS12_bio(in, (PKCS12 **)&DATA_PTR(self));
-    BIO_free(in);
-
-    pkey = cert = ca = Qnil;
-    if(!PKCS12_parse((PKCS12*)DATA_PTR(self), passphrase, &key, &x509, &x509s))
-	ossl_raise(ePKCS12Error, NULL);
-    pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key,
-		      &st); /* NO DUP */
-    if(st) goto err;
-    cert = rb_protect((VALUE(*)_((VALUE)))ossl_x509_new, (VALUE)x509, &st);
-    if(st) goto err;
-    if(x509s){
-	ca =
-	    rb_protect((VALUE(*)_((VALUE)))ossl_x509_sk2ary, (VALUE)x509s, &st);
-	if(st) goto err;
-    }
-
-  err:
-    X509_free(x509);
-    sk_X509_pop_free(x509s, X509_free);
-    ossl_pkcs12_set_key(self, pkey);
-    ossl_pkcs12_set_cert(self, cert);
-    ossl_pkcs12_set_ca_certs(self, ca);
-    if(st) rb_jump_tag(st);
-
-    return self;
-}
-
-static VALUE
-ossl_pkcs12_to_der(VALUE self)
-{
-    PKCS12 *p12;
-    VALUE str;
-    long len;
-    unsigned char *p;
-
-    GetPKCS12(self, p12);
-    if((len = i2d_PKCS12(p12, NULL)) <= 0)
-	ossl_raise(ePKCS12Error, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_PKCS12(p12, &p) <= 0)
-	ossl_raise(ePKCS12Error, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-void
-Init_ossl_pkcs12()
-{
-    mPKCS12 = rb_define_module_under(mOSSL, "PKCS12");
-    cPKCS12 = rb_define_class_under(mPKCS12, "PKCS12", rb_cObject);
-    ePKCS12Error = rb_define_class_under(mPKCS12, "PKCS12Error", eOSSLError);
-    rb_define_module_function(mPKCS12, "create", ossl_pkcs12_s_create, -1);
-
-    rb_define_alloc_func(cPKCS12, ossl_pkcs12_s_allocate);
-    rb_attr(cPKCS12, rb_intern("key"), 1, 0, Qfalse);
-    rb_attr(cPKCS12, rb_intern("certificate"), 1, 0, Qfalse);
-    rb_attr(cPKCS12, rb_intern("ca_certs"), 1, 0, Qfalse);
-    rb_define_method(cPKCS12, "initialize", ossl_pkcs12_initialize, -1);
-    rb_define_method(cPKCS12, "to_der", ossl_pkcs12_to_der, 0);
-}
diff --git a/ext/openssl/ossl_pkcs12.h b/ext/openssl/ossl_pkcs12.h
deleted file mode 100644
index 95b29de9b5..0000000000
--- a/ext/openssl/ossl_pkcs12.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * This program is licenced under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- * $Id: ossl_pkcs12.h,v 1.1.2.1 2005/06/19 16:29:17 gotoyuzo Exp $
- */
-#if !defined(_OSSL_PKCS12_H_)
-#define _OSSL_PKCS12_H_
-
-extern VALUE mPKCS12;
-extern VALUE cPKCS12;
-extern VALUE ePKCS12Error;
-
-void Init_ossl_pkcs12(void);
-
-#endif /* _OSSL_PKCS12_H_ */
-
diff --git a/ext/openssl/ossl_pkcs5.h b/ext/openssl/ossl_pkcs5.h
deleted file mode 100644
index a3b132bc50..0000000000
--- a/ext/openssl/ossl_pkcs5.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if !defined(_OSSL_PKCS5_H_)
-#define _OSSL_PKCS5_H_
-
-void Init_ossl_pkcs5(void);
-
-#endif /* _OSSL_PKCS5_H_ */
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
deleted file mode 100644
index 0fa85299aa..0000000000
--- a/ext/openssl/ossl_pkcs7.c
+++ /dev/null
@@ -1,993 +0,0 @@
-/*
- * $Id: ossl_pkcs7.c,v 1.5.2.3 2005/09/10 01:11:15 gotoyuzo Exp $
- * '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 WrapPKCS7ri(klass, obj, p7ri) do { \
-    if (!p7ri) { \
-	ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
-    } \
-    obj = Data_Wrap_Struct(klass, 0, PKCS7_RECIP_INFO_free, p7ri); \
-} while (0)
-#define GetPKCS7ri(obj, p7ri) do { \
-    Data_Get_Struct(obj, PKCS7_RECIP_INFO, p7ri); \
-    if (!p7ri) { \
-	ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
-    } \
-} while (0)
-#define SafeGetPKCS7ri(obj, p7ri) do { \
-    OSSL_Check_Kind(obj, cPKCS7Recipient); \
-    GetPKCS7ri(obj, p7ri); \
-} 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 cPKCS7Recipient;
-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;
-}
-
-static VALUE
-ossl_pkcs7ri_new(PKCS7_RECIP_INFO *p7ri)
-{
-    PKCS7_RECIP_INFO *pkcs7;
-    VALUE obj;
-
-    pkcs7 = p7ri ? PKCS7_RECIP_INFO_dup(p7ri) : PKCS7_RECIP_INFO_new();
-    if (!pkcs7) ossl_raise(ePKCS7Error, NULL);
-    WrapPKCS7ri(cPKCS7Recipient, obj, pkcs7);
-
-    return obj;
-}
-
-static PKCS7_RECIP_INFO *
-DupPKCS7RecipientPtr(VALUE obj)
-{
-    PKCS7_RECIP_INFO *p7ri, *pkcs7;
-	
-    SafeGetPKCS7ri(obj, p7ri);
-    if (!(pkcs7 = PKCS7_RECIP_INFO_dup(p7ri))) {
-	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);
-    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    if(NIL_P(data)) data = ossl_pkcs7_get_data(pkcs7);
-    SafeGetPKCS7(pkcs7, p7);
-    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 specify 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;
-
-    p7si = DupPKCS7SignerPtr(signer); /* NEED TO DUP */
-    GetPKCS7(self, pkcs7);
-    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 recip)
-{
-    PKCS7 *pkcs7;
-    PKCS7_RECIP_INFO *ri;
-
-    ri = DupPKCS7RecipientPtr(recip); /* NEED TO DUP */
-    GetPKCS7(self, pkcs7);
-    if (!PKCS7_add_recipient_info(pkcs7, ri)) {
-	PKCS7_RECIP_INFO_free(ri);
-	ossl_raise(ePKCS7Error, "Could not add recipient.");
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_pkcs7_get_recipient(VALUE self)
-{
-    PKCS7 *pkcs7;
-    STACK_OF(PKCS7_RECIP_INFO) *sk;
-    PKCS7_RECIP_INFO *si;
-    int num, i;
-    VALUE ary;
-    
-    GetPKCS7(self, pkcs7);
-    if (PKCS7_type_is_enveloped(pkcs7))
-	sk = pkcs7->d.enveloped->recipientinfo;
-    else if (PKCS7_type_is_signedAndEnveloped(pkcs7))
-	sk = pkcs7->d.signed_and_enveloped->recipientinfo;
-    else sk = NULL;
-    if (!sk) return rb_ary_new();
-    if ((num = sk_PKCS7_RECIP_INFO_num(sk)) < 0) {
-	ossl_raise(ePKCS7Error, "Negative number of recipient!");
-    }
-    ary = rb_ary_new2(num);
-    for (i=0; i<num; i++) {
-	si = sk_PKCS7_RECIP_INFO_value(sk, i);
-	rb_ary_push(ary, ossl_pkcs7ri_new(si));
-    }
-
-    return ary;
-}
-
-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 STACK *
-pkcs7_get_certs_or_crls(VALUE self, int want_certs)
-{
-    PKCS7 *pkcs7;
-    STACK_OF(X509) *certs;
-    STACK_OF(X509_CRL) *crls;
-    int i;
-
-    GetPKCS7(self, pkcs7);
-    i = OBJ_obj2nid(pkcs7->type);
-    switch(i){
-    case NID_pkcs7_signed:
-        certs = pkcs7->d.sign->cert;
-        crls = pkcs7->d.sign->crl;
-        break;
-    case NID_pkcs7_signedAndEnveloped:
-        certs = pkcs7->d.signed_and_enveloped->cert;
-        crls = pkcs7->d.signed_and_enveloped->crl;
-        break;
-    default:
-        certs = crls = NULL;
-    }
-
-    return want_certs ? certs : crls;
-}
-
-static VALUE
-ossl_pkcs7_set_certs_i(VALUE i, VALUE arg)
-{
-    return ossl_pkcs7_add_certificate(arg, i);
-}
-
-static VALUE
-ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
-{
-    STACK_OF(X509) *certs;
-    X509 *cert;
-
-    certs = pkcs7_get_certs_or_crls(self, 1);
-    while((cert = sk_X509_pop(certs))) X509_free(cert);
-    rb_iterate(rb_each, ary, ossl_pkcs7_set_certs_i, self);
-
-    return ary;
-}
-
-static VALUE
-ossl_pkcs7_get_certificates(VALUE self)
-{
-    return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1));
-}
-
-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_set_crls_i(VALUE i, VALUE arg)
-{
-    return ossl_pkcs7_add_crl(arg, i);
-}
-
-static VALUE
-ossl_pkcs7_set_crls(VALUE self, VALUE ary)
-{
-    STACK_OF(X509_CRL) *crls;
-    X509_CRL *crl;
-
-    crls = pkcs7_get_certs_or_crls(self, 0);
-    while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
-    rb_iterate(rb_each, ary, ossl_pkcs7_set_crls_i, self);
-
-    return ary;
-}
-
-static VALUE
-ossl_pkcs7_get_crls(VALUE self)
-{
-    return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0));
-}
-
-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;
-
-    rb_scan_args(argc, argv, "22", &certs, &store, &indata, &flags);
-    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);
-	}
-    }
-    x509st = GetX509StorePtr(store);
-    GetPKCS7(self, p7);
-    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);
-    key = GetPrivPKeyPtr(pkey); /* NO NEED TO DUP */
-    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
-    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    GetPKCS7(self, p7);
-    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 = ossl_obj2bio(data);
-    GetPKCS7(self, pkcs7);
-    if(PKCS7_type_is_signed(pkcs7)){
-	if(!PKCS7_content_new(pkcs7, NID_pkcs7_data))
-	    ossl_raise(ePKCS7Error, NULL);
-    }
-    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;
-
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
-    GetPKCS7si(self, p7si);
-    if (!(PKCS7_SIGNER_INFO_set(p7si, x509, pkey, (EVP_MD*)md))) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_pkcs7si_get_issuer(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;
-}
-
-/*
- * RECIPIENT INFO
- */
-static VALUE
-ossl_pkcs7ri_alloc(VALUE klass)
-{
-    PKCS7_RECIP_INFO *p7ri;
-    VALUE obj;
-
-    if (!(p7ri = PKCS7_RECIP_INFO_new())) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-    WrapPKCS7ri(klass, obj, p7ri);
-
-    return obj;
-}
-
-static VALUE
-ossl_pkcs7ri_initialize(VALUE self, VALUE cert)
-{
-    PKCS7_RECIP_INFO *p7ri;
-    X509 *x509;
-
-    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
-    GetPKCS7ri(self, p7ri);
-    if (!PKCS7_RECIP_INFO_set(p7ri, x509)) {
-	ossl_raise(ePKCS7Error, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_pkcs7ri_get_issuer(VALUE self)
-{
-    PKCS7_RECIP_INFO *p7ri;
-
-    GetPKCS7ri(self, p7ri);
-
-    return ossl_x509name_new(p7ri->issuer_and_serial->issuer);
-}
-
-static VALUE
-ossl_pkcs7ri_get_serial(VALUE self)
-{
-    PKCS7_RECIP_INFO *p7ri;
-
-    GetPKCS7ri(self, p7ri);
-
-    return asn1integer_to_num(p7ri->issuer_and_serial->serial);
-}
-
-static VALUE
-ossl_pkcs7ri_get_enc_key(VALUE self)
-{
-    PKCS7_RECIP_INFO *p7ri;
-
-    GetPKCS7ri(self, p7ri);
-
-    return asn1str_to_str(p7ri->enc_key);
-}
-
-/*
- * 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, "recipients", ossl_pkcs7_get_recipient, 0);
-    rb_define_method(cPKCS7, "add_certificate", ossl_pkcs7_add_certificate, 1);
-    rb_define_method(cPKCS7, "certificates=", ossl_pkcs7_set_certificates, 1);
-    rb_define_method(cPKCS7, "certificates", ossl_pkcs7_get_certificates, 0);
-    rb_define_method(cPKCS7, "add_crl", ossl_pkcs7_add_crl, 1);
-    rb_define_method(cPKCS7, "crls=", ossl_pkcs7_set_crls, 1);
-    rb_define_method(cPKCS7, "crls", ossl_pkcs7_get_crls, 0);
-    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, "SignerInfo", rb_cObject);
-    rb_define_const(mPKCS7, "Signer", cPKCS7Signer);
-    rb_define_alloc_func(cPKCS7Signer, ossl_pkcs7si_alloc);
-    rb_define_method(cPKCS7Signer, "initialize", ossl_pkcs7si_initialize,3);
-    rb_define_method(cPKCS7Signer, "issuer", ossl_pkcs7si_get_issuer, 0);
-    rb_define_alias(cPKCS7Signer, "name", "issuer");
-    rb_define_method(cPKCS7Signer, "serial", ossl_pkcs7si_get_serial,0);
-    rb_define_method(cPKCS7Signer,"signed_time",ossl_pkcs7si_get_signed_time,0);
-
-    cPKCS7Recipient = rb_define_class_under(mPKCS7,"RecipientInfo",rb_cObject);
-    rb_define_alloc_func(cPKCS7Recipient, ossl_pkcs7ri_alloc);
-    rb_define_method(cPKCS7Recipient, "initialize", ossl_pkcs7ri_initialize,1); 
-    rb_define_method(cPKCS7Recipient, "issuer", ossl_pkcs7ri_get_issuer,0);
-    rb_define_method(cPKCS7Recipient, "serial", ossl_pkcs7ri_get_serial,0);
-    rb_define_method(cPKCS7Recipient, "enc_key", ossl_pkcs7ri_get_enc_key,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 fdf0d9fb34..0000000000
--- a/ext/openssl/ossl_pkcs7.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * $Id: ossl_pkcs7.h,v 1.1.2.1 2005/09/10 01:17:00 gotoyuzo Exp $
- * '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 cPKCS7Signer;
-extern VALUE cPKCS7Recipient;
-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 5a061597f6..0000000000
--- a/ext/openssl/ossl_pkey.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * $Id: ossl_pkey.c,v 1.4.2.2 2005/04/08 09:26:54 gotoyuzo Exp $
- * '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;
-	
-    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
-	ossl_raise(rb_eArgError, "Private key is needed.");
-    }
-    SafeGetPKey(obj, pkey);
-
-    return pkey;
-}
-
-EVP_PKEY *
-DupPKeyPtr(VALUE obj)
-{
-    EVP_PKEY *pkey;
-
-    SafeGetPKey(obj, pkey);
-    CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
-
-    return pkey;
-}
-
-EVP_PKEY *
-DupPrivPKeyPtr(VALUE obj)
-{
-    EVP_PKEY *pkey;
-	
-    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
-	ossl_raise(rb_eArgError, "Private key is needed.");
-    }
-    SafeGetPKey(obj, pkey);
-    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_sign(VALUE self, VALUE digest, VALUE data)
-{
-    EVP_PKEY *pkey;
-    EVP_MD_CTX ctx;
-    int buf_len;
-    VALUE str;
-
-    if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) {
-	ossl_raise(rb_eArgError, "Private key is needed.");
-    }
-    GetPKey(self, pkey);
-    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, "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 224f0f4634..0000000000
--- a/ext/openssl/ossl_pkey.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * $Id: ossl_pkey.h,v 1.2.2.2 2005/09/18 22:56:11 gotoyuzo Exp $
- * '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 OSSL_PKEY_SET_PRIVATE(obj) rb_iv_set((obj), "private", Qtrue)
-#define OSSL_PKEY_SET_PUBLIC(obj)  rb_iv_set((obj), "private", Qfalse)
-#define OSSL_PKEY_IS_PRIVATE(obj)  (rb_iv_get((obj), "private") == Qtrue)
-
-#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); \
-    OSSL_PKEY_SET_PUBLIC(obj); \
-} 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;
-extern DH *OSSL_DEFAULT_DH_512;
-extern DH *OSSL_DEFAULT_DH_1024;
-
-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 79692f2f47..0000000000
--- a/ext/openssl/ossl_pkey_dh.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * $Id: ossl_pkey_dh.c,v 1.4.2.3 2005/04/08 09:26:54 gotoyuzo Exp $
- * '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);
-    if(rb_scan_args(argc, argv, "02", &arg, &gen) == 0) {
-      dh = DH_new();
-    }
-    else 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(eDHError, 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;
-}
-
-static VALUE
-ossl_dh_to_der(VALUE self)
-{       
-    EVP_PKEY *pkey;
-    unsigned char *p;
-    long len;
-    VALUE str;
-
-    GetPKeyDH(self, pkey);
-    if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0)
-	ossl_raise(eDHError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_DHparams(pkey->pkey.dh, &p) < 0)
-	ossl_raise(eDHError, NULL);
-    ossl_str_adjust(str, p);
-
-    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;
-}
-
-OSSL_PKEY_BN(dh, p);
-OSSL_PKEY_BN(dh, g);
-OSSL_PKEY_BN(dh, pub_key);
-OSSL_PKEY_BN(dh, priv_key);
-
-/*
- * -----BEGIN DH PARAMETERS-----
- * MEYCQQD0zXHljRg/mJ9PYLACLv58Cd8VxBxxY7oEuCeURMiTqEhMym16rhhKgZG2
- * zk2O9uUIBIxSj+NKMURHGaFKyIvLAgEC
- * -----END DH PARAMETERS-----
- */
-static unsigned char DEFAULT_DH_512_PRIM[] = {
-    0xf4, 0xcd, 0x71, 0xe5, 0x8d, 0x18, 0x3f, 0x98,
-    0x9f, 0x4f, 0x60, 0xb0, 0x02, 0x2e, 0xfe, 0x7c,
-    0x09, 0xdf, 0x15, 0xc4, 0x1c, 0x71, 0x63, 0xba,
-    0x04, 0xb8, 0x27, 0x94, 0x44, 0xc8, 0x93, 0xa8,
-    0x48, 0x4c, 0xca, 0x6d, 0x7a, 0xae, 0x18, 0x4a,
-    0x81, 0x91, 0xb6, 0xce, 0x4d, 0x8e, 0xf6, 0xe5,
-    0x08, 0x04, 0x8c, 0x52, 0x8f, 0xe3, 0x4a, 0x31,
-    0x44, 0x47, 0x19, 0xa1, 0x4a, 0xc8, 0x8b, 0xcb,
-};
-static unsigned char DEFAULT_DH_512_GEN[] = { 0x02 }; 
-DH *OSSL_DEFAULT_DH_512 = NULL;
-
-/* 
- * -----BEGIN DH PARAMETERS-----
- * MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
- * AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
- * T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC
- * -----END DH PARAMETERS-----
- */
-static unsigned char DEFAULT_DH_1024_PRIM[] = {
-    0x9d, 0x25, 0x39, 0x5c, 0xb4, 0x54, 0x8a, 0xff,
-    0x25, 0xe6, 0xd6, 0x9f, 0x4c, 0xc3, 0xc1, 0x8d,
-    0xa1, 0xfa, 0xba, 0x88, 0x4c, 0x53, 0xa9, 0x74,
-    0xda, 0xfa, 0xba, 0x0b, 0x20, 0xbe, 0x40, 0xd7,
-    0xba, 0xe7, 0x1d, 0x70, 0x28, 0x61, 0x60, 0x4c,
-    0x49, 0x01, 0x5f, 0xd9, 0x0f, 0x60, 0x16, 0x3d,
-    0xba, 0xd3, 0xa9, 0x5e, 0xfa, 0x98, 0x64, 0x60,
-    0x26, 0x0e, 0x04, 0x75, 0xd8, 0x13, 0xd7, 0x31,
-    0xb4, 0x8e, 0xad, 0xeb, 0x9c, 0x57, 0x4c, 0x8f,
-    0x65, 0xf3, 0x90, 0x16, 0x31, 0xdc, 0x15, 0x6f,
-    0x7d, 0x1d, 0x00, 0xae, 0x76, 0xf2, 0xd1, 0x11,
-    0xd1, 0x4f, 0x88, 0x7b, 0x29, 0x9f, 0xf6, 0xce,
-    0x68, 0xef, 0x57, 0xe7, 0x85, 0xf2, 0x40, 0x54,
-    0x1c, 0x12, 0x40, 0xa2, 0x35, 0x25, 0xcf, 0x12,
-    0xa3, 0xe1, 0x07, 0x8e, 0xdb, 0x1d, 0xb4, 0x14,
-    0xff, 0x57, 0xe7, 0x19, 0x8d, 0x51, 0x77, 0x83
-};
-static unsigned char DEFAULT_DH_1024_GEN[] = { 0x02 };
-DH *OSSL_DEFAULT_DH_1024 = NULL;
-
-static DH*
-ossl_create_dh(unsigned char *p, size_t plen, unsigned char *g, size_t glen)
-{
-    DH *dh;
-
-    if ((dh = DH_new()) == NULL) ossl_raise(eDHError, NULL);
-    dh->p = BN_bin2bn(p, plen, NULL);
-    dh->g = BN_bin2bn(g, glen, NULL);
-    if (dh->p == NULL || dh->g == NULL){
-        DH_free(dh);
-        ossl_raise(eDHError, NULL);
-    }
-
-    return dh;
-}
-
-/*
- * 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, "to_der", ossl_dh_to_der, 0);
-    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);
-    DEF_OSSL_PKEY_BN(cDH, dh, p);
-    DEF_OSSL_PKEY_BN(cDH, dh, g);
-    DEF_OSSL_PKEY_BN(cDH, dh, pub_key);
-    DEF_OSSL_PKEY_BN(cDH, dh, priv_key);
-    rb_define_method(cDH, "params", ossl_dh_get_params, 0);
-
-    OSSL_DEFAULT_DH_512 = ossl_create_dh(
-	DEFAULT_DH_512_PRIM, sizeof(DEFAULT_DH_512_PRIM),
-	DEFAULT_DH_512_GEN, sizeof(DEFAULT_DH_512_GEN));
-    OSSL_DEFAULT_DH_1024 = ossl_create_dh(
-	DEFAULT_DH_1024_PRIM, sizeof(DEFAULT_DH_1024_PRIM),
-	DEFAULT_DH_1024_GEN, sizeof(DEFAULT_DH_1024_GEN));
-}
-
-#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 2a6060fe77..0000000000
--- a/ext/openssl/ossl_pkey_dsa.c
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * $Id: ossl_pkey_dsa.c,v 1.5.2.3 2005/09/18 22:56:11 gotoyuzo Exp $
- * '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)
-#define DSA_PRIVATE(obj,dsa) (DSA_HAS_PRIVATE(dsa)||OSSL_PKEY_IS_PRIVATE(obj))
-
-/*
- * 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);
-    if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
-        dsa = DSA_new();
-    }
-    else 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(self, 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;
-}
-
-static VALUE
-ossl_dsa_to_der(VALUE self)
-{
-    EVP_PKEY *pkey;
-    int (*i2d_func)_((DSA*, unsigned char**));
-    unsigned char *p;
-    long len;
-    VALUE str;
-
-    GetPKeyDSA(self, pkey);
-    if(DSA_HAS_PRIVATE(pkey->pkey.dsa))
-	i2d_func = (int(*)_((DSA*,unsigned char**)))i2d_DSAPrivateKey;
-    else
-	i2d_func = i2d_DSA_PUBKEY;
-    if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0)
-	ossl_raise(eDSAError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_func(pkey->pkey.dsa, &p) < 0)
-	ossl_raise(eDSAError, NULL);
-    ossl_str_adjust(str, p);
-
-    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(self, 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;
-}
-
-OSSL_PKEY_BN(dsa, p);
-OSSL_PKEY_BN(dsa, q);
-OSSL_PKEY_BN(dsa, g);
-OSSL_PKEY_BN(dsa, pub_key);
-OSSL_PKEY_BN(dsa, priv_key);
-
-/*
- * 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, "to_der", ossl_dsa_to_der, 0);
-    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);
-
-    DEF_OSSL_PKEY_BN(cDSA, dsa, p);
-    DEF_OSSL_PKEY_BN(cDSA, dsa, q);
-    DEF_OSSL_PKEY_BN(cDSA, dsa, g);
-    DEF_OSSL_PKEY_BN(cDSA, dsa, pub_key);
-    DEF_OSSL_PKEY_BN(cDSA, dsa, priv_key);
-
-    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 69d69c76f4..0000000000
--- a/ext/openssl/ossl_pkey_rsa.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * $Id: ossl_pkey_rsa.c,v 1.5.2.4 2005/09/18 22:56:11 gotoyuzo Exp $
- * '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)
-#define RSA_PRIVATE(obj,rsa) (RSA_HAS_PRIVATE(rsa)||OSSL_PKEY_IS_PRIVATE(obj))
-
-/*
- * 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);
-    if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
-	rsa = RSA_new();
-    }
-    else 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(self, 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;
-}
-
-static VALUE
-ossl_rsa_to_der(VALUE self)
-{
-    EVP_PKEY *pkey;
-    int (*i2d_func)_((const RSA*, unsigned char**));
-    unsigned char *p;
-    long len;
-    VALUE str;
-
-    GetPKeyRSA(self, pkey);
-    if(RSA_HAS_PRIVATE(pkey->pkey.rsa))
-	i2d_func = i2d_RSAPrivateKey;
-    else
-	i2d_func = i2d_RSAPublicKey;
-    if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0)
-	ossl_raise(eRSAError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if(i2d_func(pkey->pkey.rsa, &p) < 0)
-	ossl_raise(eRSAError, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-#define ossl_rsa_buf_size(pkey) (RSA_size((pkey)->pkey.rsa)+16)
-
-static VALUE
-ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
-{
-    EVP_PKEY *pkey;
-    int buf_len, pad;
-    VALUE str, buffer, padding;
-
-    GetPKeyRSA(self, pkey);
-    rb_scan_args(argc, argv, "11", &buffer, &padding);
-    pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
-    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,
-				 pad);
-    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(int argc, VALUE *argv, VALUE self)
-{
-    EVP_PKEY *pkey;
-    int buf_len, pad;
-    VALUE str, buffer, padding;
-
-    GetPKeyRSA(self, pkey);
-    rb_scan_args(argc, argv, "11", &buffer, &padding);
-    pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
-    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,
-				 pad);
-    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(int argc, VALUE *argv, VALUE self)
-{
-    EVP_PKEY *pkey;
-    int buf_len, pad;
-    VALUE str, buffer, padding;
-
-    GetPKeyRSA(self, pkey);
-    if (!RSA_PRIVATE(self, pkey->pkey.rsa)) {
-	ossl_raise(eRSAError, "private key needed.");
-    }	
-    rb_scan_args(argc, argv, "11", &buffer, &padding);
-    pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
-    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,
-				  pad);
-    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(int argc, VALUE *argv, VALUE self)
-{
-    EVP_PKEY *pkey;
-    int buf_len, pad;
-    VALUE str, buffer, padding;
-
-    GetPKeyRSA(self, pkey);
-    if (!RSA_PRIVATE(self, pkey->pkey.rsa)) {
-	ossl_raise(eRSAError, "private key needed.");
-    }
-    rb_scan_args(argc, argv, "11", &buffer, &padding);
-    pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
-    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,
-				  pad);
-    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
- */
-#define DefRSAConst(x) rb_define_const(cRSA, #x,INT2FIX(RSA_##x))
-
-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, "to_der", ossl_rsa_to_der, 0);
-    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);
-
-    DefRSAConst(PKCS1_PADDING);
-    DefRSAConst(SSLV23_PADDING);
-    DefRSAConst(NO_PADDING);
-    DefRSAConst(PKCS1_OAEP_PADDING);
-
-/*
- * 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 ffd68966ca..0000000000
--- a/ext/openssl/ossl_rand.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * $Id: ossl_rand.c,v 1.2 2003/09/17 09:05:02 gotoyuzo Exp $
- * '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 4895267fb6..0000000000
--- a/ext/openssl/ossl_rand.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * $Id: ossl_rand.h,v 1.1 2003/07/23 16:11:29 gotoyuzo Exp $
- * '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 e4889d6d3f..0000000000
--- a/ext/openssl/ossl_ssl.c
+++ /dev/null
@@ -1,937 +0,0 @@
-/*
- * $Id: ossl_ssl.c,v 1.13.2.11 2006/03/17 10:10:53 gotoyuzo Exp $
- * '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_set_client_cert_cb(o,v) rb_iv_set((o),"@client_cert_cb",(v))
-#define ossl_sslctx_set_tmp_dh_cb(o,v)   rb_iv_set((o),"@tmp_dh_callback",(v))
-#define ossl_sslctx_set_sess_id_ctx(o, v) rb_iv_get((o),"@session_id_context"(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")
-#define ossl_sslctx_get_client_cert_cb(o) rb_iv_get((o),"@client_cert_cb")
-#define ossl_sslctx_get_tmp_dh_cb(o)     rb_iv_get((o),"@tmp_dh_callback")
-#define ossl_sslctx_get_sess_id_ctx(o)   rb_iv_get((o),"@session_id_context")
-
-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",
-    "client_cert_cb", "tmp_dh_callback", "session_id_context",
-};
-
-#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_get_x509(o)         rb_iv_get((o),"@x509")
-#define ossl_ssl_get_key(o)          rb_iv_get((o),"@key")
-#define ossl_ssl_get_tmp_dh(o)       rb_iv_get((o),"@tmp_dh")
-
-#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))
-#define ossl_ssl_set_x509(o,v)       rb_iv_set((o),"@x509",(v))
-#define ossl_ssl_set_key(o,v)        rb_iv_set((o),"@key",(v))
-#define ossl_ssl_set_tmp_dh(o,v)     rb_iv_set((o),"@tmp_dh",(v))
-
-static char *ossl_ssl_attr_readers[] = { "io", "context", };
-static char *ossl_ssl_attrs[] = { "sync_close", };
-
-/*
- * SSLContext class
- */
-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;
-int ossl_ssl_ex_ptr_idx;
-int ossl_ssl_ex_client_cert_cb_idx;
-int ossl_ssl_ex_tmp_dh_callback_idx;
-
-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;
-
-    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);
-    }
-    Data_Get_Struct(self, SSL_CTX, ctx);
-    if (SSL_CTX_set_ssl_version(ctx, method) != 1) {
-        ossl_raise(eSSLError, "SSL_CTX_set_ssl_version:");
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_call_client_cert_cb(VALUE obj)
-{
-    VALUE cb, ary, cert, key;
-    SSL *ssl;
-
-    Data_Get_Struct(obj, SSL, ssl);
-    cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_client_cert_cb_idx);
-    if (NIL_P(cb)) return Qfalse;
-    ary = rb_funcall(cb, rb_intern("call"), 1, obj);
-    Check_Type(ary, T_ARRAY);
-    GetX509CertPtr(cert = rb_ary_entry(ary, 0));
-    GetPKeyPtr(key = rb_ary_entry(ary, 1));
-    ossl_ssl_set_x509(obj, cert);
-    ossl_ssl_set_key(obj, key);
-
-    return Qtrue;
-}
-
-static int
-ossl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
-{
-    VALUE obj;
-    int status, success;
-
-    obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-    success = rb_protect((VALUE(*)_((VALUE)))ossl_call_client_cert_cb,
-                         obj, &status);
-    if (status || !success) return 0;
-    *x509 = DupX509CertPtr(ossl_ssl_get_x509(obj));
-    *pkey = DupPKeyPtr(ossl_ssl_get_key(obj));
-
-    return 1;
-}
-
-#if !defined(OPENSSL_NO_DH)
-static VALUE
-ossl_call_tmp_dh_callback(VALUE *args)
-{
-    SSL *ssl;
-    VALUE cb, dh;
-    EVP_PKEY *pkey;
-
-    Data_Get_Struct(args[0], SSL, ssl);
-    cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx);
-    if (NIL_P(cb)) return Qfalse;
-    dh = rb_funcall(cb, rb_intern("call"), 3, args[0], args[1], args[2]);
-    pkey = GetPKeyPtr(dh);
-    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) return Qfalse;
-    ossl_ssl_set_tmp_dh(args[0], dh);
-
-    return Qtrue;
-}
-
-static DH*
-ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
-{
-    VALUE args[3];
-    int status, success;
-
-    args[0] = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-    args[1] = INT2FIX(is_export);
-    args[2] = INT2FIX(keylength);
-    success = rb_protect((VALUE(*)_((VALUE)))ossl_call_tmp_dh_callback,
-                         (VALUE)args, &status);
-    if (status || !success) return NULL;
-
-    return GetPKeyPtr(ossl_ssl_get_tmp_dh(args[0]))->pkey.dh;
-}
-
-static DH*
-ossl_default_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
-{
-    switch(keylength){
-    case 512:
-	return OSSL_DEFAULT_DH_512;
-    case 1024:
-	return OSSL_DEFAULT_DH_1024;
-    }
-    return NULL;
-}
-#endif /* OPENSSL_NO_DH */
-
-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);
-
-#if !defined(OPENSSL_NO_DH)
-    if (RTEST(ossl_sslctx_get_tmp_dh_cb(self))){
-	SSL_CTX_set_tmp_dh_callback(ctx, ossl_tmp_dh_callback);
-    }
-    else{
-	rb_warning("using default DH parameters.");
-	SSL_CTX_set_tmp_dh_callback(ctx, ossl_default_tmp_dh_callback);
-    }
-#endif
-
-    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);
-    if (RTEST(ossl_sslctx_get_client_cert_cb(self)))
-	SSL_CTX_set_client_cert_cb(ctx, ossl_client_cert_cb);
-
-    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);
-
-    val = ossl_sslctx_get_sess_id_ctx(self);
-    if (!NIL_P(val)){
-	StringValue(val);
-	if (!SSL_CTX_set_session_id_context(ctx, RSTRING(val)->ptr,
-					    RSTRING(val)->len)){
-            ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
-	}
-    }
-
-    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);
-    if (NIL_P(v))
-	return v;
-    else if (TYPE(v) == T_ARRAY) {
-        str = rb_str_new(0, 0);
-        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);
-    }
-
-    Data_Get_Struct(self, SSL_CTX, ctx);
-    if(!ctx){
-        ossl_raise(eSSLError, "SSL_CTX is not initialized.");
-        return Qnil;
-    }
-    if (!SSL_CTX_set_cipher_list(ctx, RSTRING(str)->ptr)) {
-        ossl_raise(eSSLError, "SSL_CTX_set_cipher_list:");
-    }
-
-    return v;
-}
-
-/*
- * SSLSocket class
- */
-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, cb;
-    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)));
-	SSL_set_ex_data(ssl, ossl_ssl_ex_ptr_idx, (void*)self);
-	cb = ossl_sslctx_get_verify_cb(v_ctx);
-	SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void*)cb);
-	cb = ossl_sslctx_get_client_cert_cb(v_ctx);
-	SSL_set_ex_data(ssl, ossl_ssl_ex_client_cert_cb_idx, (void*)cb);
-	cb = ossl_sslctx_get_tmp_dh_cb(v_ctx);
-	SSL_set_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx, (void*)cb);
-    }
-
-    return Qtrue;
-}
-
-#ifdef _WIN32
-#define ssl_get_error(ssl, ret) \
-  (errno = WSAGetLastError(), SSL_get_error(ssl, ret))
-#else
-#define ssl_get_error(ssl, ret) SSL_get_error(ssl, ret)
-#endif
-
-static VALUE
-ossl_start_ssl(VALUE self, int (*func)())
-{
-    SSL *ssl;
-    OpenFile *fptr;
-    int ret;
-
-    Data_Get_Struct(self, SSL, ssl);
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
-    for(;;){
-	if((ret = func(ssl)) > 0) break;
-	switch(ssl_get_error(ssl, ret)){
-	case SSL_ERROR_WANT_WRITE:
-            rb_io_wait_writable(fileno(fptr->f));
-            continue;
-	case SSL_ERROR_WANT_READ:
-            rb_io_wait_readable(fileno(fptr->f));
-            continue;
-	case SSL_ERROR_SYSCALL:
-	    if (errno) rb_sys_fail(0);
-	default:
-	    ossl_raise(eSSLError, NULL);
-	}
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_ssl_connect(VALUE self)
-{
-    ossl_ssl_setup(self);
-    return ossl_start_ssl(self, SSL_connect);
-}
-
-static VALUE
-ossl_ssl_accept(VALUE self)
-{
-    ossl_ssl_setup(self);
-    return ossl_start_ssl(self, SSL_accept);
-}
-
-static VALUE
-ossl_ssl_read(int argc, VALUE *argv, VALUE self)
-{
-    SSL *ssl;
-    int ilen, nread = 0;
-    VALUE len, str;
-    OpenFile *fptr;
-
-    rb_scan_args(argc, argv, "11", &len, &str);
-    ilen = NUM2INT(len);
-    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;
-
-    Data_Get_Struct(self, SSL, ssl);
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
-    if (ssl) {
-	if(SSL_pending(ssl) <= 0)
-	    rb_thread_wait_fd(fileno(fptr->f));
-	for (;;){
-	    nread = SSL_read(ssl, RSTRING(str)->ptr, RSTRING(str)->len);
-	    switch(ssl_get_error(ssl, nread)){
-	    case SSL_ERROR_NONE:
-		goto end;
-	    case SSL_ERROR_ZERO_RETURN:
-		rb_eof_error();
-	    case SSL_ERROR_WANT_WRITE:
-                rb_io_wait_writable(fileno(fptr->f));
-                continue;
-	    case SSL_ERROR_WANT_READ:
-                rb_io_wait_readable(fileno(fptr->f));
-		continue;
-	    case SSL_ERROR_SYSCALL:
-		if(ERR_peek_error() == 0 && nread == 0) rb_eof_error();
-		rb_sys_fail(0);
-	    default:
-		ossl_raise(eSSLError, "SSL_read:");
-	    }
-        }
-    }
-    else {
-        ID id_sysread = rb_intern("sysread");
-        rb_warning("SSL session is not started yet.");
-        return rb_funcall(ossl_ssl_get_io(self), id_sysread, 2, len, str);
-    }
-
-  end:
-    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;
-
-    StringValue(str);
-    Data_Get_Struct(self, SSL, ssl);
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
-
-    if (ssl) {
-	for (;;){
-	    nwrite = SSL_write(ssl, RSTRING(str)->ptr, RSTRING(str)->len);
-	    switch(ssl_get_error(ssl, nwrite)){
-	    case SSL_ERROR_NONE:
-		goto end;
-	    case SSL_ERROR_WANT_WRITE:
-                rb_io_wait_writable(fileno(fptr->f));
-                continue;
-	    case SSL_ERROR_WANT_READ:
-                rb_io_wait_readable(fileno(fptr->f));
-                continue;
-	    case SSL_ERROR_SYSCALL:
-		if (errno) rb_sys_fail(0);
-	    default:
-		ossl_raise(eSSLError, "SSL_write:");
-	    }
-        }
-    }
-    else {
-        ID id_syswrite = rb_intern("syswrite");
-        rb_warning("SSL session is not started yet.");
-	return rb_funcall(ossl_ssl_get_io(self), id_syswrite, 1, str);
-    }
-
-  end:
-    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_peer_cert_chain(VALUE self)
-{
-    SSL *ssl;
-    STACK_OF(X509) *chain;
-    X509 *cert;
-    VALUE ary;
-    int i, num;
-
-    Data_Get_Struct(self, SSL, ssl);
-    if(!ssl){
-	rb_warning("SSL session is not started yet.");
-	return Qnil;
-    }
-    chain = SSL_get_peer_cert_chain(ssl);
-    if(!chain) return Qnil;
-    num = sk_num(chain);
-    ary = rb_ary_new2(num);
-    for (i = 0; i < num; i++){
-	cert = (X509*)sk_value(chain, i);
-	rb_ary_push(ary, ossl_x509_new(cert));
-    }
-
-    return ary;
-}
-
-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;
-}
-
-static VALUE
-ossl_ssl_pending(VALUE self)
-{
-    SSL *ssl;
-
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
-
-    return INT2NUM(SSL_pending(ssl));
-}
-
-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);
-    ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_ptr_idx",0,0,0);
-    ossl_ssl_ex_client_cert_cb_idx =
-	SSL_get_ex_new_index(0,"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
-    ossl_ssl_ex_tmp_dh_callback_idx =
-	SSL_get_ex_new_index(0,"ossl_ssl_ex_tmp_dh_callback_idx",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, "peer_cert_chain", ossl_ssl_get_peer_cert_chain, 0);
-    rb_define_method(cSSLSocket, "cipher",     ossl_ssl_get_cipher, 0);
-    rb_define_method(cSSLSocket, "state",      ossl_ssl_get_state, 0);
-    rb_define_method(cSSLSocket, "pending",    ossl_ssl_pending, 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 ba9ddb1985..0000000000
--- a/ext/openssl/ossl_ssl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * $Id: ossl_ssl.h,v 1.1 2003/07/23 16:11:29 gotoyuzo Exp $
- * '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 6d43cdccbf..0000000000
--- a/ext/openssl/ossl_version.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * $Id: ossl_version.h,v 1.1 2003/07/23 16:11:29 gotoyuzo Exp $
- * '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 fa90e92d11..0000000000
--- a/ext/openssl/ossl_x509.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * $Id: ossl_x509.c,v 1.2 2003/09/08 10:31:38 gotoyuzo Exp $
- * '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 8d1f77b302..0000000000
--- a/ext/openssl/ossl_x509.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * $Id: ossl_x509.h,v 1.2 2003/11/01 09:24:55 gotoyuzo Exp $
- * '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 *GetX509ReqPtr(VALUE);
-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 91a0795209..0000000000
--- a/ext/openssl/ossl_x509attr.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * $Id: ossl_x509attr.c,v 1.4.2.2 2004/12/15 01:54:38 matz Exp $
- * '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;
-
-    GetX509Attr(self, attr);
-    if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
-	oid = ossl_to_der_if_possible(oid);
-	StringValue(oid);
-	p = RSTRING(oid)->ptr;
-	if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self),
-			       &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;
- 
-    s = StringValuePtr(oid);
-    obj = OBJ_txt2obj(s, 0);
-    if(!obj) obj = OBJ_txt2obj(s, 1);
-    if(!obj) ossl_raise(eX509AttrError, NULL);
-    GetX509Attr(self, attr);
-    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;
-
-    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.");
-    }
-    GetX509Attr(self, attr);
-    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 3ac9c894da..0000000000
--- a/ext/openssl/ossl_x509cert.c
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
- * $Id: ossl_x509cert.c,v 1.3.2.1 2004/12/15 01:54:38 matz Exp $
- * '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;
-
-    if ((ver = NUM2LONG(version)) < 0) {
-	ossl_raise(eX509CertError, "version must be >= 0!");
-    }
-    GetX509(self, x509);
-    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;
-	
-    sec = time_to_time_t(time);
-    GetX509(self, x509);
-    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;
-	
-    sec = time_to_time_t(time);
-    GetX509(self, x509);
-    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;
-
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
-    GetX509(self, x509);
-    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;
-
-    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
-    GetX509(self, x509);
-    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;
-	
-    /* not needed private key, but should be */
-    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    GetX509(self, x509);
-    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;
-	
-    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);
-    }
-    GetX509(self, x509);
-    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 62d27fe7a4..0000000000
--- a/ext/openssl/ossl_x509crl.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * $Id: ossl_x509crl.c,v 1.3.2.1 2004/12/15 01:54:38 matz Exp $
- * '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;
-
-    if ((ver = NUM2LONG(version)) < 0) {
-	ossl_raise(eX509CRLError, "version must be >= 0!");
-    }
-    GetX509CRL(self, crl);
-    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;
-
-    sec = time_to_time_t(time);
-    GetX509CRL(self, crl);
-    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;
-
-    sec = time_to_time_t(time);
-    GetX509CRL(self, crl);
-    /* 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;
-
-    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);
-    }
-    GetX509CRL(self, crl);
-    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;
-	
-    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);
-    }
-    GetX509CRL(self, crl);
-    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 219f30d7e3..0000000000
--- a/ext/openssl/ossl_x509ext.c
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * $Id: ossl_x509ext.c,v 1.8.2.3 2005/11/22 22:28:51 gotoyuzo Exp $
- * '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) do { \
-    if (!(ctx = OPENSSL_malloc(sizeof(X509V3_CTX)))) \
-        ossl_raise(rb_eRuntimeError, "CTX wasn't allocated!"); \
-    X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, 0); \
-    obj = Data_Wrap_Struct(klass, 0, ossl_x509extfactory_free, ctx); \
-} while (0)
-#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 = GetX509CertPtr(cert); /* NO 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 = GetX509CertPtr(cert); /* NO 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 = GetX509ReqPtr(req); /* NO DUP NEEDED */
-
-    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 = GetX509CRLPtr(crl); /* NO DUP NEEDED */
-
-    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);  /* NO DUP NEEDED */
-    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;
-#ifdef HAVE_X509V3_EXT_NCONF_NID
-    VALUE rconf;
-    CONF *conf;
-#else
-    static LHASH *empty_lhash;
-#endif
-
-    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, "unknown OID `%s'", RSTRING(oid)->ptr);
-    valstr = rb_str_new2(RTEST(critical) ? "critical," : "");
-    rb_str_append(valstr, value);
-    GetX509ExtFactory(self, ctx);
-#ifdef HAVE_X509V3_EXT_NCONF_NID
-    rconf = rb_iv_get(self, "@config");
-    conf = NIL_P(rconf) ? NULL : GetConfigPtr(rconf);
-    ext = X509V3_EXT_nconf_nid(conf, ctx, nid, RSTRING(valstr)->ptr);
-#else
-    if (!empty_lhash) empty_lhash = lh_new(NULL, NULL);
-    ext = X509V3_EXT_conf_nid(empty_lhash, ctx, nid, RSTRING(valstr)->ptr);
-#endif
-    if (!ext){
-	ossl_raise(eX509ExtError, "%s = %s",
-		   RSTRING(oid)->ptr, RSTRING(value)->ptr);
-    }
-    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;
-
-    GetX509Ext(self, ext);
-    if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){
-	oid = ossl_to_der_if_possible(oid);
-	StringValue(oid);
-	p  = RSTRING(oid)->ptr;
-	if(!d2i_X509_EXTENSION((X509_EXTENSION**)&DATA_PTR(self),
-			       &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;
-
-    s = StringValuePtr(oid);
-    obj = OBJ_txt2obj(s, 0);
-    if(!obj) obj = OBJ_txt2obj(s, 1);
-    if(!obj) ossl_raise(eX509ExtError, NULL);
-    GetX509Ext(self, ext);
-    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;
-
-    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);
-    }
-    GetX509Ext(self, ext);
-    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 1a456f2c48..0000000000
--- a/ext/openssl/ossl_x509name.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * $Id: ossl_x509name.c,v 1.4.2.8 2004/12/27 07:55:56 gotoyuzo Exp $
- * '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)
-
-#define OBJECT_TYPE_TEMPLATE \
-  rb_const_get(cX509Name, rb_intern("OBJECT_TYPE_TEMPLATE"))
-#define DEFAULT_OBJECT_TYPE \
-  rb_const_get(cX509Name, rb_intern("DEFAULT_OBJECT_TYPE"))
-
-/*
- * 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 int id_aref;
-static VALUE ossl_x509name_add_entry(int, VALUE*, VALUE);
-#define rb_aref(obj, key) rb_funcall(obj, id_aref, 1, key)
-
-static VALUE
-ossl_x509name_init_i(VALUE i, VALUE args)
-{
-    VALUE self = rb_ary_entry(args, 0);
-    VALUE template = rb_ary_entry(args, 1);
-    VALUE entry[3];
-
-    Check_Type(i, T_ARRAY);
-    entry[0] = rb_ary_entry(i, 0);
-    entry[1] = rb_ary_entry(i, 1);
-    entry[2] = rb_ary_entry(i, 2);
-    if(NIL_P(entry[2])) entry[2] = rb_aref(template, entry[0]);
-    if(NIL_P(entry[2])) entry[2] = DEFAULT_OBJECT_TYPE;
-    ossl_x509name_add_entry(3, entry, self);
-
-    return Qnil;
-}
-
-static VALUE
-ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
-{
-    X509_NAME *name;
-    VALUE arg, template;
-
-    GetX509Name(self, name);
-    if (rb_scan_args(argc, argv, "02", &arg, &template) == 0) {
-	return self;
-    }
-    else {
-	VALUE tmp = rb_check_array_type(arg);
-	if (!NIL_P(tmp)) {
-	    VALUE args;
-	    if(NIL_P(template)) template = OBJECT_TYPE_TEMPLATE;
-	    args = rb_ary_new3(2, self, template);
-	    rb_iterate(rb_each, tmp, ossl_x509name_init_i, args);
-	}
-	else{
-	    unsigned char *p;
-	    VALUE str = ossl_to_der_if_possible(arg);
-	    StringValue(str);
-	    p = RSTRING(str)->ptr;
-	    if(!d2i_X509_NAME((X509_NAME**)&DATA_PTR(self), &p, RSTRING(str)->len)){
-		ossl_raise(eX509NameError, NULL);
-	    }
-	}
-    }
-
-    return self;
-}
-
-static
-VALUE ossl_x509name_add_entry(int argc, VALUE *argv, VALUE self)
-{
-    X509_NAME *name;
-    VALUE oid, value, type;
-
-    rb_scan_args(argc, argv, "21", &oid, &value, &type);
-    StringValue(oid);
-    StringValue(value);
-    if(NIL_P(type)) type = rb_aref(OBJECT_TYPE_TEMPLATE, oid);
-    GetX509Name(self, name);
-    if (!X509_NAME_add_entry_by_txt(name, RSTRING(oid)->ptr, NUM2INT(type),
-		RSTRING(value)->ptr, RSTRING(value)->len, -1, 0)) {
-	ossl_raise(eX509NameError, NULL);
-    }
-
-    return self;
-}
-
-static VALUE
-ossl_x509name_to_s_old(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_s(int argc, VALUE *argv, VALUE self)
-{           
-    X509_NAME *name;
-    VALUE flag, str;
-    BIO *out;
-    unsigned long iflag;
-
-    rb_scan_args(argc, argv, "01", &flag);
-    if (NIL_P(flag))
-	return ossl_x509name_to_s_old(self);
-    else iflag = NUM2ULONG(flag);
-    if (!(out = BIO_new(BIO_s_mem())))
-	ossl_raise(eX509NameError, NULL);
-    GetX509Name(self, name);
-    if (!X509_NAME_print_ex(out, name, 0, iflag)){
-	BIO_free(out);
-	ossl_raise(eX509NameError, NULL);
-    }
-    str = ossl_membio2str(out);
-
-    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, ret;
-	
-    GetX509Name(self, name);
-    entries = X509_NAME_entry_count(name);
-    if (entries < 0) {
-	OSSL_Debug("name entries < 0!");
-	return rb_ary_new();
-    }
-    ret = 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));
-	ary = rb_ary_new3(3, rb_str_new2(short_name),
-        		  rb_str_new(entry->value->data, entry->value->length),
-        		  INT2FIX(entry->value->type));
-	rb_ary_push(ret, ary);
-    }
-    return ret;
-}
-
-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()
-{
-    VALUE utf8str, ptrstr, ia5str, hash;
-
-    id_aref = rb_intern("[]");
-    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, "add_entry", ossl_x509name_add_entry, -1);
-    rb_define_method(cX509Name, "to_s", ossl_x509name_to_s, -1);
-    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);
-
-    utf8str = INT2NUM(V_ASN1_UTF8STRING);
-    ptrstr = INT2NUM(V_ASN1_PRINTABLESTRING);
-    ia5str = INT2NUM(V_ASN1_IA5STRING);
-    rb_define_const(cX509Name, "DEFAULT_OBJECT_TYPE", utf8str);
-    hash = rb_hash_new();
-    RHASH(hash)->ifnone = utf8str;
-    rb_hash_aset(hash, rb_str_new2("C"), ptrstr);
-    rb_hash_aset(hash, rb_str_new2("countryName"), ptrstr);
-    rb_hash_aset(hash, rb_str_new2("serialNumber"), ptrstr);
-    rb_hash_aset(hash, rb_str_new2("dnQualifier"), ptrstr);
-    rb_hash_aset(hash, rb_str_new2("DC"), ia5str);
-    rb_hash_aset(hash, rb_str_new2("domainComponent"), ia5str);
-    rb_hash_aset(hash, rb_str_new2("emailAddress"), ia5str);
-    rb_define_const(cX509Name, "OBJECT_TYPE_TEMPLATE", hash);
-
-    rb_define_const(cX509Name, "COMPAT", ULONG2NUM(XN_FLAG_COMPAT));
-    rb_define_const(cX509Name, "RFC2253", ULONG2NUM(XN_FLAG_RFC2253));
-    rb_define_const(cX509Name, "ONELINE", ULONG2NUM(XN_FLAG_ONELINE));
-    rb_define_const(cX509Name, "MULTILINE", ULONG2NUM(XN_FLAG_MULTILINE));
-}
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
deleted file mode 100644
index c1b1a3e619..0000000000
--- a/ext/openssl/ossl_x509req.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- * $Id: ossl_x509req.c,v 1.5.2.2 2005/09/10 00:54:29 gotoyuzo Exp $
- * '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 *
-GetX509ReqPtr(VALUE obj)
-{
-    X509_REQ *req;
-
-    SafeGetX509Req(obj, req);
-
-    return req;
-}
-
-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_der(VALUE self)
-{
-    X509_REQ *req;
-    VALUE str;
-    long len;
-    unsigned char *p;
-
-    GetX509Req(self, req);
-    if ((len = i2d_X509_REQ(req, NULL)) <= 0)
-	ossl_raise(eX509CertError, NULL);
-    str = rb_str_new(0, len);
-    p = RSTRING(str)->ptr;
-    if (i2d_X509_REQ(req, &p) <= 0)
-	ossl_raise(eX509ReqError, NULL);
-    ossl_str_adjust(str, p);
-
-    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;
-
-    if ((ver = FIX2LONG(version)) < 0) {
-	ossl_raise(eX509ReqError, "version must be >= 0!");
-    }
-    GetX509Req(self, req);
-    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;
-
-    Check_Type(ary, T_ARRAY);
-    for (i=0;i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Attr);
-    }
-    GetX509Req(self, req);
-    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_method(cX509Req, "to_der", ossl_x509req_to_der, 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 a0f2f00aa5..0000000000
--- a/ext/openssl/ossl_x509revoked.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * $Id: ossl_x509revoked.c,v 1.2.2.1 2004/12/15 01:54:38 matz Exp $
- * '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;
-
-    sec = time_to_time_t(time);
-    GetX509Rev(self, rev);
-    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;
-
-    Check_Type(ary, T_ARRAY);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Ext);
-    }
-    GetX509Rev(self, rev);
-    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 360769e612..0000000000
--- a/ext/openssl/ossl_x509store.c
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
- * $Id: ossl_x509store.c,v 1.2.2.5 2005/09/10 00:54:29 gotoyuzo Exp $
- * '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);
-    rb_iv_set(self, "@time", Qnil);
-
-    return self;
-}
-
-static VALUE
-ossl_x509store_set_flags(VALUE self, VALUE flags)
-{
-#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
-    X509_STORE *store;
-    long f = NUM2LONG(flags);
-
-    GetX509Store(self, store);
-    X509_STORE_set_flags(store, f);
-#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;
-    long p = NUM2LONG(purpose);
-    
-    GetX509Store(self, store);
-    X509_STORE_set_purpose(store, p);
-#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;
-    long t = NUM2LONG(trust);
-
-    GetX509Store(self, store);
-    X509_STORE_set_trust(store, t);
-#else
-    rb_iv_set(self, "@trust", trust);
-#endif
-
-    return trust;
-}
-
-static VALUE 
-ossl_x509store_set_time(VALUE self, VALUE time)
-{
-    rb_iv_set(self, "@time", time);
-    return time;
-}
-
-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_set_default_paths(VALUE self)
-{
-    X509_STORE *store;
-
-    GetX509Store(self, store);
-    if (X509_STORE_set_default_paths(store) != 1){
-        ossl_raise(eX509StoreError, NULL);
-    }
-
-    return Qnil;
-}
-
-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);
-    if (X509_STORE_add_cert(store, cert) != 1){
-        ossl_raise(eX509StoreError, NULL);
-    }
-
-    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);
-    if (X509_STORE_add_crl(store, crl) != 1){
-        ossl_raise(eX509StoreError, NULL);
-    }
-
-    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_set_flags(VALUE, VALUE);
-static VALUE ossl_x509stctx_set_purpose(VALUE, VALUE);
-static VALUE ossl_x509stctx_set_trust(VALUE, VALUE);
-static VALUE ossl_x509stctx_set_time(VALUE, VALUE);
-
-static VALUE
-ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE store, cert, chain, t;
-    X509_STORE_CTX *ctx;
-    X509_STORE *x509st;
-    X509 *x509 = NULL;
-    STACK_OF(X509) *x509s = NULL;
-
-    rb_scan_args(argc, argv, "12", &store, &cert, &chain);
-    GetX509StCtx(self, ctx);
-    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);
-    ossl_x509stctx_set_flags(self, rb_iv_get(store, "@flags"));
-    ossl_x509stctx_set_purpose(self, rb_iv_get(store, "@purpose"));
-    ossl_x509stctx_set_trust(self, rb_iv_get(store, "@trust"));
-#endif
-    if (!NIL_P(t = rb_iv_get(store, "@time")))
-	ossl_x509stctx_set_time(self, t);
-    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;
-    long f = NUM2LONG(flags);
-
-    GetX509StCtx(self, store);
-    X509_STORE_CTX_set_flags(store, f);
-
-    return flags;
-}
-
-static VALUE
-ossl_x509stctx_set_purpose(VALUE self, VALUE purpose)
-{
-    X509_STORE_CTX *store;
-    long p = NUM2LONG(purpose);
-
-    GetX509StCtx(self, store);
-    X509_STORE_CTX_set_purpose(store, p);
-
-    return purpose;
-}
-
-static VALUE
-ossl_x509stctx_set_trust(VALUE self, VALUE trust)
-{
-    X509_STORE_CTX *store;
-    long t = NUM2LONG(trust);
-
-    GetX509StCtx(self, store);
-    X509_STORE_CTX_set_trust(store, t);
-
-    return trust;
-}
-
-static VALUE
-ossl_x509stctx_set_time(VALUE self, VALUE time)
-{
-    X509_STORE_CTX *store;
-    long t;
-
-    t = NUM2LONG(rb_Integer(time));
-    GetX509StCtx(self, store);
-    X509_STORE_CTX_set_time(store, 0, t);
-
-    return time;
-}
-
-/*
- * 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, "time=",        ossl_x509store_set_time, 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, "set_default_paths", ossl_x509store_set_default_paths, 0);
-    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);
-    rb_define_method(x509stctx,"time=",       ossl_x509stctx_set_time, 1);
-
-}
diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h
deleted file mode 100644
index f673bb157a..0000000000
--- a/ext/openssl/ruby_missing.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * $Id: ruby_missing.h,v 1.3 2003/09/06 08:56:57 gotoyuzo Exp $
- * '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/MANIFEST b/ext/pty/MANIFEST
new file mode 100644
index 0000000000..0535a5b7ef
--- /dev/null
+++ b/ext/pty/MANIFEST
@@ -0,0 +1,12 @@
+MANIFEST
+README
+README.expect
+README.expect.ja
+README.ja
+depend
+expect_sample.rb
+extconf.rb
+lib/expect.rb
+pty.c
+script.rb
+shl.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/expect_sample.rb b/ext/pty/expect_sample.rb
index bf8a2352fe..1311476c5d 100644
--- a/ext/pty/expect_sample.rb
+++ b/ext/pty/expect_sample.rb
@@ -4,16 +4,17 @@
 #  by A. Ito
 #
 #  This program reports the latest version of ruby interpreter
-#  by connecting to ftp server at ruby-lang.org.
+#  by connecting to ftp server at netlab.co.jp.
 #
 require 'pty'
 require 'expect'
 
 fnames = []
-PTY.spawn("ftp ftp.ruby-lang.org") do |r_f,w_f,pid|
+PTY.spawn("ftp ftp.netlab.co.jp") do
+  |r_f,w_f,pid|
   w_f.sync = true
   
-  $expect_verbose = false
+  $expect_verbose = true
   
   r_f.expect(/^Name.*: /) do
     w_f.print "ftp\n"
@@ -30,14 +31,14 @@ PTY.spawn("ftp ftp.ruby-lang.org") do |r_f,w_f,pid|
   r_f.expect('word:') do
     w_f.print username+"@\n"
   end
-  r_f.expect("> ") do
-    w_f.print "cd pub/ruby\n"
+  r_f.expect("ftp> ") do
+    w_f.print "cd pub/lang/ruby\n"
   end
-  r_f.expect("> ") do
+  r_f.expect("ftp> ") do
     w_f.print "dir\n"
   end
   
-  r_f.expect("> ") do |output|
+  r_f.expect("ftp> ") do |output|
     for x in output[0].split("\n")
       if x =~ /(ruby.*\.tar\.gz)/ then
          fnames.push $1
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 93fb5c0118..b7c69fe400 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -6,7 +6,7 @@
 #include	<fcntl.h>
 #include	<errno.h>
 #include	<pwd.h>
-#ifdef HAVE_SYS_IOCTL_H
+#if !defined(HAVE_OPENPTY) && !defined(HAVE__GETPTY)
 #include	<sys/ioctl.h>
 #endif
 #ifdef HAVE_LIBUTIL_H
@@ -24,7 +24,6 @@
 
 #include "ruby.h"
 #include "rubyio.h"
-#include "util.h"
 
 #include <signal.h>
 #ifdef HAVE_SYS_STROPTS_H
@@ -38,7 +37,7 @@
 #define	DEVICELEN	16
 
 #if !defined(HAVE_OPENPTY)
-#if defined(__hpux)
+#ifdef __hpux
 static
 char	*MasterDevice = "/dev/ptym/pty%s",
 	*SlaveDevice =  "/dev/pty/tty%s",
@@ -61,7 +60,8 @@ char	*MasterDevice = "/dev/ptym/pty%s",
 		"w8","w9","wa","wb","wc","wd","we","wf",
 		0,
 	};
-#elif defined(_IBMESA)  /* AIX/ESA */
+#else  /* NOT HPUX */
+#ifdef _IBMESA  /* AIX/ESA */
 static 
 char	*MasterDevice = "/dev/ptyp%s",
   	*SlaveDevice = "/dev/ttyp%s",
@@ -83,7 +83,7 @@ char	*MasterDevice = "/dev/ptyp%s",
 "e0","e1","e2","e3","e4","e5","e6","e7","e8","e9","ea","eb","ec","ed","ee","ef",
 "f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff",
 		};
-#elif !defined(HAVE_PTSNAME)
+#else
 static 
 char	*MasterDevice = "/dev/pty%s",
 	*SlaveDevice = "/dev/tty%s",
@@ -98,11 +98,14 @@ char	*MasterDevice = "/dev/pty%s",
 		"s8","s9","sa","sb","sc","sd","se","sf",
 		0,
 	};
-#endif
+#endif /* _IBMESA */
+#endif /* HPUX */
 #endif /* !defined(HAVE_OPENPTY) */
 
 static char SlaveName[DEVICELEN];
 
+extern int errno;
+
 #ifndef HAVE_SETEUID
 # ifdef HAVE_SETREUID
 #  define seteuid(e)	setreuid(-1, (e))
@@ -126,54 +129,48 @@ echild_status(self)
 
 struct pty_info {
     int fd;
-    rb_pid_t child_pid;
+    pid_t child_pid;
     VALUE thread;
 };
 
-static void
-raise_from_wait(state, info)
-    struct pty_info *info;
-    char *state;
-{
-    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);
-}
-
 static VALUE
 pty_syswait(info)
     struct pty_info *info;
 {
+    extern VALUE rb_last_status;
     int cpid, status;
+    char buf[1024];
+    VALUE exc, st;
+    char *state = "changed";
 
-    for (;;) {
-	cpid = rb_waitpid(info->child_pid, &status, WUNTRACED);
-	if (cpid == -1) return Qnil;
+    cpid = rb_waitpid(info->child_pid, &status, WUNTRACED);
+    st = rb_last_status;
+    
+    if (cpid == 0 || 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 IF_STOPPED
+    if (IF_STOPPED(status)) { /* suspend */
+	state = "stopped";
+    }
+#else
+#ifdef WIFSTOPPED
+    if (WIFSTOPPED(status)) { /* suspend */
+	state = "stopped";
+    }
 #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 (WIFEXITED(status)) {
+	state = "exit";
     }
+    
+    snprintf(buf, sizeof(buf), "pty - %s: %d", state, cpid);
+    exc = rb_exc_new2(eChildExited, buf);
+    rb_iv_set(exc, "status", st);
+    rb_funcall(info->thread, rb_intern("raise"), 1, exc);
+    return Qnil;
 }
 
 static void getDevice _((int*, int*));
@@ -197,7 +194,7 @@ establishShell(argc, argv, info)
     struct pty_info *info;
 {	
     static int		i,master,slave,currentPid;
-    char		*p, tmp, *getenv();
+    char		*p,*getenv();
     struct passwd	*pwent;
     VALUE		v;
     struct exec_info	arg;
@@ -225,8 +222,6 @@ establishShell(argc, argv, info)
     info->thread = rb_thread_current();
     currentPid = getpid();
     if((i = fork()) < 0) {
-	close(master);
-	close(slave);
 	rb_sys_fail("fork failed");
     }
 
@@ -273,7 +268,6 @@ establishShell(argc, argv, info)
 	}
 	close(master);
 #endif
-	write(slave, "", 1);
 	dup2(slave,0);
 	dup2(slave,1);
 	dup2(slave,2);
@@ -289,7 +283,6 @@ establishShell(argc, argv, info)
 	_exit(1);
     }
 
-    read(master, &tmp, 1);
     close(slave);
 
     info->child_pid = i;
@@ -297,46 +290,64 @@ establishShell(argc, argv, info)
 }
 
 static VALUE
-pty_finalize_syswait(info)
+pty_kill_child(info)
     struct pty_info *info;
 {
-    rb_thread_kill(info->thread);
-    rb_funcall(info->thread, rb_intern("value"), 0);
-    rb_detach_process(info->child_pid);
+    if (rb_funcall(info->thread, rb_intern("alive?"), 0, 0) == Qtrue &&
+	kill(info->child_pid, 0) == 0) {
+	rb_thread_schedule();
+	if (kill(info->child_pid, SIGTERM) == 0) {
+	    rb_thread_schedule();
+	    if (kill(info->child_pid, 0) == 0) {
+		kill(info->child_pid, SIGINT);
+		rb_thread_schedule();
+		if (kill(info->child_pid, 0) == 0)
+		    kill(info->child_pid, SIGKILL);
+	    }
+	}
+    }
+    rb_funcall(info->thread, rb_intern("join"), 0, 0);
     return Qnil;
 }
 
-static int
-get_device_once(master, slave, fail)
-    int *master, *slave, fail;
-{
-#if defined HAVE_OPENPTY
+
+#ifdef HAVE_OPENPTY
 /*
  * Use openpty(3) of 4.3BSD Reno and later,
  * or the same interface function.
  */
+static void
+getDevice(master,slave)
+    int	*master,*slave;
+{
     if (openpty(master, slave, SlaveName,
 		(struct termios *)0, (struct winsize *)0) == -1) {
-	if (!fail) return -1;
 	rb_raise(rb_eRuntimeError, "openpty() failed");
     }
-
-    return 0;
-#elif defined HAVE__GETPTY
+}
+#else /* HAVE_OPENPTY */
+#ifdef HAVE__GETPTY
+static void
+getDevice(master,slave)
+    int	*master,*slave;
+{
     char *name;
 
     if (!(name = _getpty(master, O_RDWR, 0622, 0))) {
-	if (!fail) return -1;
 	rb_raise(rb_eRuntimeError, "_getpty() failed");
     }
 
     *slave = open(name, O_RDWR);
     strcpy(SlaveName, name);
-
-    return 0;
 }
 #else /* HAVE__GETPTY */
+static void
+getDevice(master,slave)
+    int	*master,*slave;
+{
+    char **p;
     int	 i,j;
+    char MasterName[DEVICELEN];
 
 #ifdef HAVE_PTSNAME
     char *pn;
@@ -356,12 +367,11 @@ get_device_once(master, slave, fail)
 #if defined I_PUSH && !defined linux
 			if(ioctl(j, I_PUSH, "ptem") != -1) {
 			    if(ioctl(j, I_PUSH, "ldterm") != -1) {
-				ioctl(j, I_PUSH, "ttcompat");
 #endif
 				*master = i;
 				*slave = j;
 				strcpy(SlaveName, pn);
-				return 0;
+				return;
 #if defined I_PUSH && !defined linux
 			    }
 			}
@@ -372,12 +382,8 @@ get_device_once(master, slave, fail)
 	}
 	close(i);
     }
-    if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
-    return -1;
+    rb_raise(rb_eRuntimeError, "Cannot get Master/Slave device");
 #else
-    char **p;
-    char MasterName[DEVICELEN];
-
     for (p = deviceNo; *p != NULL; p++) {
 	sprintf(MasterName,MasterDevice,*p);
 	if ((i = open(MasterName,O_RDWR,0)) >= 0) {
@@ -387,26 +393,16 @@ get_device_once(master, slave, fail)
 		*slave = j;
 		chown(SlaveName, getuid(), getgid());
 		chmod(SlaveName, 0622);
-		return 0;
+		return;
 	    }
 	    close(i);
 	}
     }
-    if (fail) rb_raise(rb_eRuntimeError, "can't get %s", SlaveName);
-    return -1;
+    rb_raise(rb_eRuntimeError, "Cannot get %s", SlaveName);
 #endif
-#endif
-}
-
-static void
-getDevice(master, slave)
-    int *master, *slave;
-{
-    if (get_device_once(master, slave, 0)) {
-	rb_gc();
-	get_device_once(master, slave, 1);
-    }
 }
+#endif /* HAVE__GETPTY */
+#endif /* HAVE_OPENPTY */
 
 static void
 freeDevice()
@@ -422,9 +418,8 @@ pty_getpty(argc, argv, self)
     VALUE *argv;
     VALUE self;
 {
-    VALUE res;
-    struct pty_info info;
-    struct pty_info thinfo;
+    VALUE res, th;
+    struct pty_info info, thinfo;
     OpenFile *wfptr,*rfptr;
     VALUE rport = rb_obj_alloc(rb_cFile);
     VALUE wport = rb_obj_alloc(rb_cFile);
@@ -447,12 +442,12 @@ pty_getpty(argc, argv, self)
     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);
+    th = rb_thread_create(pty_syswait, (void*)&info);
+    thinfo.thread = th;
     thinfo.child_pid = info.child_pid;
-    rb_thread_schedule();
 
     if (rb_block_given_p()) {
-	rb_ensure(rb_yield, res, pty_finalize_syswait, (VALUE)&thinfo);
+	rb_ensure(rb_yield, res, pty_kill_child, (VALUE)&thinfo);
 	return Qnil;
     }
     return res;
diff --git a/ext/pty/script.rb b/ext/pty/script.rb
index dbb933171f..3084935637 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
diff --git a/ext/racc/cparse/MANIFEST b/ext/racc/cparse/MANIFEST
new file mode 100644
index 0000000000..6827937750
--- /dev/null
+++ b/ext/racc/cparse/MANIFEST
@@ -0,0 +1,4 @@
+MANIFEST
+cparse.c
+depend
+extconf.rb
diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c
index 197a0eb40b..6ed6293dee 100644
--- a/ext/racc/cparse/cparse.c
+++ b/ext/racc/cparse/cparse.c
@@ -1,24 +1,25 @@
 /*
 
-    cparse.c -- Racc Runtime Core
+    cparse.c
   
-    Copyright (c) 1999-2006 Minero Aoki
+    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.
 
-    $originalId: cparse.c,v 1.8 2006/07/06 11:39:46 aamine Exp $
+    $Id$
 
 */
 
+#include <stdio.h>
 #include "ruby.h"
-#include "version.h"
+
 
 /* -----------------------------------------------------------------------
                         Important Constants
 ----------------------------------------------------------------------- */
 
-#define RACC_VERSION "1.4.5"
+#define RACC_VERSION "1.4.2"
 
 #define DEFAULT_TOKEN -1
 #define ERROR_TOKEN    1
@@ -28,8 +29,9 @@
 #define vERROR_TOKEN    INT2FIX(ERROR_TOKEN)
 #define vFINAL_TOKEN    INT2FIX(FINAL_TOKEN)
 
+
 /* -----------------------------------------------------------------------
-                          File Local Variables
+                          Global Variables
 ----------------------------------------------------------------------- */
 
 static VALUE RaccBug;
@@ -39,6 +41,8 @@ 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;
@@ -48,41 +52,44 @@ static ID id_d_read_token;
 static ID id_d_next_state;
 static ID id_d_e_pop;
 
+
 /* -----------------------------------------------------------------------
                               Utils
 ----------------------------------------------------------------------- */
 
-/* For backward compatibility */
-#ifndef ID2SYM
-# define ID2SYM(i) ULONG2NUM(i)
-#endif
-#ifndef SYM2ID
-#  define SYM2ID(v) ((ID)NUM2ULONG(v))
-#endif
-#ifndef SYMBOL_P
-#  define SYMBOL_P(v) FIXNUM_P(v)
-#endif
-#ifndef LONG2NUM
-#  define LONG2NUM(i) INT2NUM(i)
-#endif
-#if RUBY_VERSION_CODE >= 190
-#  define HAVE_RB_BLOCK_CALL 1
-#endif
-
 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(VALUE v)
+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(VALUE n)
+num_to_long(n)
+    VALUE n;
 {
     return NUM2LONG(n);
 }
@@ -90,6 +97,7 @@ num_to_long(VALUE n)
 #define AREF(s, idx) \
     ((0 <= idx && idx < RARRAY(s)->len) ? RARRAY(s)->ptr[idx] : Qnil)
 
+
 /* -----------------------------------------------------------------------
                         Parser Stack Interfaces
 ----------------------------------------------------------------------- */
@@ -98,7 +106,9 @@ static VALUE get_stack_tail _((VALUE stack, long len));
 static void cut_stack_tail _((VALUE stack, long len));
 
 static VALUE
-get_stack_tail(VALUE stack, long len)
+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;
@@ -106,7 +116,9 @@ get_stack_tail(VALUE stack, long len)
 }
 
 static void
-cut_stack_tail(VALUE stack, long len)
+cut_stack_tail(stack, len)
+    VALUE stack;
+    long len;
 {
     while (len > 0) {
         rb_ary_pop(stack);
@@ -123,6 +135,7 @@ cut_stack_tail(VALUE stack, long len)
 #define GET_TAIL(s, len) get_stack_tail(s, len)
 #define CUT_TAIL(s, len) cut_stack_tail(s, len)
 
+
 /* -----------------------------------------------------------------------
                        struct cparse_params
 ----------------------------------------------------------------------- */
@@ -132,12 +145,11 @@ struct cparse_params {
 
     VALUE parser;          /* parser object */
 
-    int   lex_is_iterator;
-    VALUE lexer;           /* scanner object */
-    ID    lexmid;          /* name of scanner method (must be an iterator) */
+    VALUE lexer;           /* receiver object of scan iterator */
+    ID    lexmid;          /* name of scan iterator method */
 
-    /* State transition tables (immutable)
-       Data structure is from Dragon Book 4.9 */
+    /* state transition tables (never change)
+       Using data structure is from Dragon Book 4.9 */
     /* action table */
     VALUE action_table;
     VALUE action_check;
@@ -166,7 +178,9 @@ struct cparse_params {
     long errstatus;         /* nonzero in error recovering mode */
     long nerr;              /* number of error */
 
-    int use_result_var;
+    /* runtime user option */
+    int use_result_var;     /* bool */
+    int iterator_p;         /* bool */
 
     VALUE retval;           /* return value of parser routine */
     long fin;               /* parse result status */
@@ -180,6 +194,7 @@ struct cparse_params {
     long i;                 /* table index */
 };
 
+
 /* -----------------------------------------------------------------------
                         Parser Main Routines
 ----------------------------------------------------------------------- */
@@ -189,14 +204,15 @@ 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 assert_array _((VALUE a));
-static long assert_integer _((VALUE n));
-static VALUE assert_hash _((VALUE h));
-static VALUE initialize_params _((VALUE vparams, VALUE parser, VALUE arg,
+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 cparse_params_mark _((void *ptr));
 
 static void parse_main _((struct cparse_params *v,
                          VALUE tok, VALUE val, int resume));
@@ -204,65 +220,61 @@ 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_puts(msg)        if (v->sys_debug) puts(msg)
-# define D_printf(fmt,arg)  if (v->sys_debug) printf(fmt,arg)
+# define D(code) if (v->sys_debug) code
 #else
-# define D_puts(msg)
-# define D_printf(fmt,arg)
+# define D(code)
 #endif
 
 static VALUE
-racc_cparse(VALUE parser, VALUE arg, VALUE sysdebug)
+racc_cparse(parser, arg, sysdebug)
+    VALUE parser, arg, sysdebug;
 {
-    volatile VALUE vparams;
-    struct cparse_params *v;
-
-    vparams = Data_Make_Struct(CparseParams, struct cparse_params,
-                               cparse_params_mark, -1, v);
-    D_puts("starting cparse");
-    v->sys_debug = RTEST(sysdebug);
-    vparams = initialize_params(vparams, parser, arg, Qnil, Qnil);
-    v->lex_is_iterator = Qfalse;
-    parse_main(v, Qnil, Qnil, 0);
-
-    return v->retval;
+    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(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
+racc_yyparse(parser, lexer, lexmid, arg, sysdebug)
+    VALUE parser, lexer, lexmid, arg, sysdebug;
 {
-    volatile VALUE vparams;
-    struct cparse_params *v;
-
-    vparams = Data_Make_Struct(CparseParams, struct cparse_params,
-                               cparse_params_mark, -1, v);
-    v->sys_debug = RTEST(sysdebug);
-    D_puts("start C yyparse");
-    vparams = initialize_params(vparams, parser, arg, lexer, lexmid);
-    v->lex_is_iterator = Qtrue;
-    D_puts("params initialized");
-    parse_main(v, Qnil, Qnil, 0);
-    call_lexer(v);
-    if (!v->fin) {
+    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(v->lexmid));
+                 rb_id2name(params.lexmid));
     }
 
-    return v->retval;
+    return params.retval;
 }
 
-#ifdef HAVE_RB_BLOCK_CALL
 static void
-call_lexer(struct cparse_params *v)
+call_lexer(v)
+    struct cparse_params *v;
 {
-    rb_block_call(v->lexer, v->lexmid, 0, NULL, lexer_i, v->value_v);
+    rb_iterate(lexer_iter, v->value_v, lexer_i, v->value_v);
 }
-#else
+
 static VALUE
-lexer_iter(VALUE data)
+lexer_iter(data)
+    VALUE data;
 {
     struct cparse_params *v;
 
@@ -271,15 +283,9 @@ lexer_iter(VALUE data)
     return Qnil;
 }
 
-static void
-call_lexer(struct cparse_params *v)
-{
-    rb_iterate(lexer_iter, v->value_v, lexer_i, v->value_v);
-}
-#endif
-
 static VALUE
-lexer_i(VALUE block_args, VALUE data, VALUE self)
+lexer_i(block_args, data, self)
+    VALUE block_args, data, self;
 {
     struct cparse_params *v;
     VALUE tok, val;
@@ -295,32 +301,35 @@ lexer_i(VALUE block_args, VALUE data, VALUE self)
 }
 
 static VALUE
-assert_array(VALUE a)
+check_array(a)
+    VALUE a;
 {
     Check_Type(a, T_ARRAY);
     return a;
 }
 
 static VALUE
-assert_hash(VALUE h)
+check_hash(h)
+    VALUE h;
 {
     Check_Type(h, T_HASH);
     return h;
 }
 
 static long
-assert_integer(VALUE n)
+check_num(n)
+    VALUE n;
 {
     return NUM2LONG(n);
 }
 
-static VALUE
-initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lexmid)
-{
+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);
 
-    Data_Get_Struct(vparams, struct cparse_params, v);
-    v->value_v = vparams;
     v->parser = parser;
     v->lexer = lexer;
     if (! NIL_P(lexmid))
@@ -331,19 +340,19 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
     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   = assert_array  (RARRAY(arg)->ptr[ 0]);
-    v->action_check   = assert_array  (RARRAY(arg)->ptr[ 1]);
-    v->action_default = assert_array  (RARRAY(arg)->ptr[ 2]);
-    v->action_pointer = assert_array  (RARRAY(arg)->ptr[ 3]);
-    v->goto_table     = assert_array  (RARRAY(arg)->ptr[ 4]);
-    v->goto_check     = assert_array  (RARRAY(arg)->ptr[ 5]);
-    v->goto_default   = assert_array  (RARRAY(arg)->ptr[ 6]);
-    v->goto_pointer   = assert_array  (RARRAY(arg)->ptr[ 7]);
-    v->nt_base        = assert_integer(RARRAY(arg)->ptr[ 8]);
-    v->reduce_table   = assert_array  (RARRAY(arg)->ptr[ 9]);
-    v->token_table    = assert_hash   (RARRAY(arg)->ptr[10]);
-    v->shift_n        = assert_integer(RARRAY(arg)->ptr[11]);
-    v->reduce_n       = assert_integer(RARRAY(arg)->ptr[12]);
+    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]);
     }
@@ -364,51 +373,14 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
     v->retval = Qnil;
     v->fin = 0;
 
-    v->lex_is_iterator = Qfalse;
-
-    rb_iv_set(parser, "@vstack", v->vstack);
-    if (v->debug) {
-        rb_iv_set(parser, "@tstack", v->tstack);
-    }
-    else {
-        rb_iv_set(parser, "@tstack", Qnil);
-    }
-
-    return vparams;
+    v->iterator_p = Qfalse;
 }
 
 static void
-cparse_params_mark(void *ptr)
-{
-    struct cparse_params *v = (struct cparse_params*)ptr;
-
-    rb_gc_mark(v->value_v);
-    rb_gc_mark(v->parser);
-    rb_gc_mark(v->lexer);
-    rb_gc_mark(v->action_table);
-    rb_gc_mark(v->action_check);
-    rb_gc_mark(v->action_default);
-    rb_gc_mark(v->action_pointer);
-    rb_gc_mark(v->goto_table);
-    rb_gc_mark(v->goto_check);
-    rb_gc_mark(v->goto_default);
-    rb_gc_mark(v->goto_pointer);
-    rb_gc_mark(v->goto_pointer);
-    rb_gc_mark(v->goto_pointer);
-    rb_gc_mark(v->goto_pointer);
-    rb_gc_mark(v->goto_pointer);
-    rb_gc_mark(v->reduce_table);
-    rb_gc_mark(v->token_table);
-    rb_gc_mark(v->state);
-    rb_gc_mark(v->vstack);
-    rb_gc_mark(v->tstack);
-    rb_gc_mark(v->t);
-    rb_gc_mark(v->retval);
-}
-
-static void
-extract_user_token(struct cparse_params *v, VALUE block_args,
-                   VALUE *tok, VALUE *val)
+extract_user_token(v, block_args, tok, val)
+    struct cparse_params *v;
+    VALUE block_args;
+    VALUE *tok, *val;
 {
     if (NIL_P(block_args)) {
         /* EOF */
@@ -420,15 +392,15 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
     if (TYPE(block_args) != T_ARRAY) {
         rb_raise(rb_eTypeError,
                  "%s() %s %s (must be Array[2])",
-                 v->lex_is_iterator ? rb_id2name(v->lexmid) : "next_token",
-                 v->lex_is_iterator ? "yielded" : "returned",
+                 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->lex_is_iterator ? rb_id2name(v->lexmid) : "next_token",
-                 v->lex_is_iterator ? "yielded" : "returned",
+                 v->iterator_p ? rb_id2name(v->lexmid) : "next_token",
+                 v->iterator_p ? "yielded" : "returned",
                  RARRAY(block_args)->len);
     }
     *tok = AREF(block_args, 0);
@@ -443,7 +415,7 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
       case 1: /* yyerror */   \
         goto user_yyerror;    \
       case 2: /* yyaccept */  \
-        D_puts("u accept");   \
+        D(puts("u accept"));  \
         goto accept;          \
       default:                \
         break;                \
@@ -451,86 +423,89 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
 } while (0)
 
 static void
-parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
+parse_main(v, tok, val, resume)
+    struct cparse_params *v;
+    VALUE tok, val;
+    int resume;
 {
-    long i;              /* table index */
-    long act;            /* action type */
-    VALUE act_value;     /* action type, VALUE version */
-    int read_next = 1;   /* true if we need to read next token */
+    long act;
+    long i;
+    int read_next = 1;
+    VALUE vact;
     VALUE tmp;
 
     if (resume)
         goto resume;
     
     while (1) {
-        D_puts("");
-        D_puts("---- enter new loop ----");
-        D_puts("");
+        D(puts("enter new loop"));
 
-        D_printf("(act) k1=%ld\n", v->curstate);
+        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] ok");
+        D(puts("(act) pointer[k1] true"));
         i = NUM2LONG(tmp);
 
-        D_printf("read_next=%d\n", read_next);
-        if (read_next && (v->t != vFINAL_TOKEN)) {
-            if (v->lex_is_iterator) {
-                D_puts("resuming...");
-                if (v->fin) rb_raise(rb_eArgError, "token given after EOF");
-                v->i = i;  /* save i */
-                return;
-              resume:
-                D_puts("resumed");
-                i = v->i;  /* load i */
-            }
-            else {
-                D_puts("next_token");
-                tmp = rb_funcall(v->parser, id_nexttoken, 0);
-                extract_user_token(v, tmp, &tok, &val);
-            }
-            /* convert token */
-            v->t = rb_hash_aref(v->token_table, tok);
-            if (NIL_P(v->t)) {
-                v->t = vERROR_TOKEN;
-            }
-            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);
+        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;
         }
-        read_next = 0;
 
         i += NUM2LONG(v->t);
-        D_printf("(act) i=%ld\n", i);
+        D(printf("(act) i=%ld\n", i));
         if (i < 0) goto notfound;
 
-        act_value = AREF(v->action_table, i);
-        if (NIL_P(act_value)) goto notfound;
-        act = NUM2LONG(act_value);
-        D_printf("(act) table[i]=%ld\n", act);
+        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_printf("(act) check[i]=%ld\n", NUM2LONG(tmp));
 
-        D_puts("(act) found");
+        D(puts("(act) found"));
       act_fixed:
-        D_printf("act=%ld\n", act);
+        act = NUM2LONG(vact);
+        D(printf("act=%ld\n", act));
         goto handle_act;
     
       notfound:
-        D_puts("(act) not found: use default");
-        act_value = AREF(v->action_default, v->curstate);
-        act = NUM2LONG(act_value);
+        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");
+            D(puts("shift"));
             if (v->errstatus > 0) {
                 v->errstatus--;
                 rb_ivar_set(v->parser, id_errstatus, LONG2NUM(v->errstatus));
@@ -539,16 +514,16 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
             read_next = 1;
         }
         else if (act < 0 && act > -(v->reduce_n)) {
-            D_puts("reduce");
+            D(puts("reduce"));
             REDUCE(v, act);
         }
         else if (act == -(v->reduce_n)) {
             goto error;
-          error_recovered:
+          error_return:
             ;   /* goto label requires stmt */
         }
         else if (act == v->shift_n) {
-            D_puts("accept");
+            D(puts("accept"));
             goto accept;
         }
         else {
@@ -571,7 +546,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
 
 
   error:
-    D_printf("error detected, status=%ld\n", v->errstatus);
+    D(printf("error detected, status=%ld\n", v->errstatus));
     if (v->errstatus == 0) {
         v->nerr++;
         rb_funcall(v->parser, id_onerror,
@@ -590,42 +565,42 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
     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);
+    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 error_pop;
-        D_puts("(err) pointer[k1] ok");
+        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 error_pop;
+        D(printf("(err) i=%ld\n", i));
+        if (i < 0) goto e_notfound;
 
-        act_value = AREF(v->action_table, i);
-        if (NIL_P(act_value)) {
-            D_puts("(err) table[i] == nil");
-            goto error_pop;
+        vact = AREF(v->action_table, i);
+        if (NIL_P(vact)) {
+            D(puts("(err) table[i] == nil"));
+            goto e_notfound;
         }
-        act = NUM2LONG(act_value);
-        D_printf("(err) table[i]=%ld\n", act);
+        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 error_pop;
+            D(puts("(err) check[i] == nil"));
+            goto e_notfound;
         }
         if (NUM2LONG(tmp) != v->curstate) {
-            D_puts("(err) check[i] != k1");
-            goto error_pop;
+            D(puts("(err) check[i]!=k1 or nil"));
+            goto e_notfound;
         }
 
-        D_puts("(err) found: can handle error token");
+        D(puts("(err) found: can handle error token"));
+        act = NUM2LONG(vact);
         break;
           
-      error_pop:
-        D_puts("(err) act not found: can't handle error token; pop");
+      e_notfound:
+        D(puts("(err) not found: can't handle error token; pop"));
 
-        if (RARRAY(v->state)->len <= 1) {
+        if (RARRAY(v->state)->len == 0) {
             v->retval = Qnil;
             v->fin = CP_FIN_CANTPOP;
             return;
@@ -642,25 +617,28 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
 
     /* shift/reduce error token */
     if (act > 0 && act < v->shift_n) {
-        D_puts("e shift");
+        D(puts("e shift"));
         SHIFT(v, act, ERROR_TOKEN, val);
     }
     else if (act < 0 && act > -(v->reduce_n)) {
-        D_puts("e reduce");
+        D(puts("e reduce"));
         REDUCE(v, act);
     }
     else if (act == v->shift_n) {
-        D_puts("e accept");
+        D(puts("e accept"));
         goto accept;
     }
     else {
         rb_raise(RaccBug, "[Racc Bug] unknown act value %ld", act);
     }
-    goto error_recovered;
+    goto error_return;
 }
 
 static void
-shift(struct cparse_params *v, long act, VALUE tok, VALUE val)
+shift(v, act, tok, val)
+    struct cparse_params *v;
+    long act;
+    VALUE tok, val;
 {
     PUSH(v->vstack, val);
     if (v->debug) {
@@ -673,23 +651,33 @@ shift(struct cparse_params *v, long act, VALUE tok, VALUE val)
 }
 
 static int
-reduce(struct cparse_params *v, long act)
+reduce(v, act)
+    struct cparse_params *v;
+    long act;
 {
     VALUE code;
     v->ruleno = -act * 3;
-    code = rb_catch("racc_jump", reduce0, v->value_v);
+    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
-reduce0(VALUE val, VALUE data, VALUE self)
+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 = Qundef, tmp_v = Qundef;
+    VALUE tmp, tmp_t, tmp_v;
     long i, k1, k2;
     VALUE goto_state;
 
@@ -744,58 +732,60 @@ reduce0(VALUE val, VALUE data, VALUE self)
 
     /* calculate transition state */
     if (RARRAY(v->state)->len == 0)
-        rb_raise(RaccBug, "state stack unexpectedly empty");
+        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);
+    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);
+    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");
+        D(puts("(goto) table[i] == nil"));
         goto notfound;
     }
-    D_printf("(goto) table[i]=%ld (goto_state)\n", NUM2LONG(goto_state));
+    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");
+        D(puts("(goto) check[i] == nil"));
         goto notfound;
     }
     if (tmp != LONG2NUM(k1)) {
-        D_puts("(goto) check[i] != table[i]");
+        D(puts("(goto) check[i] != table[i]"));
         goto notfound;
     }
-    D_printf("(goto) check[i]=%ld\n", NUM2LONG(tmp));
+    D(printf("(goto) check[i]=%ld\n", NUM2LONG(tmp)));
 
-    D_puts("(goto) found");
+    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");
+    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(void)
+Init_cparse()
 {
-    VALUE Racc, Parser;
+    VALUE Racc;
+    VALUE Parser;
     ID id_racc = rb_intern("Racc");
 
     if (rb_const_defined(rb_cObject, id_racc)) {
@@ -811,7 +801,7 @@ Init_cparse(void)
     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("$originalId: cparse.c,v 1.8 2006/07/06 11:39:46 aamine Exp $"));
+        rb_str_new2("$Id$"));
 
     CparseParams = rb_define_class_under(Racc, "CparseParams", rb_cObject);
 
@@ -821,7 +811,9 @@ Init_cparse(void)
     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");
diff --git a/ext/racc/cparse/extconf.rb b/ext/racc/cparse/extconf.rb
index 8516c2998a..dd953a7e15 100644
--- a/ext/racc/cparse/extconf.rb
+++ b/ext/racc/cparse/extconf.rb
@@ -1,4 +1,4 @@
-# $Id: extconf.rb,v 1.1 2002/03/22 07:20:31 aamine Exp $
+# $Id$
 
 require 'mkmf'
 create_makefile 'racc/cparse'
diff --git a/ext/readline/MANIFEST b/ext/readline/MANIFEST
new file mode 100644
index 0000000000..4dd1d9e1a1
--- /dev/null
+++ b/ext/readline/MANIFEST
@@ -0,0 +1,6 @@
+MANIFEST
+README
+README.ja
+depend
+extconf.rb
+readline.c
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index b67a443dad..b883de3e01 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -1,63 +1,27 @@
 require "mkmf"
 
-$readline_headers = ["stdio.h"]
-
-def have_readline_header(header)
-  if have_header(header)
-    $readline_headers.push(header)
-    return true
-  else
-    return false
-  end
-end
-
-def have_readline_var(var)
-  return have_var(var, $readline_headers)
-end
-
-dir_config('curses')
-dir_config('ncurses')
-dir_config('termcap')
 dir_config("readline")
-enable_libedit = enable_config("libedit")
 have_library("user32", nil) if /cygwin/ === RUBY_PLATFORM
-have_library("ncurses", "tgetnum") ||
-  have_library("termcap", "tgetnum") ||
+have_library("ncurses", "tgetnum") or
+  have_library("termcap", "tgetnum") or
   have_library("curses", "tgetnum")
 
-if enable_libedit
-  unless (have_readline_header("editline/readline.h") ||
-          have_readline_header("readline/readline.h")) &&
-          have_library("edit", "readline")
-    exit
+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
-else
-  unless ((have_readline_header("readline/readline.h") &&
-           have_readline_header("readline/history.h")) &&
-           (have_library("readline", "readline") ||
-            have_library("edit", "readline"))) ||
-            (have_readline_header("editline/readline.h") &&
-             have_library("edit", "readline"))
-    exit
+  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
-
-have_readline_var("rl_filename_completion_function")
-have_readline_var("rl_deprep_term_function")
-have_readline_var("rl_completion_append_character")
-have_readline_var("rl_basic_word_break_characters")
-have_readline_var("rl_completer_word_break_characters")
-have_readline_var("rl_basic_quote_characters")
-have_readline_var("rl_completer_quote_characters")
-have_readline_var("rl_filename_quote_characters")
-have_readline_var("rl_attempted_completion_over")
-have_readline_var("rl_library_version")
-have_readline_var("rl_event_hook")
-have_func("rl_cleanup_after_signal")
-have_func("rl_clear_signals")
-have_func("rl_vi_editing_mode")
-have_func("rl_emacs_editing_mode")
-have_func("rl_clear_signals")
-have_func("replace_history_entry")
-have_func("remove_history")
-create_makefile("readline")
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 4f840ee2c0..fc17dad4f1 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1,47 +1,28 @@
 /* readline.c -- GNU Readline module
    Copyright (C) 1997-2001  Shugo Maeda */
 
-#include "config.h"
 #include <errno.h>
 #include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#ifdef HAVE_READLINE_READLINE_H
+#include <unistd.h>
 #include <readline/readline.h>
-#endif
-#ifdef HAVE_READLINE_HISTORY_H
 #include <readline/history.h>
-#endif
-#ifdef HAVE_EDITLINE_READLINE_H
-#include <editline/readline.h>
-#endif
 
 #include "ruby.h"
-#include "rubyio.h"
 #include "rubysig.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 static VALUE mReadline;
 
 #define TOLOWER(c) (isupper(c) ? tolower(c) : c)
 
 #define COMPLETION_PROC "completion_proc"
 #define COMPLETION_CASE_FOLD "completion_case_fold"
-static ID completion_proc, completion_case_fold;
 
-#ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION
+#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(void);
-static char **readline_attempted_completion_function(const char *text,
-                                                     int start, int end);
-
 static int
 readline_event()
 {
@@ -60,33 +41,22 @@ readline_readline(argc, argv, self)
     char *prompt = NULL;
     char *buff;
     int status;
-    OpenFile *ofp, *ifp;
 
-    rb_secure(4);
     if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
-	SafeStringValue(tmp);
-	prompt = RSTRING(tmp)->ptr;
+	prompt = StringValuePtr(tmp);
     }
 
     if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "stdin closed");
 
-    Check_Type(rb_stdout, T_FILE);
-    GetOpenFile(rb_stdout, ofp);
-    rl_outstream = GetWriteFile(ofp);
-    Check_Type(rb_stdin, T_FILE);
-    GetOpenFile(rb_stdin, ifp);
-    rl_instream = GetReadFile(ifp);
     buff = (char*)rb_protect((VALUE(*)_((VALUE)))readline, (VALUE)prompt,
                               &status);
     if (status) {
-#if defined HAVE_RL_CLEANUP_AFTER_SIGNAL
+#if READLINE_40_OR_LATER
         /* restore terminal mode and signal handler*/
         rl_cleanup_after_signal();
-#elif defined HAVE_RL_DEPREP_TERM_FUNCTION
+#elif READLINE_21_OR_LATER
         /* restore terminal mode */
-	if (rl_deprep_term_function != NULL) /* NULL in libedit. [ruby-dev:29116] */
-	    (*rl_deprep_term_function)();
-	else
+        (*rl_deprep_term_function)();
 #else
         rl_deprep_terminal();
 #endif
@@ -109,18 +79,16 @@ readline_s_set_completion_proc(self, proc)
     VALUE self;
     VALUE proc;
 {
-    rb_secure(4);
     if (!rb_respond_to(proc, rb_intern("call")))
-	rb_raise(rb_eArgError, "argument must respond to `call'");
-    return rb_ivar_set(mReadline, completion_proc, proc);
+	rb_raise(rb_eArgError, "argument have to respond to `call'");
+    return rb_iv_set(mReadline, COMPLETION_PROC, proc);
 }
 
 static VALUE
 readline_s_get_completion_proc(self)
     VALUE self;
 {
-    rb_secure(4);
-    return rb_attr_get(mReadline, completion_proc);
+    return rb_iv_get(mReadline, COMPLETION_PROC);
 }
 
 static VALUE
@@ -128,21 +96,19 @@ readline_s_set_completion_case_fold(self, val)
     VALUE self;
     VALUE val;
 {
-    rb_secure(4);
-    return rb_ivar_set(mReadline, completion_case_fold, val);
+    return rb_iv_set(mReadline, COMPLETION_CASE_FOLD, val);
 }
 
 static VALUE
 readline_s_get_completion_case_fold(self)
     VALUE self;
 {
-    rb_secure(4);
-    return rb_attr_get(mReadline, completion_case_fold);
+    return rb_iv_get(mReadline, COMPLETION_CASE_FOLD);
 }
 
 static char **
 readline_attempted_completion_function(text, start, end)
-    const char *text;
+    char *text;
     int start;
     int end;
 {
@@ -151,13 +117,11 @@ readline_attempted_completion_function(text, start, end)
     int case_fold;
     int i, matches;
 
-    proc = rb_attr_get(mReadline, completion_proc);
+    proc = rb_iv_get(mReadline, COMPLETION_PROC);
     if (NIL_P(proc))
 	return NULL;
-#ifdef HAVE_RL_ATTEMPTED_COMPLETION_OVER
     rl_attempted_completion_over = 1;
-#endif
-    case_fold = RTEST(rb_attr_get(mReadline, completion_case_fold));
+    case_fold = RTEST(rb_iv_get(mReadline, COMPLETION_CASE_FOLD));
     ary = rb_funcall(proc, rb_intern("call"), 1, rb_tainted_str_new2(text));
     if (TYPE(ary) != T_ARRAY)
 	ary = rb_Array(ary);
@@ -173,9 +137,9 @@ readline_attempted_completion_function(text, start, end)
     result[matches + 1] = NULL;
 
     if (matches == 1) {
-        result[0] = strdup(result[1]);
-    }
-    else {
+	result[0] = result[1];
+	result[1] = NULL;
+    } else {
 	register int i = 1;
 	int low = 100000;
 
@@ -211,83 +175,62 @@ static VALUE
 readline_s_vi_editing_mode(self)
     VALUE self;
 {
-#ifdef HAVE_RL_VI_EDITING_MODE
-    rb_secure(4);
     rl_vi_editing_mode(1,0);
     return Qnil;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_VI_EDITING_MODE */
 }
 
 static VALUE
 readline_s_emacs_editing_mode(self)
     VALUE self;
 {
-#ifdef HAVE_RL_EMACS_EDITING_MODE
-    rb_secure(4);
     rl_emacs_editing_mode(1,0);
     return Qnil;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_EMACS_EDITING_MODE */
 }
 
 static VALUE
 readline_s_set_completion_append_character(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
-    rb_secure(4);
-    if (NIL_P(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];
     }
-    else {
-	SafeStringValue(str);
-	if (RSTRING(str)->len == 0) {
-	    rl_completion_append_character = '\0';
-	} else {
-	    rl_completion_append_character = RSTRING(str)->ptr[0];
-	}
-    }
+
     return self;
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETION_APPEND_CHARACTER */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_completion_append_character(self)
     VALUE self;
 {
-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+#ifdef READLINE_21_OR_LATER
     VALUE str;
 
-    rb_secure(4);
     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();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETION_APPEND_CHARACTER */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_set_basic_word_break_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
+#ifdef READLINE_21_OR_LATER
     static char *basic_word_break_characters = NULL;
 
-    rb_secure(4);
-    SafeStringValue(str);
+    StringValue(str);
     if (basic_word_break_characters == NULL) {
 	basic_word_break_characters =
 	    ALLOC_N(char, RSTRING(str)->len + 1);
@@ -299,37 +242,34 @@ readline_s_set_basic_word_break_characters(self, str)
 	    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();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_WORD_BREAK_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_basic_word_break_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
-    rb_secure(4);
+#ifdef READLINE_21_OR_LATER
     if (rl_basic_word_break_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_basic_word_break_characters);
+    return rb_str_new2(rl_basic_word_break_characters);
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_WORD_BREAK_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_set_completer_word_break_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
+#ifdef READLINE_21_OR_LATER
     static char *completer_word_break_characters = NULL;
 
-    rb_secure(4);
-    SafeStringValue(str);
+    StringValue(str);
     if (completer_word_break_characters == NULL) {
 	completer_word_break_characters =
 	    ALLOC_N(char, RSTRING(str)->len + 1);
@@ -341,37 +281,34 @@ readline_s_set_completer_word_break_characters(self, str)
 	    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();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_completer_word_break_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
-    rb_secure(4);
+#ifdef READLINE_21_OR_LATER
     if (rl_completer_word_break_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_completer_word_break_characters);
+    return rb_str_new2(rl_completer_word_break_characters);
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_set_basic_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
+#ifdef READLINE_21_OR_LATER
     static char *basic_quote_characters = NULL;
 
-    rb_secure(4);
-    SafeStringValue(str);
+    StringValue(str);
     if (basic_quote_characters == NULL) {
 	basic_quote_characters =
 	    ALLOC_N(char, RSTRING(str)->len + 1);
@@ -387,34 +324,30 @@ readline_s_set_basic_quote_characters(self, str)
     return self;
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_basic_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
-    rb_secure(4);
+#ifdef READLINE_21_OR_LATER
     if (rl_basic_quote_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_basic_quote_characters);
+    return rb_str_new2(rl_basic_quote_characters);
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_BASIC_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_set_completer_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
+#ifdef READLINE_21_OR_LATER
     static char *completer_quote_characters = NULL;
 
-    rb_secure(4);
-    SafeStringValue(str);
+    StringValue(str);
     if (completer_quote_characters == NULL) {
 	completer_quote_characters =
 	    ALLOC_N(char, RSTRING(str)->len + 1);
@@ -430,34 +363,30 @@ readline_s_set_completer_quote_characters(self, str)
     return self;
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_completer_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
-    rb_secure(4);
+#ifdef READLINE_21_OR_LATER
     if (rl_completer_quote_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_completer_quote_characters);
+    return rb_str_new2(rl_completer_quote_characters);
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_COMPLETER_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_set_filename_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
+#ifdef READLINE_21_OR_LATER
     static char *filename_quote_characters = NULL;
 
-    rb_secure(4);
-    SafeStringValue(str);
+    StringValue(str);
     if (filename_quote_characters == NULL) {
 	filename_quote_characters =
 	    ALLOC_N(char, RSTRING(str)->len + 1);
@@ -473,23 +402,37 @@ readline_s_set_filename_quote_characters(self, str)
     return self;
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_FILENAME_QUOTE_CHARACTERS */
+#endif /* READLINE_21_OR_LATER */
 }
 
 static VALUE
 readline_s_get_filename_quote_characters(self, str)
     VALUE self, str;
 {
-#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
-    rb_secure(4);
+#ifdef READLINE_21_OR_LATER
     if (rl_filename_quote_characters == NULL)
 	return Qnil;
-    return rb_tainted_str_new2(rl_filename_quote_characters);
+    return rb_str_new2(rl_filename_quote_characters);
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
-#endif /* HAVE_RL_FILENAME_QUOTE_CHARACTERS */
+#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
@@ -504,19 +447,18 @@ hist_get(self, index)
     VALUE self;
     VALUE index;
 {
-    HIST_ENTRY *entry;
+    HISTORY_STATE *state;
     int i;
 
-    rb_secure(4);
+    state = history_get_history_state();
     i = NUM2INT(index);
     if (i < 0) {
-        i += history_length;
+        i += state->length;
     }
-    entry = history_get(history_base + i);
-    if (entry == NULL) {
-	rb_raise(rb_eIndexError, "invalid index");
+    if (i < 0 || i > state->length - 1) {
+	rb_raise(rb_eIndexError, "Invalid index");
     }
-    return rb_tainted_str_new2(entry->line);
+    return rb_tainted_str_new2(state->entries[i]->line);
 }
 
 static VALUE
@@ -525,25 +467,20 @@ hist_set(self, index, str)
     VALUE index;
     VALUE str;
 {
-#ifdef HAVE_REPLACE_HISTORY_ENTRY
-    HIST_ENTRY *entry;
+    HISTORY_STATE *state;
+    VALUE s = str;
     int i;
 
-    rb_secure(4);
+    state = history_get_history_state();
     i = NUM2INT(index);
-    SafeStringValue(str);
     if (i < 0) {
-        i += history_length;
+        i += state->length;
     }
-    entry = replace_history_entry(i, RSTRING(str)->ptr, NULL);
-    if (entry == NULL) {
-	rb_raise(rb_eIndexError, "invalid index");
+    if (i < 0 || i > state->length - 1) {
+	rb_raise(rb_eIndexError, "Invalid index");
     }
+    replace_history_entry(i, StringValuePtr(s), NULL);
     return str;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif
 }
 
 static VALUE
@@ -551,9 +488,7 @@ hist_push(self, str)
     VALUE self;
     VALUE str;
 {
-    rb_secure(4);
-    SafeStringValue(str);
-    add_history(RSTRING(str)->ptr);
+    add_history(StringValuePtr(str));
     return self;
 }
 
@@ -565,45 +500,22 @@ hist_push_method(argc, argv, self)
 {
     VALUE str;
     
-    rb_secure(4);
     while (argc--) {
 	str = *argv++;
-	SafeStringValue(str);
-	add_history(RSTRING(str)->ptr);
+	add_history(StringValuePtr(str));
     }
     return self;
 }
 
 static VALUE
-rb_remove_history(index)
-    int index;
-{
-#ifdef HAVE_REMOVE_HISTORY
-    HIST_ENTRY *entry;
-    VALUE val;
-
-    rb_secure(4);
-    entry = remove_history(index);
-    if (entry) {
-        val = rb_tainted_str_new2(entry->line);
-        free(entry->line);
-        free(entry);
-        return val;
-    }
-    return Qnil;
-#else
-    rb_notimplement();
-    return Qnil; /* not reached */
-#endif
-}
-
-static VALUE
 hist_pop(self)
     VALUE self;
 {
-    rb_secure(4);
-    if (history_length > 0) {
-	return rb_remove_history(history_length - 1);
+    HISTORY_STATE *state;
+
+    state = history_get_history_state();
+    if (state->length > 0) {
+	return rb_remove_history(state->length - 1);
     } else {
 	return Qnil;
     }
@@ -613,8 +525,10 @@ static VALUE
 hist_shift(self)
     VALUE self;
 {
-    rb_secure(4);
-    if (history_length > 0) {
+    HISTORY_STATE *state;
+
+    state = history_get_history_state();
+    if (state->length > 0) {
 	return rb_remove_history(0);
     } else {
 	return Qnil;
@@ -625,15 +539,12 @@ static VALUE
 hist_each(self)
     VALUE self;
 {
-    HIST_ENTRY *entry;
+    HISTORY_STATE *state;
     int i;
 
-    rb_secure(4);
-    for (i = 0; i < history_length; i++) {
-        entry = history_get(history_base + i);
-        if (entry == NULL)
-            break;
-	rb_yield(rb_tainted_str_new2(entry->line));
+    state = history_get_history_state();
+    for (i = 0; i < state->length; i++) {
+	rb_yield(rb_tainted_str_new2(state->entries[i]->line));
     }
     return self;
 }
@@ -642,16 +553,23 @@ static VALUE
 hist_length(self)
     VALUE self;
 {
-    rb_secure(4);
-    return INT2NUM(history_length);
+    HISTORY_STATE *state;
+
+    state = history_get_history_state();
+    return INT2NUM(state->length);
 }
 
 static VALUE
 hist_empty_p(self)
     VALUE self;
 {
-    rb_secure(4);
-    return history_length == 0 ? Qtrue : Qfalse;
+    HISTORY_STATE *state;
+
+    state = history_get_history_state();
+    if (state->length == 0)
+	return Qtrue;
+    else
+	return Qfalse;
 }
 
 static VALUE
@@ -659,14 +577,15 @@ hist_delete_at(self, index)
     VALUE self;
     VALUE index;
 {
+    HISTORY_STATE *state;
     int i;
 
-    rb_secure(4);
+    state = history_get_history_state();
     i = NUM2INT(index);
     if (i < 0)
-        i += history_length;
-    if (i < 0 || i > history_length - 1) {
-	rb_raise(rb_eIndexError, "invalid index");
+        i += state->length;
+    if (i < 0 || i > state->length - 1) {
+	rb_raise(rb_eIndexError, "Invalid index");
     }
     return rb_remove_history(i);
 }
@@ -735,9 +654,6 @@ Init_readline()
 
     using_history();
 
-    completion_proc = rb_intern(COMPLETION_PROC);
-    completion_case_fold = rb_intern(COMPLETION_CASE_FOLD);
-
     mReadline = rb_define_module("Readline");
     rb_define_module_function(mReadline, "readline",
 			      readline_readline, -1);
@@ -790,6 +706,7 @@ Init_readline()
     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);
@@ -803,18 +720,15 @@ Init_readline()
     rb_define_singleton_method(ucomp, "call",
 			       username_completion_proc_call, 1);
     rb_define_const(mReadline, "USERNAME_COMPLETION_PROC", ucomp);
-#if defined HAVE_RL_LIBRARY_VERSION
+#if 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
 
-    rl_attempted_completion_function = readline_attempted_completion_function;
-#ifdef HAVE_RL_EVENT_HOOK
+    rl_attempted_completion_function
+	= (CPPFunction *) readline_attempted_completion_function;
     rl_event_hook = readline_event;
-#endif
-#ifdef HAVE_RL_CLEAR_SIGNALS
     rl_clear_signals();
-#endif
 }
diff --git a/ext/sdbm/MANIFEST b/ext/sdbm/MANIFEST
new file mode 100644
index 0000000000..6e1dc6bebd
--- /dev/null
+++ b/ext/sdbm/MANIFEST
@@ -0,0 +1,7 @@
+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 7ffcf8579c..d8bfae80b2 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -8,7 +8,7 @@
  */
 
 #ifndef lint
-/*char sdbm_rcsid[] = "$Id: _sdbm.c,v 1.5.2.1 2005/09/08 05:59:41 matz Exp $";*/
+/*char sdbm_rcsid[] = "$Id$";*/
 #endif
 
 #include "sdbm.h"
@@ -71,7 +71,7 @@ static int   duppair proto((char *, datum));
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef DOSISH
+#ifdef MSDOS
 #include <io.h>
 #endif
 #include <sys/types.h>
@@ -103,7 +103,7 @@ static int   duppair proto((char *, datum));
 /*
  * externals
  */
-#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno)
+#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__
 extern int errno;
 #endif
 
@@ -626,7 +626,7 @@ register DBM *db;
  */
 
 #ifndef lint
-/*char pair_rcsid[] = "$Id: _sdbm.c,v 1.5.2.1 2005/09/08 05:59:41 matz Exp $";*/
+/*char pair_rcsid[] = "$Id$";*/
 #endif
 
 #ifndef BSD42
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index ef4fb8ffbf..f20e3cfa58 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -2,8 +2,8 @@
 
   sdbminit.c -
 
-  $Author: ocean $
-  $Date: 2005/06/25 05:42:41 $
+  $Author$
+  $Date$
   created at: Fri May  7 08:34:24 JST 1999
 
   Copyright (C) 1995-2001 Yukihiro Matsumoto
@@ -31,15 +31,9 @@ closed_sdbm()
 
 #define GetDBM(obj, dbmp) {\
     Data_Get_Struct(obj, struct dbmdata, dbmp);\
-    if (dbmp == 0) closed_sdbm();\
     if (dbmp->di_dbm == 0) closed_sdbm();\
 }
 
-#define GetDBM2(obj, data, dbm) {\
-    GetDBM(obj, data);\
-    (dbm) = dbmp->di_dbm;\
-}
-
 static void
 free_sdbm(dbmp)
     struct dbmdata *dbmp;
@@ -62,21 +56,6 @@ fsdbm_close(obj)
     return Qnil;
 }
 
-static VALUE
-fsdbm_closed(obj)
-    VALUE obj;
-{
-    struct dbmdata *dbmp;
-
-    Data_Get_Struct(obj, struct dbmdata, dbmp);
-    if (dbmp == 0)
-	return Qtrue;
-    if (dbmp->di_dbm == 0)
-	return Qtrue;
-
-    return Qfalse;
-}
-
 static VALUE fsdbm_alloc _((VALUE));
 static VALUE
 fsdbm_alloc(klass)
@@ -159,7 +138,8 @@ fsdbm_fetch(obj, keystr, ifnone)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     value = sdbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (ifnone == Qnil && rb_block_given_p())
@@ -204,7 +184,8 @@ fsdbm_index(obj, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    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 &&
@@ -246,24 +227,21 @@ fsdbm_select(argc, argv, obj)
         struct dbmdata *dbmp;
 
 	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
 	}
-        GetDBM2(obj, dbmp, dbm);
+        GetDBM(obj, dbmp);
+        dbm = dbmp->di_dbm;
+
         for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-            VALUE assoc, v;
+            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));
-	    v = rb_yield(assoc);
-	    if (RTEST(v)) {
-		rb_ary_push(new, assoc);
-	    }
-	    GetDBM2(obj, dbmp, dbm);
+            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));
         }
@@ -273,30 +251,6 @@ fsdbm_select(argc, argv, obj)
 }
 
 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));
-    }
-
-    return new;
-}
-
-static void
-fdbm_modify(obj)
-    VALUE obj;
-{
-    rb_secure(4);
-    if (OBJ_FROZEN(obj)) rb_error_frozen("SDBM");
-}
-
-static VALUE
 fsdbm_delete(obj, keystr)
     VALUE obj, keystr;
 {
@@ -305,12 +259,13 @@ fsdbm_delete(obj, keystr)
     DBM *dbm;
     VALUE valstr;
 
-    fdbm_modify(obj);
+    rb_secure(4);
     StringValue(keystr);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
 
     value = sdbm_fetch(dbm, key);
@@ -341,8 +296,10 @@ fsdbm_shift(obj)
     DBM *dbm;
     VALUE keystr, valstr;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     key = sdbm_firstkey(dbm); 
     if (!key.dptr) return Qnil;
     val = sdbm_fetch(dbm, key);
@@ -367,8 +324,9 @@ fsdbm_delete_if(obj)
     VALUE ret, ary = rb_ary_new();
     int i, status = 0, n;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    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)) {
@@ -378,12 +336,10 @@ fsdbm_delete_if(obj)
         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);
-	GetDBM2(obj, dbmp, dbm);
     }
 
     for (i = 0; i < RARRAY(ary)->len; i++) {
 	keystr = RARRAY(ary)->ptr[i];
-	StringValue(keystr);
 	key.dptr = RSTRING(keystr)->ptr;
 	key.dsize = RSTRING(keystr)->len;
 	if (sdbm_delete(dbm, key)) {
@@ -404,8 +360,9 @@ fsdbm_clear(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    rb_secure(4);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
     while (key = sdbm_firstkey(dbm), key.dptr) {
 	if (sdbm_delete(dbm, key)) {
@@ -427,7 +384,8 @@ fsdbm_invert(obj)
     VALUE keystr, valstr;
     VALUE hash = rb_hash_new();
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     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);
@@ -490,18 +448,21 @@ fsdbm_store(obj, keystr, valstr)
 	return Qnil;
     }
 
-    fdbm_modify(obj);
-    StringValue(keystr);
-    StringValue(valstr);
+    rb_secure(4);
+    keystr = rb_obj_as_string(keystr);
 
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
+    if (NIL_P(valstr)) return fsdbm_delete(obj, keystr);
+
+    valstr = rb_obj_as_string(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     dbmp->di_size = -1;
+    dbm = dbmp->di_dbm;
     if (sdbm_store(dbm, key, val, DBM_REPLACE)) {
 #ifdef HAVE_DBM_CLAERERR
 	sdbm_clearerr(dbm);
@@ -522,8 +483,9 @@ fsdbm_length(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+    dbm = dbmp->di_dbm;
 
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	i++;
@@ -565,11 +527,11 @@ fsdbm_each_value(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
 	rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
-	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -582,10 +544,10 @@ fsdbm_each_key(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
-	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -599,13 +561,14 @@ fsdbm_each_pair(obj)
     struct dbmdata *dbmp;
     VALUE keystr, valstr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     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);
 	rb_yield(rb_assoc_new(keystr, valstr));
-	GetDBM2(obj, dbmp, dbm);
     }
 
     return obj;
@@ -620,7 +583,9 @@ fsdbm_keys(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	rb_ary_push(ary, rb_tainted_str_new(key.dptr, key.dsize));
@@ -638,7 +603,9 @@ fsdbm_values(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
@@ -660,7 +627,8 @@ fsdbm_has_key(obj, keystr)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     val = sdbm_fetch(dbm, key);
     if (val.dptr) return Qtrue;
     return Qfalse;
@@ -678,7 +646,8 @@ fsdbm_has_value(obj, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    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 &&
@@ -697,7 +666,9 @@ fsdbm_to_a(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
@@ -717,7 +688,9 @@ fsdbm_to_hash(obj)
     DBM *dbm;
     VALUE hash;
 
-    GetDBM2(obj, dbmp, dbm);
+    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);
@@ -747,7 +720,6 @@ Init_sdbm()
 
     rb_define_method(rb_cDBM, "initialize", fsdbm_initialize, -1);
     rb_define_method(rb_cDBM, "close", fsdbm_close, 0);
-    rb_define_method(rb_cDBM, "closed?", fsdbm_closed, 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);
@@ -756,7 +728,6 @@ Init_sdbm()
     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);
diff --git a/test/sdbm/test_sdbm.rb b/ext/sdbm/testsdbm.rb
index 8789d719dd..550b47a008 100644
--- a/test/sdbm/test_sdbm.rb
+++ b/ext/sdbm/testsdbm.rb
@@ -1,54 +1,64 @@
-require 'test/unit'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 
-begin
-  require 'sdbm'
-rescue LoadError
+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
 
-class TestSDBM < Test::Unit::TestCase
+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)
-    ObjectSpace.each_object(SDBM) do |obj|
-      obj.close unless obj.closed?
-    end
+    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_equal(expect, sdbm.size)
+    assert_equals(expect, sdbm.size)
     n = 0
     sdbm.each { n+=1 }
-    assert_equal(expect, n)
+    assert_equals(expect, n)
     if expect == 0
-      assert_equal(true, sdbm.empty?)
+      assert_equals(true, sdbm.empty?)
     else
-      assert_equal(false, sdbm.empty?)
-    end
-  end
-
-  def have_fork?
-    begin
-      fork{}
-      true
-    rescue NotImplementedError
-      false
+      assert_equals(false, sdbm.empty?)
     end
   end
 
   def test_version
-    assert(! SDBM.const_defined?(:VERSION))
+    STDERR.print SDBM::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_equal(foo, true)
+    assert_equals(foo, true)
     assert_nil(sdbm.close)
   end
   def test_s_open_no_create
@@ -57,14 +67,14 @@ class TestSDBM < Test::Unit::TestCase
     sdbm.close if sdbm
   end
   def test_s_open_with_block
-    assert_equal(SDBM.open("tmptest_sdbm") { :foo }, :foo)
+    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_raise(Errno::EWOULDBLOCK) {
+    assert_exception(Errno::EWOULDBLOCK) {
       begin
 	SDBM.open("tmptest_sdbm", 0644)
       rescue Errno::EAGAIN
@@ -79,7 +89,6 @@ class TestSDBM < Test::Unit::TestCase
     if not defined? SDBM::NOLOCK
       return
     end
-    return unless have_fork?	# snip this test
 
     fork() {
       assert_instance_of(SDBM, sdbm  = SDBM.open("tmptest_sdbm", 0644,
@@ -118,9 +127,8 @@ class TestSDBM < Test::Unit::TestCase
   end
 
   def test_s_open_error
-    return if /(ms|bcc)win|mingw|djgpp/ =~ RUBY_PLATFORM
     assert_instance_of(SDBM, sdbm = SDBM.open("tmptest_sdbm", 0))
-    assert_raise(Errno::EACCES) {
+    assert_exception(Errno::EACCES) {
       SDBM.open("tmptest_sdbm", 0)
     }
     sdbm.close
@@ -131,76 +139,76 @@ class TestSDBM < Test::Unit::TestCase
     assert_nil(sdbm.close)
 
     # closed SDBM file
-    assert_raise(SDBMError) { sdbm.close }
+    assert_exception(SDBMError) { sdbm.close }
   end
 
   def test_aref
-    assert_equal('bar', @sdbm['foo'] = 'bar')
-    assert_equal('bar', @sdbm['foo'])
+    assert_equals('bar', @sdbm['foo'] = 'bar')
+    assert_equals('bar', @sdbm['foo'])
 
     assert_nil(@sdbm['bar'])
   end
 
   def test_fetch
-    assert_equal('bar', @sdbm['foo']='bar')
-    assert_equal('bar', @sdbm.fetch('foo'))
+    assert_equals('bar', @sdbm['foo']='bar')
+    assert_equals('bar', @sdbm.fetch('foo'))
 
     # key not found
-    assert_raise(IndexError) {
+    assert_exception(IndexError) {
       @sdbm.fetch('bar')
     }
 
     # test for `ifnone' arg
-    assert_equal('baz', @sdbm.fetch('bar', 'baz'))
+    assert_equals('baz', @sdbm.fetch('bar', 'baz'))
 
     # test for `ifnone' block
-    assert_equal('foobar', @sdbm.fetch('bar') {|key| 'foo' + key })
+    assert_equals('foobar', @sdbm.fetch('bar') {|key| 'foo' + key })
   end
 
   def test_aset
     num = 0
     2.times {|i|
-      assert_equal('foo', @sdbm['foo'] = 'foo')
-      assert_equal('foo', @sdbm['foo'])
-      assert_equal('bar', @sdbm['foo'] = 'bar')
-      assert_equal('bar', @sdbm['foo'])
+      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_equal(num, @sdbm.size)
+      assert_equals(num, @sdbm.size)
 
       # assign nil
-      assert_equal('', @sdbm['bar'] = '')
-      assert_equal('', @sdbm['bar'])
+      assert_equals('', @sdbm['bar'] = '')
+      assert_equals('', @sdbm['bar'])
 
       num += 1 if i == 0
-      assert_equal(num, @sdbm.size)
+      assert_equals(num, @sdbm.size)
 
       # empty string
-      assert_equal('', @sdbm[''] = '')
-      assert_equal('', @sdbm[''])
+      assert_equals('', @sdbm[''] = '')
+      assert_equals('', @sdbm[''])
 
       num += 1 if i == 0
-      assert_equal(num, @sdbm.size)
+      assert_equals(num, @sdbm.size)
 
       # Fixnum
-      assert_equal('200', @sdbm['100'] = '200')
-      assert_equal('200', @sdbm['100'])
+      assert_equals('200', @sdbm['100'] = '200')
+      assert_equals('200', @sdbm['100'])
 
       num += 1 if i == 0
-      assert_equal(num, @sdbm.size)
+      assert_equals(num, @sdbm.size)
 
       # Big key and value
-      assert_equal('y' * 100, @sdbm['x' * 100] = 'y' * 100)
-      assert_equal('y' * 100, @sdbm['x' * 100])
+      assert_equals('y' * 100, @sdbm['x' * 100] = 'y' * 100)
+      assert_equals('y' * 100, @sdbm['x' * 100])
 
       num += 1 if i == 0
-      assert_equal(num, @sdbm.size)
+      assert_equals(num, @sdbm.size)
     }
   end
 
   def test_index
-    assert_equal('bar', @sdbm['foo'] = 'bar')
-    assert_equal('foo', @sdbm.index('bar'))
+    assert_equals('bar', @sdbm['foo'] = 'bar')
+    assert_equals('foo', @sdbm.index('bar'))
     assert_nil(@sdbm['bar'])
   end
 
@@ -208,14 +216,14 @@ class TestSDBM < Test::Unit::TestCase
     keys = %w(foo bar baz)
     values = %w(FOO BAR BAZ)
     @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-    assert_equal(values.reverse, @sdbm.indexes(*keys.reverse))
+    assert_equals(values.reverse, @sdbm.indexes(*keys.reverse))
   end
 
-  def test_values_at
+  def test_select
     keys = %w(foo bar baz)
     values = %w(FOO BAR BAZ)
     @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
-    assert_equal(values.reverse, @sdbm.values_at(*keys.reverse))
+    assert_equals(values.reverse, @sdbm.select(*keys.reverse))
   end
 
   def test_select_with_block
@@ -223,37 +231,37 @@ class TestSDBM < Test::Unit::TestCase
     values = %w(FOO BAR BAZ)
     @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
     ret = @sdbm.select {|k,v|
-      assert_equal(k.upcase, v)
+      assert_equals(k.upcase, v)
       k != "bar"
     }
-    assert_equal([['baz', 'BAZ'], ['foo', 'FOO']],
+    assert_equals([['baz', 'BAZ'], ['foo', 'FOO']],
 		  ret.sort)
   end
 
   def test_length
     num = 10
-    assert_equal(0, @sdbm.size)
+    assert_equals(0, @sdbm.size)
     num.times {|i|
       i = i.to_s
       @sdbm[i] = i
     }
-    assert_equal(num, @sdbm.size)
+    assert_equals(num, @sdbm.size)
 
     @sdbm.shift
 
-    assert_equal(num - 1, @sdbm.size)
+    assert_equals(num - 1, @sdbm.size)
   end
 
   def test_empty?
-    assert_equal(true, @sdbm.empty?)
+    assert_equals(true, @sdbm.empty?)
     @sdbm['foo'] = 'FOO'
-    assert_equal(false, @sdbm.empty?)
+    assert_equals(false, @sdbm.empty?)
   end
 
   def test_each_pair
     n = 0
     @sdbm.each_pair { n += 1 }
-    assert_equal(0, n)
+    assert_equals(0, n)
 
     keys = %w(foo bar baz)
     values = %w(FOO BAR BAZ)
@@ -263,18 +271,18 @@ class TestSDBM < Test::Unit::TestCase
     n = 0
     ret = @sdbm.each_pair {|key, val|
       assert_not_nil(i = keys.index(key))
-      assert_equal(val, values[i])
+      assert_equals(val, values[i])
 
       n += 1
     }
-    assert_equal(keys.size, n)
-    assert_equal(@sdbm, ret)
+    assert_equals(keys.size, n)
+    assert_equals(@sdbm, ret)
   end
 
   def test_each_value
     n = 0
     @sdbm.each_value { n += 1 }
-    assert_equal(0, n)
+    assert_equals(0, n)
 
     keys = %w(foo bar baz)
     values = %w(FOO BAR BAZ)
@@ -285,18 +293,18 @@ class TestSDBM < Test::Unit::TestCase
     ret = @sdbm.each_value {|val|
       assert_not_nil(key = @sdbm.index(val))
       assert_not_nil(i = keys.index(key))
-      assert_equal(val, values[i])
+      assert_equals(val, values[i])
 
       n += 1
     }
-    assert_equal(keys.size, n)
-    assert_equal(@sdbm, ret)
+    assert_equals(keys.size, n)
+    assert_equals(@sdbm, ret)
   end
 
   def test_each_key
     n = 0
     @sdbm.each_key { n += 1 }
-    assert_equal(0, n)
+    assert_equals(0, n)
 
     keys = %w(foo bar baz)
     values = %w(FOO BAR BAZ)
@@ -306,24 +314,24 @@ class TestSDBM < Test::Unit::TestCase
     n = 0
     ret = @sdbm.each_key {|key|
       assert_not_nil(i = keys.index(key))
-      assert_equal(@sdbm[key], values[i])
+      assert_equals(@sdbm[key], values[i])
 
       n += 1
     }
-    assert_equal(keys.size, n)
-    assert_equal(@sdbm, ret)
+    assert_equals(keys.size, n)
+    assert_equals(@sdbm, ret)
   end
 
   def test_keys
-    assert_equal([], @sdbm.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_equal(keys.sort, @sdbm.keys.sort)
-    assert_equal(values.sort, @sdbm.values.sort)
+    assert_equals(keys.sort, @sdbm.keys.sort)
+    assert_equals(values.sort, @sdbm.values.sort)
   end
 
   def test_values
@@ -332,7 +340,7 @@ class TestSDBM < Test::Unit::TestCase
 
   def test_shift
     assert_nil(@sdbm.shift)
-    assert_equal(0, @sdbm.size)
+    assert_equals(0, @sdbm.size)
 
     keys = %w(foo bar baz)
     values = %w(FOO BAR BAZ)
@@ -345,11 +353,11 @@ class TestSDBM < Test::Unit::TestCase
       ret_keys.push ret[0]
       ret_values.push ret[1]
 
-      assert_equal(keys.size - ret_keys.size, @sdbm.size)
+      assert_equals(keys.size - ret_keys.size, @sdbm.size)
     end
 
-    assert_equal(keys.sort, ret_keys.sort)
-    assert_equal(values.sort, ret_values.sort)
+    assert_equals(keys.sort, ret_keys.sort)
+    assert_equals(values.sort, ret_values.sort)
   end
 
   def test_delete
@@ -358,28 +366,28 @@ class TestSDBM < Test::Unit::TestCase
     key = keys[1]
 
     assert_nil(@sdbm.delete(key))
-    assert_equal(0, @sdbm.size)
+    assert_equals(0, @sdbm.size)
 
     @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
 
-    assert_equal('BAR', @sdbm.delete(key))
+    assert_equals('BAR', @sdbm.delete(key))
     assert_nil(@sdbm[key])
-    assert_equal(2, @sdbm.size)
+    assert_equals(2, @sdbm.size)
 
     assert_nil(@sdbm.delete(key))
   end
   def test_delete_with_block
     key = 'no called block'
     @sdbm[key] = 'foo'
-    assert_equal('foo', @sdbm.delete(key) {|k| k.replace 'called block'})
-    assert_equal('no called block', key)
-    assert_equal(0, @sdbm.size)
+    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_equal(:blockval,
+    assert_equals(:blockval,
 		  @sdbm.delete(key) {|k| k.replace 'called block'; :blockval})
-    assert_equal('called block', key)
-    assert_equal(0, @sdbm.size)
+    assert_equals('called block', key)
+    assert_equals(0, @sdbm.size)
   end
 
   def test_delete_if
@@ -387,11 +395,11 @@ class TestSDBM < Test::Unit::TestCase
     100.times {@sdbm[v] = v; v = v.next}
 
     ret = @sdbm.delete_if {|key, val| key.to_i < 50}
-    assert_equal(@sdbm, ret)
+    assert_equals(@sdbm, ret)
     check_size(50, @sdbm)
 
     ret = @sdbm.delete_if {|key, val| key.to_i >= 50}
-    assert_equal(@sdbm, ret)
+    assert_equals(@sdbm, ret)
     check_size(0, @sdbm)
 
     # break
@@ -404,7 +412,7 @@ class TestSDBM < Test::Unit::TestCase
       n+=1
       true
     }
-    assert_equal(51, n)
+    assert_equals(51, n)
     check_size(49, @sdbm)
 
     @sdbm.clear
@@ -422,7 +430,7 @@ class TestSDBM < Test::Unit::TestCase
       }
     rescue
     end
-    assert_equal(51, n)
+    assert_equals(51, n)
     check_size(49, @sdbm)
   end
 
@@ -432,30 +440,30 @@ class TestSDBM < Test::Unit::TestCase
 
     hash = @sdbm.reject {|key, val| key.to_i < 50}
     assert_instance_of(Hash, hash)
-    assert_equal(100, @sdbm.size)
+    assert_equals(100, @sdbm.size)
 
-    assert_equal(50, hash.size)
+    assert_equals(50, hash.size)
     hash.each_pair {|key,val|
-      assert_equal(false, key.to_i < 50)
-      assert_equal(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_equal(true, hash.empty?)
+    assert_equals(true, hash.empty?)
   end
 
   def test_clear
     v = "1"
     100.times {v = v.next; @sdbm[v] = v}
 
-    assert_equal(@sdbm, @sdbm.clear)
+    assert_equals(@sdbm, @sdbm.clear)
 
     # validate SDBM#size
     i = 0
     @sdbm.each { i += 1 }
-    assert_equal(@sdbm.size, i)
-    assert_equal(0, i)
+    assert_equals(@sdbm.size, i)
+    assert_equals(0, i)
   end
 
   def test_invert
@@ -464,9 +472,9 @@ class TestSDBM < Test::Unit::TestCase
 
     hash = @sdbm.invert
     assert_instance_of(Hash, hash)
-    assert_equal(100, hash.size)
+    assert_equals(100, hash.size)
     hash.each_pair {|key, val|
-      assert_equal(key.to_i, val.to_i)
+      assert_equals(key.to_i, val.to_i)
     }
   end
 
@@ -477,9 +485,9 @@ class TestSDBM < Test::Unit::TestCase
 
     @sdbm["101"] = "101"
     @sdbm.update hash
-    assert_equal(101, @sdbm.size)
+    assert_equals(101, @sdbm.size)
     @sdbm.each_pair {|key, val|
-      assert_equal(key.to_i, val.to_i)
+      assert_equals(key.to_i, val.to_i)
     }
   end
 
@@ -490,22 +498,22 @@ class TestSDBM < Test::Unit::TestCase
 
     @sdbm["101"] = "101"
     @sdbm.replace hash
-    assert_equal(100, @sdbm.size)
+    assert_equals(100, @sdbm.size)
     @sdbm.each_pair {|key, val|
-      assert_equal(key.to_i, val.to_i)
+      assert_equals(key.to_i, val.to_i)
     }
   end
 
   def test_haskey?
-    assert_equal('bar', @sdbm['foo']='bar')
-    assert_equal(true,  @sdbm.has_key?('foo'))
-    assert_equal(false, @sdbm.has_key?('bar'))
+    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_equal('bar', @sdbm['foo']='bar')
-    assert_equal(true,  @sdbm.has_value?('bar'))
-    assert_equal(false, @sdbm.has_value?('foo'))
+    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
@@ -514,9 +522,9 @@ class TestSDBM < Test::Unit::TestCase
 
     ary = @sdbm.to_a
     assert_instance_of(Array, ary)
-    assert_equal(100, ary.size)
+    assert_equals(100, ary.size)
     ary.each {|key,val|
-      assert_equal(key.to_i, val.to_i)
+      assert_equals(key.to_i, val.to_i)
     }
   end
 
@@ -526,9 +534,23 @@ class TestSDBM < Test::Unit::TestCase
 
     hash = @sdbm.to_hash
     assert_instance_of(Hash, hash)
-    assert_equal(100, hash.size)
+    assert_equals(100, hash.size)
     hash.each {|key,val|
-      assert_equal(key.to_i, val.to_i)
+      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/MANIFEST b/ext/socket/MANIFEST
new file mode 100644
index 0000000000..616d459d92
--- /dev/null
+++ b/ext/socket/MANIFEST
@@ -0,0 +1,8 @@
+MANIFEST
+addrinfo.h
+depend
+extconf.rb
+getaddrinfo.c
+getnameinfo.c
+sockport.h
+socket.c
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 41b715e0af..6b03307f97 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -1,16 +1,16 @@
 require 'mkmf'
 
+$CPPFLAGS += " -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/
   test_func = "WSACleanup"
-  if with_config("winsock2")
-    have_library("ws2_32", "WSACleanup")
-  else
-    have_library("wsock32", "WSACleanup")
-  end
+  have_library("wsock32", "WSACleanup")
+  have_func("closesocket")
 when /cygwin/
   test_func = "socket"
 when /beos/
@@ -26,18 +26,10 @@ else
   have_library("socket", "socket")
 end
 
-unless $mswin or $bccwin or $mingw
-  headers = %w<sys/types.h netdb.h string.h sys/socket.h netinet/in.h>
-end
-if /solaris/ =~ RUBY_PLATFORM and !try_compile("")
-  # bug of gcc 3.0 on Solaris 8 ?
-  headers << "sys/feature_tests.h"
-end
-
-ipv6 = false
+$ipv6 = false
 default_ipv6 = /cygwin/ !~ RUBY_PLATFORM
 if enable_config("ipv6", default_ipv6)
-  if checking_for("ipv6") {try_link(<<EOF)}
+  if try_link(<<EOF)
 #include <sys/types.h>
 #include <sys/socket.h>
 main()
@@ -45,88 +37,152 @@ main()
   socket(AF_INET6, SOCK_STREAM, 0);
 }
 EOF
-    $defs << "-DENABLE_IPV6" << "-DINET6"
-    ipv6 = true
+    $CFLAGS+=" -DENABLE_IPV6"
+    $ipv6 = true
   end
 end
 
-if ipv6
-  ipv6lib = nil
-  class << (fmt = "unknown")
-    def %(s) s || self end
+$ipv6type = nil
+$ipv6lib = nil
+$ipv6libdir = nil
+$ipv6trylibc = nil
+if $ipv6
+  if macro_defined?("IPV6_INRIA_VERSION", <<EOF)
+#include <netinet/in.h>
+EOF
+    $ipv6type = "inria"
+    $CFLAGS="-DINET6 "+$CFLAGS
+  elsif macro_defined?("__KAME__", <<EOF)
+#include <netinet/in.h>
+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)
+#include <sys/param.h>
+EOF
+    $ipv6type = "toshiba"
+    $ipv6lib="inet6"
+    $ipv6libdir="/usr/local/v6/lib"
+    $CFLAGS="-DINET6 "+$CFLAGS
+  elsif macro_defined?("__V6D__", <<EOF)
+#include </usr/local/v6/include/sys/v6config.h>
+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)
+#include <sys/param.h>
+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
-  idirs, ldirs = dir_config("inet6", %w[/usr/inet6 /usr/local/v6].find {|d| File.directory?(d)})
-  checking_for("ipv6 type", fmt) do
-    if have_macro("IPV6_INRIA_VERSION", "netinet/in.h")
-      "inria"
-    elsif have_macro("__KAME__", "netinet/in.h")
-      have_library(ipv6lib = "inet6")
-      "kame"
-    elsif have_macro("_TOSHIBA_INET6", "sys/param.h")
-      have_library(ipv6lib = "inet6") and "toshiba"
-    elsif have_macro("__V6D__", "sys/v6config.h")
-      have_library(ipv6lib = "v6") and "v6d"
-    elsif have_macro("_ZETA_MINAMI_INET6", "sys/param.h")
-      have_library(ipv6lib = "inet6") and "zeta"
-    elsif ipv6lib = with_config("ipv6-lib")
-      warn <<EOS
---with-ipv6-lib and --with-ipv6-libdir option will be obsolete, use
---with-inet6lib and --with-inet6-{include,lib} options instead.
-EOS
-      find_library(ipv6lib, nil, with_config("ipv6-libdir", ldirs)) and
-        ipv6lib
-    elsif have_library("inet6")
-      "inet6"
-    end
-  end or not ipv6lib or abort <<EOS
+  
+  if $ipv6lib
+    if File.directory? $ipv6libdir and File.exist? "#{$ipv6libdir}/lib#{$ipv6lib}.a"
+      $LOCAL_LIBS = " -L#$ipv6libdir -l#$ipv6lib"
+    elsif !$ipv6trylibc
+      print <<EOS
 
-Fatal: no #{ipv6lib} library found.  cannot continue.
-You need to fetch lib#{ipv6lib}.a from appropriate
+Fatal: no #$ipv6lib library found.  cannot continue.
+You need to fetch lib#{$ipv6lib}.a from appropriate
 ipv6 kit and compile beforehand.
 EOS
+      exit
+    end
+  end
 end
 
-if have_struct_member("struct sockaddr_in", "sin_len", headers)
-  $defs[-1] = "-DHAVE_SIN_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>
+# include <netinet/in.h>
+#endif
+int
+main()
+{
+   struct sockaddr_in sin;
+
+   sin.sin_len;
+   return 0;
+}
+EOF
+    $CFLAGS="-DHAVE_SIN_LEN "+$CFLAGS
 end
 
-#   doug's fix, NOW add -Dss_family... only if required!
-[nil, " -Dss_family=__ss_family -Dss_len=__ss_len"].each do |flags|
-  if flags
-    cppflags = $CPPFLAGS
-    $CPPFLAGS += flags
-  end
-  if have_struct_member("struct sockaddr_storage", "ss_family", headers)
-    $defs[-1] = "-DHAVE_SOCKADDR_STORAGE"
-    break
-  elsif flags
-    $CPPFLAGS = cppflags
-  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
 end
 
-if have_struct_member("struct sockaddr", "sa_len", headers)
-  $defs[-1] = "-DHAVE_SA_LEN "
+  if try_link(<<EOF)
+#include <sys/types.h>
+#include <netdb.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+int
+main()
+{
+   struct sockaddr sa;
+
+   sa.sa_len;
+   return 0;
+}
+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_struct_member('struct msghdr', 'msg_control', header=['sys/types.h', 'sys/socket.h'])
+have_struct_member('struct msghdr', 'msg_accrights', header=['sys/types.h', 'sys/socket.h'])
 
-getaddr_info_ok = enable_config("wide-getaddrinfo") do
-  checking_for("wide getaddrinfo") {try_run(<<EOF)}
-#{cpp_include(headers)}
-#include <stdlib.h>
-
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
+$getaddr_info_ok = false
+if !enable_config("wide-getaddrinfo", false) and 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
@@ -141,7 +197,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) {
@@ -150,13 +205,8 @@ main()
     }
     for (ai = aitop; ai; ai = ai->ai_next) {
       if (ai->ai_family == AF_LOCAL) continue;
-      if (ai->ai_addr == NULL)
-        goto bad;
-#if defined(_AIX)
-      ai->ai_addr->sa_len = ai->ai_addrlen;
-      ai->ai_addr->sa_family = ai->ai_family;
-#endif
-      if (ai->ai_addrlen == 0 ||
+      if (ai->ai_addr == NULL ||
+          ai->ai_addrlen == 0 ||
           getnameinfo(ai->ai_addr, ai->ai_addrlen,
                       straddr, sizeof(straddr), strport, sizeof(strport),
                       NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
@@ -207,46 +257,52 @@ main()
 
   if (aitop)
     freeaddrinfo(aitop);
-  exit(EXIT_SUCCESS);
+  exit(0);
 
  bad:
   if (aitop)
     freeaddrinfo(aitop);
-  exit(EXIT_FAILURE);
+  exit(1);
 }
 EOF
+  $getaddr_info_ok = true
 end
-if ipv6 and not getaddr_info_ok
-  abort <<EOS
+if $ipv6 and not $getaddr_info_ok
+      print <<EOS
 
 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"
-  $defs << "-DLOOKUP_ORDER_HACK_INET"
+  $CFLAGS="-DLOOKUP_ORDER_HACK_INET "+$CFLAGS
 when "INET6"
-  $defs << "-DLOOKUP_ORDER_HACK_INET6"
+  $CFLAGS="-DLOOKUP_ORDER_HACK_INET6 "+$CFLAGS
 when "UNSPEC"
   # nothing special
 else
-  abort <<EOS
+  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") and have_func("getnameinfo")
+  have_getaddrinfo = true
+end
 
-unless getaddr_info_ok and have_func("getnameinfo", "netdb.h") and have_func("getaddrinfo", "netdb.h")
-  if have_struct_member("struct in6_addr", "s6_addr8", headers)
-    $defs[-1] = "-DHAVE_ADDR8"
-  end
-  $CPPFLAGS="-I. "+$CPPFLAGS
+if have_getaddrinfo
+  $CFLAGS="-DHAVE_GETADDRINFO "+$CFLAGS
+else
+  $CFLAGS="-I. "+$CFLAGS
   $objs += ["getaddrinfo.#{$OBJEXT}"]
   $objs += ["getnameinfo.#{$OBJEXT}"]
   have_func("inet_ntop") or have_func("inet_ntoa")
@@ -257,8 +313,20 @@ unless getaddr_info_ok and have_func("getnameinfo", "netdb.h") and have_func("ge
   have_header("resolv.h")
 end
 
-unless have_type("socklen_t", headers)
-  $defs << "-Dsocklen_t=int"
+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")
@@ -266,16 +334,14 @@ have_header("sys/uio.h")
 
 if have_func(test_func)
   have_func("hsterror")
-  have_func("getipnodebyname") or have_func("gethostbyname2")
-  have_func("socketpair")
   unless have_func("gethostname")
     have_func("uname")
   end
-  if enable_config("socks", ENV["SOCKS_SERVER"])
+  if ENV["SOCKS_SERVER"] or enable_config("socks", false)
     if have_library("socks5", "SOCKSinit")
-      $defs << "-DSOCKS5" << "-DSOCKS"
+      $CFLAGS+=" -DSOCKS5 -DSOCKS"
     elsif have_library("socks", "Rconnect")
-      $defs << "-DSOCKS"
+      $CFLAGS+=" -DSOCKS"
     end
   end
   create_makefile("socket")
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index 9fb4ebcb06..a6c26a8f0f 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -40,7 +40,7 @@
 
 #include "config.h"
 #include <sys/types.h>
-#if !defined(_WIN32) && !defined(__VMS)
+#ifndef _WIN32
 #include <sys/param.h>
 #if defined(__BEOS__)
 # include <net/socket.h>
@@ -56,17 +56,9 @@
 #endif
 #include <netdb.h>
 #if defined(HAVE_RESOLV_H)
-#ifdef _SX
-#include <stdio.h>
-#endif
 #include <resolv.h>
 #endif
 #include <unistd.h>
-#elif defined(__VMS )
-#include <socket.h>
-#include <inet.h>
-#include <in.h>
-#include <netdb.h>
 #else
 #include <winsock2.h>
 #include <io.h>
@@ -405,7 +397,7 @@ getaddrinfo(hostname, servname, hints, res)
 				fprintf(stderr, "panic!\n");
 				break;
 			}
-			if ((sp = getservbyname((char*)servname, proto)) == NULL)
+			if ((sp = getservbyname(servname, proto)) == NULL)
 				ERR(EAI_SERVICE);
 			port = sp->s_port;
 			if (pai->ai_socktype == ANY)
@@ -488,11 +480,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;
@@ -562,7 +550,7 @@ get_name(addr, afd, res, numaddr, pai, port0)
 #ifdef INET6
 	hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error);
 #else
-	hp = gethostbyaddr((char*)addr, afd->a_addrlen, AF_INET);
+	hp = gethostbyaddr(addr, afd->a_addrlen, AF_INET);
 #endif
 	if (hp && hp->h_name && hp->h_name[0] && hp->h_addr_list[0]) {
 		GET_AI(cur, afd, hp->h_addr_list[0], port);
@@ -614,7 +602,7 @@ get_addr(hostname, af, res, pai, port0)
 	} else
 		hp = getipnodebyname(hostname, af, AI_ADDRCONFIG, &h_error);
 #else
-	hp = gethostbyname((char*)hostname);
+	hp = gethostbyname(hostname);
 	h_error = h_errno;
 #endif
 	if (hp == NULL) {
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index 66f7e8818a..a1fa5d7908 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -35,7 +35,6 @@
  */
 
 #include "config.h"
-#include <stdio.h>
 #include <sys/types.h>
 #ifndef _WIN32
 #if defined(__BEOS__)
@@ -57,6 +56,7 @@
 #endif
 #ifdef _WIN32
 #include <winsock2.h>
+#include <stdio.h>
 #define snprintf _snprintf
 #endif
 
@@ -208,11 +208,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 		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;
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 8558e99ee5..6cdedd22e0 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -2,8 +2,8 @@
 
   socket.c -
 
-  $Author: matz $
-  $Date: 2006/08/07 07:50:28 $
+  $Author$
+  $Date$
   created at: Thu Mar 31 12:21:29 JST 1994
 
   Copyright (C) 1993-2001 Yukihiro Matsumoto
@@ -13,7 +13,6 @@
 #include "ruby.h"
 #include "rubyio.h"
 #include "rubysig.h"
-#include "util.h"
 #include <stdio.h>
 #include <sys/types.h>
 
@@ -30,12 +29,8 @@
 # include <net/socket.h>
 #else
 # include <sys/socket.h>
-# define pseudo_AF_FTIP pseudo_AF_RTIP	/* workaround for NetBSD and etc. */
 #endif
 #include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-# include <netinet/in_systm.h>
-#endif
 #ifdef HAVE_NETINET_TCP_H
 # include <netinet/tcp.h>
 #endif
@@ -53,16 +48,10 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#endif
 #ifndef EWOULDBLOCK
 #define EWOULDBLOCK EAGAIN
 #endif
@@ -71,10 +60,6 @@
 #endif
 #include "sockport.h"
 
-#if defined(__vms)
-#include <tcp.h>
-#endif
-
 static int do_not_reverse_lookup = 0;
 
 VALUE rb_cBasicSocket;
@@ -173,36 +158,6 @@ ruby_getaddrinfo(nodename, servname, hints, res)
 #define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo((node),(serv),(hints),(res))
 #endif
 
-#if defined(_AIX)
-static int
-ruby_getaddrinfo__aix(nodename, servname, hints, res)
-     char *nodename;
-     char *servname;
-     struct addrinfo *hints;
-     struct addrinfo **res;
-{
-    int error = getaddrinfo(nodename, servname, hints, res);
-    struct addrinfo *r;
-    if (error)
-	return error;
-    for (r = *res; r != NULL; r = r->ai_next) {
-	if (r->ai_addr->sa_family == 0)
-	    r->ai_addr->sa_family = r->ai_family;
-	if (r->ai_addr->sa_len == 0)
-	    r->ai_addr->sa_len = r->ai_addrlen;
-    }
-    return 0;
-}
-#undef getaddrinfo
-#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res))
-#ifndef CMSG_SPACE
-# define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
-#endif
-#ifndef CMSG_LEN
-# define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
-#endif
-#endif
-
 #ifdef HAVE_CLOSESOCKET
 #undef close
 #define close closesocket
@@ -303,51 +258,6 @@ bsock_close_write(sock)
     return Qnil;
 }
 
-/*
- * Document-method: setsockopt
- * call-seq: setsockopt(level, optname, optval)
- *
- * Sets a socket option. These are protocol and system specific, see your
- * local sytem documentation for details.
- *
- * === Parameters
- * * +level+ is an integer, usually one of the SOL_ constants such as
- *   Socket::SOL_SOCKET, or a protocol level.
- * * +optname+ is an integer, usually one of the SO_ constants, such
- *   as Socket::SO_REUSEADDR.
- * * +optval+ is the value of the option, it is passed to the underlying
- *   setsockopt() as a pointer to a certain number of bytes. How this is
- *   done depends on the type:
- *   - Fixnum: value is assigned to an int, and a pointer to the int is
- *     passed, with length of sizeof(int).
- *   - true or false: 1 or 0 (respectively) is assigned to an int, and the
- *     int is passed as for a Fixnum. Note that +false+ must be passed,
- *     not +nil+.
- *   - String: the string's data and length is passed to the socket.
- *
- * === Examples
- *
- * Some socket options are integers with boolean values, in this case
- * #setsockopt could be called like this:
- *   sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
- *
- * Some socket options are integers with numeric values, in this case
- * #setsockopt could be called like this:
- *   sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_TTL, 255)
- *
- * Option values may be structs. Passing them can be complex as it involves
- * examining your system headers to determine the correct definition. An
- * example is an +ip_mreq+, which may be defined in your system headers as:
- *   struct ip_mreq {
- *     struct  in_addr imr_multiaddr;
- *     struct  in_addr imr_interface;
- *   };
- * 
- * In this case #setsockopt could be called like this:
- *   optval =  IPAddr.new("224.0.0.251") + Socket::INADDR_ANY
- *   sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, optval)
- *
-*/
 static VALUE
 bsock_setsockopt(sock, lev, optname, val)
     VALUE sock, lev, optname, val;
@@ -361,7 +271,6 @@ bsock_setsockopt(sock, lev, optname, val)
     rb_secure(2);
     level = NUM2INT(lev);
     option = NUM2INT(optname);
-
     switch (TYPE(val)) {
       case T_FIXNUM:
 	i = FIX2INT(val);
@@ -388,46 +297,6 @@ bsock_setsockopt(sock, lev, optname, val)
     return INT2FIX(0);
 }
 
-/*
- * Document-method: getsockopt
- * call-seq: getsockopt(level, optname)
- *
- * Gets a socket option. These are protocol and system specific, see your
- * local sytem documentation for details. The option is returned as
- * a String with the data being the binary value of the socket option.
- *
- * === Parameters
- * * +level+ is an integer, usually one of the SOL_ constants such as
- *   Socket::SOL_SOCKET, or a protocol level.
- * * +optname+ is an integer, usually one of the SO_ constants, such
- *   as Socket::SO_REUSEADDR.
- *
- * === Examples
- *
- * Some socket options are integers with boolean values, in this case
- * #getsockopt could be called like this:
- *   optval = sock.getsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR)
- *   optval = optval.unpack "i"
- *   reuseaddr = optval[0] == 0 ? false : true
- *
- * Some socket options are integers with numeric values, in this case
- * #getsockopt could be called like this:
- *   optval = sock.getsockopt(Socket::IPPROTO_IP, Socket::IP_TTL)
- *   ipttl = optval.unpack("i")[0]
- *
- * Option values may be structs. Decoding them can be complex as it involves
- * examining your system headers to determine the correct definition. An
- * example is a +struct linger+, which may be defined in your system headers
- * as:
- *   struct linger {
- *     int l_onoff;
- *     int l_linger;
- *   };
- * 
- * In this case #getsockopt could be called like this:
- *   optval =  sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER)
- *   onoff, linger = optval.unpack "ii"
-*/
 static VALUE
 bsock_getsockopt(sock, lev, optname)
     VALUE sock, lev, optname;
@@ -442,7 +311,6 @@ bsock_getsockopt(sock, lev, optname)
     option = NUM2INT(optname);
     len = 256;
     buf = ALLOCA_N(char,len);
-    GetOpenFile(sock, fptr);
 
     GetOpenFile(sock, fptr);
     if (getsockopt(fileno(fptr->f), level, option, buf, &len) < 0)
@@ -456,7 +324,7 @@ bsock_getsockopt(sock, lev, optname)
 
 static VALUE
 bsock_getsockname(sock)
-    VALUE sock;
+   VALUE sock;
 {
     char buf[1024];
     socklen_t len = sizeof buf;
@@ -470,7 +338,7 @@ bsock_getsockname(sock)
 
 static VALUE
 bsock_getpeername(sock)
-    VALUE sock;
+   VALUE sock;
 {
     char buf[1024];
     socklen_t len = sizeof buf;
@@ -497,23 +365,19 @@ bsock_send(argc, argv, sock)
     rb_secure(4);
     rb_scan_args(argc, argv, "21", &mesg, &flags, &to);
 
-    StringValue(mesg);
-    if (!NIL_P(to)) StringValue(to);
     GetOpenFile(sock, fptr);
     f = GetWriteFile(fptr);
     fd = fileno(f);
     rb_thread_fd_writable(fd);
+    StringValue(mesg);
   retry:
     if (!NIL_P(to)) {
-        TRAP_BEG;
+	StringValue(to);
 	n = sendto(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
 		   (struct sockaddr*)RSTRING(to)->ptr, RSTRING(to)->len);
-        TRAP_END;
     }
     else {
-        TRAP_BEG;
 	n = send(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags));
-        TRAP_END;
     }
     if (n < 0) {
 	if (rb_io_wait_writable(fd)) {
@@ -526,7 +390,7 @@ bsock_send(argc, argv, sock)
 
 static VALUE ipaddr _((struct sockaddr*));
 #ifdef HAVE_SYS_UN_H
-static VALUE unixaddr _((struct sockaddr_un*, socklen_t));
+static VALUE unixaddr _((struct sockaddr_un*));
 #endif
 
 enum sock_recv_type {
@@ -548,7 +412,6 @@ s_recvfrom(sock, argc, argv, from)
     char buf[1024];
     socklen_t alen = sizeof buf;
     VALUE len, flg;
-    long buflen;
     long slen;
     int fd, flags;
 
@@ -556,7 +419,6 @@ s_recvfrom(sock, argc, argv, from)
 
     if (flg == Qnil) flags = 0;
     else             flags = NUM2INT(flg);
-    buflen = NUM2INT(len);
 
     GetOpenFile(sock, fptr);
     if (rb_read_pending(fptr->f)) {
@@ -564,15 +426,14 @@ s_recvfrom(sock, argc, argv, from)
     }
     fd = fileno(fptr->f);
 
-    str = rb_tainted_str_new(0, buflen);
+    slen = NUM2INT(len);
+    str = rb_tainted_str_new(0, slen);
 
   retry:
-    rb_str_locktmp(str);
     rb_thread_wait_fd(fd);
     TRAP_BEG;
-    slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
+    slen = recvfrom(fd, RSTRING(str)->ptr, slen, flags, (struct sockaddr*)buf, &alen);
     TRAP_END;
-    rb_str_unlocktmp(str);
 
     if (slen < 0) {
 	if (rb_io_wait_readable(fd)) {
@@ -594,14 +455,10 @@ s_recvfrom(sock, argc, argv, from)
 	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
 	}
 #endif
-	if (alen && alen != sizeof(buf)) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */
-	    return rb_assoc_new(str, ipaddr((struct sockaddr*)buf));
-	else
-	    return rb_assoc_new(str, Qnil);
-
+	return rb_assoc_new(str, ipaddr((struct sockaddr*)buf));
 #ifdef HAVE_SYS_UN_H
       case RECV_UNIX:
-        return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf, alen));
+	return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf));
 #endif
       case RECV_SOCKET:
 	return rb_assoc_new(str, rb_str_new(buf, alen));
@@ -611,70 +468,6 @@ s_recvfrom(sock, argc, argv, from)
 }
 
 static VALUE
-s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
-{
-    OpenFile *fptr;
-    VALUE str;
-    char buf[1024];
-    socklen_t alen = sizeof buf;
-    VALUE len, flg;
-    long buflen;
-    long slen;
-    int fd, flags;
-    VALUE addr = Qnil;
-
-    rb_scan_args(argc, argv, "11", &len, &flg);
-
-    if (flg == Qnil) flags = 0;
-    else             flags = NUM2INT(flg);
-    buflen = NUM2INT(len);
-
-#ifdef MSG_DONTWAIT
-    /* MSG_DONTWAIT avoids the race condition between fcntl and recvfrom.
-       It is not portable, though. */
-    flags |= MSG_DONTWAIT;
-#endif
-
-    GetOpenFile(sock, fptr);
-    if (rb_read_pending(fptr->f)) {
-	rb_raise(rb_eIOError, "recvfrom for buffered IO");
-    }
-    fd = fileno(fptr->f);
-
-    str = rb_tainted_str_new(0, buflen);
-
-    rb_io_check_closed(fptr);
-    rb_io_set_nonblock(fptr);
-    slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
-
-    if (slen < 0) {
-	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 str;
-
-      case RECV_IP:
-        if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
-            addr = ipaddr((struct sockaddr*)buf);
-        break;
-
-      case RECV_SOCKET:
-        addr = rb_str_new(buf, alen);
-        break;
-
-      default:
-        rb_bug("s_recvfrom_nonblock called with bad value");
-    }
-    return rb_assoc_new(str, addr);
-}
-
-static VALUE
 bsock_recv(argc, argv, sock)
     int argc;
     VALUE *argv;
@@ -683,52 +476,6 @@ bsock_recv(argc, argv, sock)
     return s_recvfrom(sock, argc, argv, RECV_RECV);
 }
 
-/*
- * call-seq:
- * 	basicsocket.recv_nonblock(maxlen) => mesg
- * 	basicsocket.recv_nonblock(maxlen, flags) => mesg
- * 
- * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * _flags_ is zero or more of the +MSG_+ options.
- * The result, _mesg_, is the data received.
- *
- * When recvfrom(2) returns 0, Socket#recv_nonblock returns
- * an empty string as data.
- * The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
- * 
- * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options 
- * 
- * === Example
- * 	serv = TCPServer.new("127.0.0.1", 0)
- * 	af, port, host, addr = serv.addr
- * 	c = TCPSocket.new(addr, port)
- * 	s = serv.accept
- * 	c.send "aaa", 0
- * 	IO.select([s])
- * 	p s.recv_nonblock(10) #=> "aaa"
- *
- * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
- * to _recv_nonblock_ fails. 
- *
- * BasicSocket#recv_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EAGAIN.
- *
- * === See
- * * Socket#recvfrom
- */
-
-static VALUE
-bsock_recv_nonblock(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    return s_recvfrom_nonblock(sock, argc, argv, RECV_RECV);
-}
-
 static VALUE
 bsock_do_not_rev_lookup()
 {
@@ -737,7 +484,6 @@ 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);
@@ -745,7 +491,7 @@ bsock_do_not_rev_lookup_set(self, val)
 }
 
 static void
-make_ipaddr0(addr, buf, len)
+mkipaddr0(addr, buf, len)
     struct sockaddr *addr;
     char *buf;
     size_t len;
@@ -759,17 +505,17 @@ make_ipaddr0(addr, buf, len)
 }
 
 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;
@@ -780,7 +526,7 @@ 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
@@ -799,98 +545,67 @@ str_isnumber(p)
        return 0;
 }
 
-static char *
-host_str(host, hbuf, len)
-    VALUE host;
-    char *hbuf;
-    size_t len;
+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[1024], pbuf[16];
+
     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));
+	hostp = hbuf;
     }
     else {
 	char *name;
 
 	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 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
+	    mkinetaddr(INADDR_ANY, hbuf, sizeof(hbuf));
 	}
 	else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
-	    make_inetaddr(INADDR_BROADCAST, hbuf, len);
+	    mkinetaddr(INADDR_BROADCAST, hbuf, sizeof(hbuf));
 	}
-	else if (strlen(name) >= len) {
+	else if (strlen(name) >= sizeof(hbuf)) {
 	    rb_raise(rb_eArgError, "hostname too long (%d)", strlen(name));
 	}
 	else {
 	    strcpy(hbuf, name);
 	}
-	return hbuf;
+	hostp = hbuf;
     }
-}
-
-static char *
-port_str(port, pbuf, len)
-    VALUE port;
-    char *pbuf;
-    size_t len;
-{
     if (NIL_P(port)) {
-	return 0;
+	portp = 0;
     }
     else if (FIXNUM_P(port)) {
-	snprintf(pbuf, len, "%ld", FIX2LONG(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;
+	portp = RSTRING(port)->ptr;
     }
-}
-
-#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;
-    struct addrinfo* res = NULL;
-    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;
     }
 
+    hintsp = &hints;
     MEMZERO(&hints, struct addrinfo, 1);
-    hints.ai_family = AF_UNSPEC;
+    hints.ai_family = PF_UNSPEC;
+    hints.ai_protocol = 0;
     hints.ai_socktype = socktype;
     hints.ai_flags = flags;
-    error = getaddrinfo(hostp, portp, &hints, &res);
+    error = getaddrinfo(hostp, portp, hintsp, &res);
     if (error) {
 	if (hostp && hostp[strlen(hostp)-1] == '\n') {
 	    rb_raise(rb_eSocket, "newline at the end of hostname");
@@ -898,26 +613,21 @@ sock_addrinfo(host, port, socktype, flags)
 	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
     }
 
-#if defined(__APPLE__) && defined(__MACH__)
-    {
-        struct addrinfo *r;
-       r = res;
-       while (r) {
-            if (! r->ai_socktype) r->ai_socktype = hints.ai_socktype;
-            if (! r->ai_protocol) {
-                if (r->ai_socktype == SOCK_DGRAM) {
-                    r->ai_protocol = IPPROTO_UDP;
-                } else if (r->ai_socktype == SOCK_STREAM) {
-                    r->ai_protocol = IPPROTO_TCP;
-                }
-            }
-            r = r->ai_next;
-        }
-    }
-#endif
     return res;
 }
 
+static void
+setipaddr(name, addr)
+    VALUE name;
+    struct sockaddr_storage *addr;
+{
+    struct addrinfo *res = sock_addrinfo(name, Qnil, SOCK_STREAM, 0);
+
+    /* just take the first one */
+    memcpy(addr, res->ai_addr, res->ai_addrlen);
+    freeaddrinfo(res);
+}
+
 static VALUE
 ipaddr(sockaddr)
     struct sockaddr *sockaddr;
@@ -953,13 +663,13 @@ ipaddr(sockaddr)
 	family = rb_str_new2(pbuf);
 	break;
     }
-    addr1 = Qnil;
     if (!do_not_reverse_lookup) {
 	error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
 			    NULL, 0, 0);
-	if (! error) {
-	    addr1 = rb_str_new2(hbuf);
+	if (error) {
+	    rb_raise(rb_eSocket, "getnameinfo: %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);
@@ -967,7 +677,7 @@ ipaddr(sockaddr)
 	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
     }
     addr2 = rb_str_new2(hbuf);
-    if (addr1 == Qnil) {
+    if (do_not_reverse_lookup) {
 	addr1 = addr2;
     }
     port = INT2FIX(atoi(pbuf));
@@ -992,57 +702,28 @@ ruby_socket(domain, type, proto)
     return fd;
 }
 
-static int
-wait_connectable(fd)
+static void
+thread_read_select(fd)
     int fd;
 {
-    int sockerr;
-    socklen_t sockerrlen;
-    fd_set fds_w;
-    fd_set fds_e;
-
-    for (;;) {
-	FD_ZERO(&fds_w);
-	FD_ZERO(&fds_e);
-
-	FD_SET(fd, &fds_w);
-	FD_SET(fd, &fds_e);
+    fd_set fds;
 
-	rb_thread_select(fd+1, 0, &fds_w, &fds_e, 0);
+    FD_ZERO(&fds);
+    FD_SET(fd, &fds);
+    rb_thread_select(fd+1, &fds, 0, 0, 0);
+}
 
-	if (FD_ISSET(fd, &fds_w)) {
-	    return 0;
-	}
-	else if (FD_ISSET(fd, &fds_e)) {
-	    sockerrlen = sizeof(sockerr);
-	    if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr,
-			   &sockerrlen) == 0) {
-		if (sockerr == 0)
-		    continue;	/* workaround for winsock */
-		errno = sockerr;
-	    }
-	    return -1;
-	}
-    }
+static void
+thread_write_select(fd)
+    int fd;
+{
+    fd_set fds;
 
-    return 0;
+    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;
@@ -1052,17 +733,12 @@ ruby_connect(fd, sockaddr, len, socks)
 {
     int status;
     int mode;
-#if WAIT_IN_PROGRESS > 0
+#if defined __CYGWIN__
     int wait_in_progress = -1;
-    int sockerr, sockerrlen;
 #endif
 
 #if defined(HAVE_FCNTL)
-# if defined(F_GETFL)
     mode = fcntl(fd, F_GETFL, 0);
-# else
-    mode = 0;
-# endif
 
 #ifdef O_NDELAY
 # define NONBLOCKING O_NDELAY
@@ -1094,47 +770,20 @@ ruby_connect(fd, sockaddr, len, socks)
 	      case EAGAIN:
 #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
+#ifdef __CYGWIN__
 	      case EALREADY:
+		wait_in_progress = 10;
 #endif
-#if WAIT_IN_PROGRESS > 0
-		wait_in_progress = WAIT_IN_PROGRESS;
 #endif
-		status = wait_connectable(fd);
-		if (status) {
-		    break;
-		}
-		errno = 0;
+		thread_write_select(fd);
 		continue;
 
-#if WAIT_IN_PROGRESS > 0
+#if defined __CYGWIN__
 	      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;
+		    struct timeval tv = {0, 100000};
+		    rb_thread_wait_for(tv);
+		    continue;
 		}
 		break;
 #endif
@@ -1156,6 +805,46 @@ ruby_connect(fd, sockaddr, len, socks)
     }
 }
 
+static void
+load_addr_info(h, serv, type, res)
+    VALUE h, serv;
+    int type;
+    struct addrinfo **res;
+{
+    char *host;
+    char pbuf[1024], *portp;
+    struct addrinfo hints;
+    int error;
+
+    if (!NIL_P(h)) {
+	SafeStringValue(h);
+	host = RSTRING(h)->ptr;
+    }
+    else {
+	host = NULL;
+    }
+    if (FIXNUM_P(serv)) {
+	snprintf(pbuf, sizeof(pbuf), "%u", FIX2UINT(serv));
+	portp = pbuf;
+    }
+    else {
+	SafeStringValue(serv);
+	if (RSTRING(serv)->len >= sizeof(pbuf))
+	    rb_raise(rb_eArgError, "servicename too long (%ld)", RSTRING(serv)->len);
+	strcpy(pbuf, RSTRING(serv)->ptr);
+	portp = pbuf;
+    }
+    MEMZERO(&hints, struct addrinfo, 1);
+    hints.ai_family = PF_UNSPEC;
+    if (type == INET_SERVER) {
+	hints.ai_flags = AI_PASSIVE;
+    }
+    error = getaddrinfo(host, portp, &hints, res);
+    if (error) {
+	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
+    }
+}
+
 struct inetsock_arg
 {
     VALUE sock;
@@ -1191,7 +880,7 @@ init_inetsock_internal(arg)
 {
     int type = arg->type;
     struct addrinfo *res;
-    int fd, status = 0;
+    int fd, status;
     char *syscall;
 
     arg->remote.res = sock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
@@ -1214,7 +903,7 @@ init_inetsock_internal(arg)
 	}
 	arg->fd = fd;
 	if (type == INET_SERVER) {
-#if !defined(_WIN32) && !defined(__CYGWIN__)
+#ifndef _WIN32
 	    status = 1;
 	    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
 		       (char*)&status, sizeof(status));
@@ -1302,7 +991,7 @@ socks_init(sock, host, serv)
 	init = 1;
     }
 
-    return init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
+    return init_inetsock(class, host, serv, Qnil, Qnil, INET_SOCKS);
 }
 
 #ifdef SOCKS5
@@ -1323,91 +1012,111 @@ socks_s_close(sock)
 #endif
 #endif
 
-struct hostent_arg {
-    VALUE host;
-    struct addrinfo* addr;
-    VALUE (*ipaddr)_((struct sockaddr*, size_t));
-};
+/*
+ * 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_internal(arg)
-    struct hostent_arg *arg;
+struct hostent*
+sock_hostbyname(host)
+    VALUE host;
 {
-    VALUE host = arg->host;
-    struct addrinfo* addr = arg->addr;
-    VALUE (*ipaddr)_((struct sockaddr*, size_t)) = arg->ipaddr;
-
-    struct addrinfo *ai;
+    struct sockaddr_storage addr;
     struct hostent *h;
-    VALUE ary, names;
-    char **pch;
-    const char* hostp;
-    char hbuf[NI_MAXHOST];
 
-    ary = rb_ary_new();
-    if (addr->ai_canonname) {
-	hostp = addr->ai_canonname;
-    }
-    else {
-	hostp = host_str(host, hbuf, sizeof(hbuf));
+    rb_secure(3);
+    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;
+	break;
     }
-    rb_ary_push(ary, rb_str_new2(hostp));
 
-    if (addr->ai_canonname && (h = gethostbyname(addr->ai_canonname))) {
-	names = rb_ary_new();
-	if (h->h_aliases != NULL) {
-	    for (pch = h->h_aliases; *pch; pch++) {
-		rb_ary_push(names, rb_str_new2(*pch));
-	    }
-	}
-    }
-    else {
-	names = rb_ary_new2(0);
-    }
-    rb_ary_push(ary, names);
-    rb_ary_push(ary, INT2NUM(addr->ai_family));
-    for (ai = addr; ai; ai = ai->ai_next) {
-      /* Pushing all addresses regardless of address family is not the
-       * behaviour expected of gethostbyname(). All the addresses in struct
-       * hostent->h_addr_list must be of the same family.
-       */
-       if(ai->ai_family == addr->ai_family) {
-	   rb_ary_push(ary, (*ipaddr)(ai->ai_addr, ai->ai_addrlen));
-       }
+    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
     }
-
-    return ary;
+    return h;
 }
 
 static VALUE
-make_hostent(host, addr, ipaddr)
-    VALUE host;
-    struct addrinfo* addr;
-    VALUE (*ipaddr)_((struct sockaddr*, size_t));
+tcp_s_gethostbyname(obj, host)
+    VALUE obj, host;
 {
-    struct hostent_arg arg;
+    struct hostent *h = sock_hostbyname(host);
+    VALUE ary, names;
+    char **pch;
+    size_t size;
 
-    arg.host = host;
-    arg.addr = addr;
-    arg.ipaddr = ipaddr;
-    return rb_ensure(make_hostent_internal, (VALUE)&arg,
-		     RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)addr);
-}
+    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++) {
+	switch (h->h_length) {
+	  case 4: /* 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);
+	    rb_ary_push(ary, mkipaddr((struct sockaddr*)&sin));
+	    break;
+	  }
+#ifdef INET6
+	  case 8: /* AF_INET6 */ {
+	    struct sockaddr_in6 sin6;
 
-VALUE
-tcp_sockaddr(addr, len)
-    struct sockaddr *addr;
-    size_t len;
-{
-    return make_ipaddr(addr);
-}
+	    MEMZERO(&sin6, struct sockaddr_in6, 1);
+	    sin6.sin6_family = AF_INET6;
+#ifdef SIN6_LEN
+	    sin6.sin6_len = sizeof(sin6);
+#endif
+	    memcpy((char*)&sin6.sin6_addr, *pch, size);
+	    rb_ary_push(ary, mkipaddr((struct sockaddr*)&sin6));
+	    break;
+	  }
+#endif
+	  default:
+	    break;
+	}
+    }
+#else
+    memcpy((char*)&addr.sin_addr, h->h_addr, h->h_length);
+    rb_ary_push(ary, mkipaddr((struct sockaddr*)&addr));
+#endif
 
-static VALUE
-tcp_s_gethostbyname(obj, host)
-    VALUE obj, host;
-{
-    rb_secure(3);
-    return make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), tcp_sockaddr);
+    return ary;
 }
 
 static VALUE
@@ -1424,39 +1133,6 @@ tcp_svr_init(argc, argv, sock)
 	return init_inetsock(sock, Qnil, arg1, Qnil, Qnil, INET_SERVER);
 }
 
-static void
-make_fd_nonblock(int fd)
-{
-    int flags;
-#ifdef F_GETFL
-    flags = fcntl(fd, F_GETFL);
-    if (flags == -1) {
-        rb_sys_fail(0);
-    }
-#else
-    flags = 0;
-#endif
-    flags |= O_NONBLOCK;
-    if (fcntl(fd, F_SETFL, flags) == -1) {
-        rb_sys_fail(0);
-    }
-}
-
-static VALUE
-s_accept_nonblock(VALUE klass, OpenFile *fptr, struct sockaddr *sockaddr, socklen_t *len)
-{
-    int fd2;
-
-    rb_secure(3);
-    rb_io_set_nonblock(fptr);
-    fd2 = accept(fileno(fptr->f), (struct sockaddr*)sockaddr, len);
-    if (fd2 < 0) {
-        rb_sys_fail("accept(2)");
-    }
-    make_fd_nonblock(fd2);
-    return init_sock(rb_obj_alloc(klass), fd2);
-}
-
 static VALUE
 s_accept(klass, fd, sockaddr, len)
     VALUE klass;
@@ -1485,8 +1161,6 @@ s_accept(klass, fd, sockaddr, len)
 	    rb_gc();
 	    retry = 1;
 	    goto retry;
-	  case EWOULDBLOCK:
-	    break;
 	  default:
 	    if (!rb_io_wait_readable(fd)) break;
 	    retry = 0;
@@ -1512,49 +1186,6 @@ tcp_accept(sock)
 		    (struct sockaddr*)&from, &fromlen);
 }
 
-/*
- * call-seq:
- * 	tcpserver.accept_nonblock => tcpsocket
- * 
- * Accepts an incoming connection using accept(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * It returns an accepted TCPSocket for the incoming connection.
- * 
- * === Example
- * 	require 'socket'
- * 	serv = TCPServer.new(2202)
- * 	begin
- * 	  sock = serv.accept_nonblock
- * 	rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
- * 	  IO.select([serv])
- * 	  retry
- * 	end
- * 	# sock is an accepted socket.
- * 
- * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to TCPServer#accept_nonblock fails. 
- *
- * TCPServer#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EAGAIN.
- * 
- * === See
- * * TCPServer#accept
- * * Socket#accept
- */
-static VALUE
-tcp_accept_nonblock(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_storage from;
-    socklen_t fromlen;
-
-    GetOpenFile(sock, fptr);
-    fromlen = sizeof(from);
-    return s_accept_nonblock(rb_cTCPSocket, fptr,
-                             (struct sockaddr *)&from, &fromlen);
-}
-
 static VALUE
 tcp_sysaccept(sock)
     VALUE sock;
@@ -1600,11 +1231,8 @@ init_unixsock(sock, path, server)
 
     MEMZERO(&sockaddr, struct sockaddr_un, 1);
     sockaddr.sun_family = AF_UNIX;
-    if (sizeof(sockaddr.sun_path) <= RSTRING(path)->len) {
-        rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
-            (int)sizeof(sockaddr.sun_path)-1);
-    }
-    strcpy(sockaddr.sun_path, StringValueCStr(path));
+    strncpy(sockaddr.sun_path, RSTRING(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));
@@ -1630,9 +1258,7 @@ init_unixsock(sock, path, server)
 
     init_sock(sock, fd);
     GetOpenFile(sock, fptr);
-    if (server) {
-        fptr->path = strdup(RSTRING(path)->ptr);
-    }
+    fptr->path = strdup(RSTRING(path)->ptr);
 
     return sock;
 }
@@ -1682,13 +1308,9 @@ 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
@@ -1743,8 +1365,8 @@ udp_connect(sock, host, port)
     VALUE ret;
 
     rb_secure(3);
-    arg.res = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     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);
@@ -1760,8 +1382,8 @@ udp_bind(sock, host, port)
     struct addrinfo *res0, *res;
 
     rb_secure(3);
-    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     GetOpenFile(sock, fptr);
+    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     for (res = res0; res; res = res->ai_next) {
 	if (bind(fileno(fptr->f), res->ai_addr, res->ai_addrlen) < 0) {
 	    continue;
@@ -1792,10 +1414,10 @@ udp_send(argc, argv, sock)
     rb_secure(4);
     rb_scan_args(argc, argv, "4", &mesg, &flags, &host, &port);
 
-    StringValue(mesg);
-    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     GetOpenFile(sock, fptr);
+    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     f = GetWriteFile(fptr);
+    StringValue(mesg);
     for (res = res0; res; res = res->ai_next) {
       retry:
 	n = sendto(fileno(f), RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
@@ -1813,52 +1435,6 @@ udp_send(argc, argv, sock)
     return INT2FIX(n);
 }
 
-/*
- * call-seq:
- * 	udpsocket.recvfrom_nonblock(maxlen) => [mesg, sender_inet_addr]
- * 	udpsocket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_inet_addr]
- * 
- * Receives up to _maxlen_ bytes from +udpsocket+ using recvfrom(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * _flags_ is zero or more of the +MSG_+ options.
- * The first element of the results, _mesg_, is the data received.
- * The second element, _sender_inet_addr_, is an array to represent the sender address.
- *
- * When recvfrom(2) returns 0,
- * Socket#recvfrom_nonblock returns an empty string as data.
- * It means an empty packet.
- * 
- * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options 
- * 
- * === Example
- * 	require 'socket'
- * 	s1 = UDPSocket.new
- * 	s1.bind("127.0.0.1", 0)
- * 	s2 = UDPSocket.new
- * 	s2.bind("127.0.0.1", 0)
- * 	s2.connect(*s1.addr.values_at(3,1))
- * 	s1.connect(*s2.addr.values_at(3,1))
- * 	s1.send "aaa", 0
- * 	IO.select([s2])
- * 	p s2.recvfrom_nonblock(10)  #=> ["aaa", ["AF_INET", 33302, "localhost.localdomain", "127.0.0.1"]]
- *
- * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
- * to _recvfrom_nonblock_ fails. 
- *
- * UDPSocket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EAGAIN.
- *
- * === See
- * * Socket#recvfrom
- */
-static VALUE
-udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
-{
-    return s_recvfrom_nonblock(sock, argc, argv, RECV_IP);
-}
-
 #ifdef HAVE_SYS_UN_H
 static VALUE
 unix_init(sock, path)
@@ -1867,15 +1443,6 @@ unix_init(sock, path)
     return init_unixsock(sock, path, 0);
 }
 
-static char *
-unixpath(struct sockaddr_un *sockaddr, socklen_t len)
-{
-    if (sockaddr->sun_path < (char*)sockaddr + len)
-        return sockaddr->sun_path;
-    else
-        return "";
-}
-
 static VALUE
 unix_path(sock)
     VALUE sock;
@@ -1888,12 +1455,19 @@ unix_path(sock)
 	socklen_t len = sizeof(addr);
 	if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	    rb_sys_fail(0);
-	fptr->path = strdup(unixpath(&addr, len));
+	fptr->path = strdup(addr.sun_path);
     }
     return rb_str_new2(fptr->path);
 }
 
 static VALUE
+unix_svr_s_open(klass, path)
+    VALUE klass, path;
+{
+    return init_unixsock(rb_obj_alloc(klass), path, 1);
+}
+
+static VALUE
 unix_svr_init(sock, path)
     VALUE sock, path;
 {
@@ -1909,30 +1483,18 @@ unix_recvfrom(argc, argv, sock)
     return s_recvfrom(sock, argc, argv, RECV_UNIX);
 }
 
-#if defined(HAVE_ST_MSG_CONTROL) && defined(SCM_RIGHTS)
-#define FD_PASSING_BY_MSG_CONTROL 1
-#else
-#define FD_PASSING_BY_MSG_CONTROL 0
-#endif
-
-#if defined(HAVE_ST_MSG_ACCRIGHTS)
-#define FD_PASSING_BY_MSG_ACCRIGHTS 1
-#else
-#define FD_PASSING_BY_MSG_ACCRIGHTS 0
-#endif
-
 static VALUE
 unix_send_io(sock, val)
     VALUE sock, val;
 {
-#if defined(HAVE_SENDMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+#if 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 FD_PASSING_BY_MSG_CONTROL
+#if defined(HAVE_ST_MSG_CONTROL)
     struct {
 	struct cmsghdr hdr;
 	int fd;
@@ -1948,7 +1510,7 @@ unix_send_io(sock, val)
         fd = FIX2INT(val);
     }
     else {
-	rb_raise(rb_eTypeError, "neither IO nor file descriptor");
+	rb_raise(rb_eTypeError, "IO nor file descriptor");
     }
 
     GetOpenFile(sock, fptr);
@@ -1963,11 +1525,11 @@ unix_send_io(sock, val)
     msg.msg_iov = vec;
     msg.msg_iovlen = 1;
 
-#if FD_PASSING_BY_MSG_CONTROL
+#if defined(HAVE_ST_MSG_CONTROL)
     msg.msg_control = (caddr_t)&cmsg;
-    msg.msg_controllen = CMSG_SPACE(sizeof(int));
+    msg.msg_controllen = sizeof(struct cmsghdr) + sizeof(int);
     msg.msg_flags = 0;
-    cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
+    cmsg.hdr.cmsg_len = sizeof(struct cmsghdr) + sizeof(int);
     cmsg.hdr.cmsg_level = SOL_SOCKET;
     cmsg.hdr.cmsg_type = SCM_RIGHTS;
     cmsg.fd = fd;
@@ -1982,30 +1544,16 @@ unix_send_io(sock, val)
     return Qnil;
 #else
     rb_notimplement();
-    return Qnil;		/* not reached */
 #endif
 }
 
-#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_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) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+#if defined(HAVE_ST_MSG_CONTROL) || defined(HAVE_ST_MSG_ACCRIGHTS)
     VALUE klass, mode;
     OpenFile *fptr;
     struct msghdr msg;
@@ -2013,7 +1561,7 @@ unix_recv_io(argc, argv, sock)
     char buf[1];
 
     int fd;
-#if FD_PASSING_BY_MSG_CONTROL
+#if defined(HAVE_ST_MSG_CONTROL)
     struct {
 	struct cmsghdr hdr;
 	int fd;
@@ -2038,11 +1586,11 @@ unix_recv_io(argc, argv, sock)
     msg.msg_iov = vec;
     msg.msg_iovlen = 1;
 
-#if FD_PASSING_BY_MSG_CONTROL
+#if defined(HAVE_ST_MSG_CONTROL)
     msg.msg_control = (caddr_t)&cmsg;
-    msg.msg_controllen = CMSG_SPACE(sizeof(int));
+    msg.msg_controllen = sizeof(struct cmsghdr) + sizeof(int);
     msg.msg_flags = 0;
-    cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
+    cmsg.hdr.cmsg_len = sizeof(struct cmsghdr) + sizeof(int);
     cmsg.hdr.cmsg_level = SOL_SOCKET;
     cmsg.hdr.cmsg_type = SCM_RIGHTS;
     cmsg.fd = -1;
@@ -2055,36 +1603,20 @@ unix_recv_io(argc, argv, sock)
     if (recvmsg(fileno(fptr->f), &msg, 0) == -1)
 	rb_sys_fail("recvmsg(2)");
 
-#if FD_PASSING_BY_MSG_CONTROL
-    if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) {
-      rb_raise(rb_eSocket,
-          "file descriptor was not passed (msg_controllen : %d != %d)",
-          msg.msg_controllen, CMSG_SPACE(sizeof(int)));
-    }
-    if (cmsg.hdr.cmsg_len != CMSG_SPACE(0) + sizeof(int)) {
-      rb_raise(rb_eSocket,
-          "file descriptor was not passed (cmsg_len : %d != %d)",
-          cmsg.hdr.cmsg_len, CMSG_SPACE(0) + sizeof(int));
-    }
-    if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
-      rb_raise(rb_eSocket,
-          "file descriptor was not passed (cmsg_level : %d != %d)",
-          cmsg.hdr.cmsg_level, SOL_SOCKET);
-    }
-    if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
-      rb_raise(rb_eSocket,
-          "file descriptor was not passed (cmsg_type : %d != %d)",
-          cmsg.hdr.cmsg_type, SCM_RIGHTS);
-    }
+    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
-    if (msg.msg_accrightslen != sizeof(fd)) {
-	rb_raise(rb_eSocket,
-            "file descriptor was not passed (accrightslen) : %d != %d",
-            msg.msg_accrightslen, sizeof(fd));
-    }
+        msg.msg_accrightslen != sizeof(fd)
 #endif
+	) {
+	rb_raise(rb_eSocket, "File descriptor was not passed");
+    }
 
-#if FD_PASSING_BY_MSG_CONTROL
+#if defined(HAVE_ST_MSG_CONTROL)
     fd = cmsg.fd;
 #endif
 
@@ -2103,7 +1635,6 @@ unix_recv_io(argc, argv, sock)
     }
 #else
     rb_notimplement();
-    return Qnil;		/* not reached */
 #endif
 }
 
@@ -2121,49 +1652,6 @@ unix_accept(sock)
 		    (struct sockaddr*)&from, &fromlen);
 }
 
-/*
- * call-seq:
- * 	unixserver.accept_nonblock => unixsocket
- * 
- * Accepts an incoming connection using accept(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * It returns an accepted UNIXSocket for the incoming connection.
- * 
- * === Example
- * 	require 'socket'
- * 	serv = UNIXServer.new("/tmp/sock")
- * 	begin
- * 	  sock = serv.accept_nonblock
- * 	rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
- * 	  IO.select([serv])
- * 	  retry
- * 	end
- * 	# sock is an accepted socket.
- * 
- * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to UNIXServer#accept_nonblock fails. 
- *
- * UNIXServer#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EAGAIN.
- * 
- * === See
- * * UNIXServer#accept
- * * Socket#accept
- */
-static VALUE
-unix_accept_nonblock(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    struct sockaddr_un from;
-    socklen_t fromlen;
-
-    GetOpenFile(sock, fptr);
-    fromlen = sizeof(from);
-    return s_accept_nonblock(rb_cUNIXSocket, fptr,
-                             (struct sockaddr *)&from, &fromlen);
-}
-
 static VALUE
 unix_sysaccept(sock)
     VALUE sock;
@@ -2178,12 +1666,11 @@ unix_sysaccept(sock)
 }
 
 static VALUE
-unixaddr(sockaddr, len)
+unixaddr(sockaddr)
     struct sockaddr_un *sockaddr;
-    socklen_t len;
 {
     return rb_assoc_new(rb_str_new2("AF_UNIX"),
-                        rb_str_new2(unixpath(sockaddr, len)));
+			rb_str_new2(sockaddr->sun_path));
 }
 
 static VALUE
@@ -2198,7 +1685,9 @@ unix_addr(sock)
 
     if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
-    return unixaddr(&addr, len);
+    if (len == 0)
+        addr.sun_path[0] = '\0';
+    return unixaddr(&addr);
 }
 
 static VALUE
@@ -2213,7 +1702,9 @@ unix_peeraddr(sock)
 
     if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
-    return unixaddr(&addr, len);
+    if (len == 0)
+        addr.sun_path[0] = '\0';
+    return unixaddr(&addr);
 }
 #endif
 
@@ -2222,13 +1713,10 @@ setup_domain_and_type(domain, dv, type, tv)
     VALUE domain, type;
     int *dv, *tv;
 {
-    VALUE tmp;
     char *ptr;
 
-    tmp = rb_check_string_type(domain);
-    if (!NIL_P(tmp)) {
-	domain = tmp;
-	rb_check_safe_obj(domain);
+    if (TYPE(domain) == T_STRING) {
+	SafeStringValue(domain);
 	ptr = RSTRING(domain)->ptr;
 	if (strcmp(ptr, "AF_INET") == 0)
 	    *dv = AF_INET;
@@ -2271,15 +1759,13 @@ setup_domain_and_type(domain, dv, type, tv)
 	    *dv = PF_IPX;
 #endif
 	else
-	    rb_raise(rb_eSocket, "unknown socket domain %s", ptr);
+	    rb_raise(rb_eSocket, "Unknown socket domain %s", ptr);
     }
     else {
 	*dv = NUM2INT(domain);
     }
-    tmp = rb_check_string_type(type);
-    if (!NIL_P(tmp)) {
-	type = tmp;
-	rb_check_safe_obj(type);
+    if (TYPE(type) == T_STRING) {
+	SafeStringValue(type);
 	ptr = RSTRING(type)->ptr;
 	if (strcmp(ptr, "SOCK_STREAM") == 0)
 	    *tv = SOCK_STREAM;
@@ -2302,7 +1788,7 @@ setup_domain_and_type(domain, dv, type, tv)
 	    *tv = SOCK_PACKET;
 #endif
 	else
-	    rb_raise(rb_eSocket, "unknown socket type %s", ptr);
+	    rb_raise(rb_eSocket, "Unknown socket type %s", ptr);
     }
     else {
 	*tv = NUM2INT(type);
@@ -2310,7 +1796,7 @@ setup_domain_and_type(domain, dv, type, tv)
 }
 
 static VALUE
-sock_initialize(sock, domain, type, protocol)
+sock_init(sock, domain, type, protocol)
     VALUE sock, domain, type, protocol;
 {
     int fd;
@@ -2328,18 +1814,16 @@ static VALUE
 sock_s_socketpair(klass, domain, type, protocol)
     VALUE klass, domain, type, protocol;
 {
-#if defined HAVE_SOCKETPAIR
-    int d, t, p, sp[2];
-    int ret;
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(__EMX__) && !defined(__QNXNTO__)
+    int d, t, sp[2];
 
     setup_domain_and_type(domain, &d, type, &t);
-    p = NUM2INT(protocol);
-    ret = socketpair(d, t, p, sp);
-    if (ret < 0 && (errno == EMFILE || errno == ENFILE)) {
-        rb_gc();
-        ret = socketpair(d, t, p, sp);
-    }
-    if (ret < 0) {
+  again:
+    if (socketpair(d, t, NUM2INT(protocol), sp) < 0) {
+	if (errno == EMFILE || errno == ENFILE) {
+	    rb_gc();
+	    goto again;
+	}
 	rb_sys_fail("socketpair(2)");
     }
 
@@ -2370,117 +1854,6 @@ unix_s_socketpair(argc, argv, klass)
 }
 #endif
 
-/*
- * call-seq:
- * 	socket.connect(server_sockaddr) => 0
- * 
- * Requests a connection to be made on the given +server_sockaddr+. Returns 0 if
- * successful, otherwise an exception is raised.
- *  
- * === Parameter
- * * +server_sockaddr+ - the +struct+ sockaddr contained in a string
- * 
- * === Example:
- * 	# Pull down Google's web page
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 80, 'www.google.com' )
- * 	socket.connect( sockaddr )
- * 	socket.write( "GET / HTTP/1.0\r\n\r\n" )
- * 	results = socket.read 
- * 
- * === Unix-based Exceptions
- * On unix-based systems the following system exceptions may be raised if 
- * the call to _connect_ fails:
- * * Errno::EACCES - search permission is denied for a component of the prefix
- *   path or write access to the +socket+ is denided
- * * Errno::EADDRINUSE - the _sockaddr_ is already in use
- * * Errno::EADDRNOTAVAIL - the specified _sockaddr_ is not available from the
- *   local machine
- * * Errno::EAFNOSUPPORT - the specified _sockaddr_ is not a valid address for 
- *   the address family of the specified +socket+
- * * Errno::EALREADY - a connection is already in progress for the specified
- *   socket
- * * Errno::EBADF - the +socket+ is not a valid file descriptor
- * * Errno::ECONNREFUSED - the target _sockaddr_ was not listening for connections
- *   refused the connection request
- * * Errno::ECONNRESET - the remote host reset the connection request
- * * Errno::EFAULT - the _sockaddr_ cannot be accessed
- * * Errno::EHOSTUNREACH - the destination host cannot be reached (probably 
- *   because the host is down or a remote router cannot reach it)
- * * Errno::EINPROGRESS - the O_NONBLOCK is set for the +socket+ and the
- *   connection cnanot be immediately established; the connection will be
- *   established asynchronously
- * * Errno::EINTR - the attempt to establish the connection was interrupted by
- *   delivery of a signal that was caught; the connection will be established
- *   asynchronously
- * * Errno::EISCONN - the specified +socket+ is already connected
- * * Errno::EINVAL - the address length used for the _sockaddr_ is not a valid
- *   length for the address family or there is an invalid family in _sockaddr_ 
- * * Errno::ENAMETOOLONG - the pathname resolved had a length which exceeded
- *   PATH_MAX
- * * Errno::ENETDOWN - the local interface used to reach the destination is down
- * * Errno::ENETUNREACH - no route to the network is present
- * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOSR - there were insufficient STREAMS resources available to 
- *   complete the operation
- * * Errno::ENOTSOCK - the +socket+ argument does not refer to a socket
- * * Errno::EOPNOTSUPP - the calling +socket+ is listening and cannot be connected
- * * Errno::EPROTOTYPE - the _sockaddr_ has a different type than the socket 
- *   bound to the specified peer address
- * * Errno::ETIMEDOUT - the attempt to connect time out before a connection
- *   was made.
- * 
- * On unix-based systems if the address family of the calling +socket+ is
- * AF_UNIX the follow exceptions may be raised if the call to _connect_
- * fails:
- * * Errno::EIO - an i/o error occured while reading from or writing to the 
- *   file system
- * * Errno::ELOOP - too many symbolic links were encountered in translating
- *   the pathname in _sockaddr_
- * * Errno::ENAMETOOLLONG - a component of a pathname exceeded NAME_MAX 
- *   characters, or an entired pathname exceeded PATH_MAX characters
- * * Errno::ENOENT - a component of the pathname does not name an existing file
- *   or the pathname is an empty string
- * * Errno::ENOTDIR - a component of the path prefix of the pathname in _sockaddr_
- *   is not a directory 
- * 
- * === Windows Exceptions
- * On Windows systems the following system exceptions may be raised if 
- * the call to _connect_ fails:
- * * Errno::ENETDOWN - the network is down
- * * Errno::EADDRINUSE - the socket's local address is already in use
- * * Errno::EINTR - the socket was cancelled
- * * Errno::EINPROGRESS - a blocking socket is in progress or the service provider
- *   is still processing a callback function. Or a nonblocking connect call is 
- *   in progress on the +socket+.
- * * Errno::EALREADY - see Errno::EINVAL
- * * Errno::EADDRNOTAVAIL - the remote address is not a valid address, such as 
- *   ADDR_ANY TODO check ADDRANY TO INADDR_ANY
- * * Errno::EAFNOSUPPORT - addresses in the specified family cannot be used with
- *   with this +socket+
- * * Errno::ECONNREFUSED - the target _sockaddr_ was not listening for connections
- *   refused the connection request
- * * Errno::EFAULT - the socket's internal address or address length parameter
- *   is too small or is not a valid part of the user space address
- * * Errno::EINVAL - the +socket+ is a listening socket
- * * Errno::EISCONN - the +socket+ is already connected
- * * Errno::ENETUNREACH - the network cannot be reached from this host at this time
- * * Errno::EHOSTUNREACH - no route to the network is present
- * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOTSOCK - the +socket+ argument does not refer to a socket
- * * Errno::ETIMEDOUT - the attempt to connect time out before a connection
- *   was made.
- * * Errno::EWOULDBLOCK - the socket is marked as nonblocking and the 
- *   connection cannot be completed immediately
- * * Errno::EACCES - the attempt to connect the datagram socket to the 
- *   broadcast address failed
- * 
- * === See
- * * connect manual pages on unix-based systems
- * * connect function in Microsoft's Winsock functions reference
- */
 static VALUE
 sock_connect(sock, addr)
     VALUE sock, addr;
@@ -2489,7 +1862,8 @@ sock_connect(sock, addr)
     int fd;
 
     StringValue(addr);
-    addr = rb_str_new4(addr);
+    rb_str_modify(addr);
+
     GetOpenFile(sock, fptr);
     fd = fileno(fptr->f);
     if (ruby_connect(fd, (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len, 0) < 0) {
@@ -2499,142 +1873,6 @@ sock_connect(sock, addr)
     return INT2FIX(0);
 }
 
-/*
- * call-seq:
- * 	socket.connect_nonblock(server_sockaddr) => 0
- * 
- * Requests a connection to be made on the given +server_sockaddr+ after
- * O_NONBLOCK is set for the underlying file descriptor.
- * Returns 0 if successful, otherwise an exception is raised.
- *  
- * === Parameter
- * * +server_sockaddr+ - the +struct+ sockaddr contained in a string
- * 
- * === Example:
- * 	# Pull down Google's web page
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
- * 	sockaddr = Socket.sockaddr_in(80, 'www.google.com')
- * 	begin
- * 	  socket.connect_nonblock(sockaddr)
- * 	rescue Errno::EINPROGRESS
- * 	  IO.select(nil, [socket])
- * 	  begin
- * 	    socket.connect_nonblock(sockaddr)
- * 	  rescue Errno::EISCONN
- * 	  end
- * 	end
- * 	socket.write("GET / HTTP/1.0\r\n\r\n")
- * 	results = socket.read 
- * 
- * Refer to Socket#connect for the exceptions that may be thrown if the call
- * to _connect_nonblock_ fails. 
- *
- * Socket#connect_nonblock may raise any error corresponding to connect(2) failure,
- * including Errno::EINPROGRESS.
- *
- * === See
- * * Socket#connect
- */
-static VALUE
-sock_connect_nonblock(sock, addr)
-    VALUE sock, addr;
-{
-    OpenFile *fptr;
-    int n;
-
-    StringValue(addr);
-    addr = rb_str_new4(addr);
-    GetOpenFile(sock, fptr);
-    rb_io_set_nonblock(fptr);
-    n = connect(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len);
-    if (n < 0) {
-	rb_sys_fail("connect(2)");
-    }
-
-    return INT2FIX(n);
-}
-
-/*
- * call-seq:
- * 	socket.bind(server_sockaddr) => 0
- * 
- * Binds to the given +struct+ sockaddr.
- * 
- * === Parameter
- * * +server_sockaddr+ - the +struct+ sockaddr contained in a string
- *
- * === Example
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- * 	socket.bind( sockaddr )
- *  
- * === Unix-based Exceptions
- * On unix-based based systems the following system exceptions may be raised if 
- * the call to _bind_ fails:
- * * Errno::EACCES - the specified _sockaddr_ is protected and the current
- *   user does not have permission to bind to it
- * * Errno::EADDRINUSE - the specified _sockaddr_ is already in use
- * * Errno::EADDRNOTAVAIL - the specified _sockaddr_ is not available from the
- *   local machine
- * * Errno::EAFNOSUPPORT - the specified _sockaddr_ isnot a valid address for
- *   the family of the calling +socket+
- * * Errno::EBADF - the _sockaddr_ specified is not a valid file descriptor
- * * Errno::EFAULT - the _sockaddr_ argument cannot be accessed
- * * Errno::EINVAL - the +socket+ is already bound to an address, and the 
- *   protocol does not support binding to the new _sockaddr_ or the +socket+
- *   has been shut down.
- * * Errno::EINVAL - the address length is not a valid length for the address
- *   family
- * * Errno::ENAMETOOLONG - the pathname resolved had a length which exceeded
- *   PATH_MAX
- * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOSR - there were insufficient STREAMS resources available to 
- *   complete the operation
- * * Errno::ENOTSOCK - the +socket+ does not refer to a socket
- * * Errno::EOPNOTSUPP - the socket type of the +socket+ does not support 
- *   binding to an address
- * 
- * On unix-based based systems if the address family of the calling +socket+ is
- * Socket::AF_UNIX the follow exceptions may be raised if the call to _bind_
- * fails:
- * * Errno::EACCES - search permission is denied for a component of the prefix
- *   path or write access to the +socket+ is denided
- * * Errno::EDESTADDRREQ - the _sockaddr_ argument is a null pointer
- * * Errno::EISDIR - same as Errno::EDESTADDRREQ
- * * Errno::EIO - an i/o error occurred
- * * Errno::ELOOP - too many symbolic links were encountered in translating
- *   the pathname in _sockaddr_
- * * Errno::ENAMETOOLLONG - a component of a pathname exceeded NAME_MAX 
- *   characters, or an entired pathname exceeded PATH_MAX characters
- * * Errno::ENOENT - a component of the pathname does not name an existing file
- *   or the pathname is an empty string
- * * Errno::ENOTDIR - a component of the path prefix of the pathname in _sockaddr_
- *   is not a directory
- * * Errno::EROFS - the name would reside on a read only filesystem
- * 
- * === Windows Exceptions
- * On Windows systems the following system exceptions may be raised if 
- * the call to _bind_ fails:
- * * Errno::ENETDOWN-- the network is down
- * * Errno::EACCES - the attempt to connect the datagram socket to the 
- *   broadcast address failed
- * * Errno::EADDRINUSE - the socket's local address is already in use
- * * Errno::EADDRNOTAVAIL - the specified address is not a valid address for this
- *   computer
- * * Errno::EFAULT - the socket's internal address or address length parameter
- *   is too small or is not a valid part of the user space addressed
- * * Errno::EINVAL - the +socket+ is already bound to an address
- * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOTSOCK - the +socket+ argument does not refer to a socket
- * 
- * === See
- * * bind manual pages on unix-based systems
- * * bind function in Microsoft's Winsock functions reference
- */ 
 static VALUE
 sock_bind(sock, addr)
     VALUE sock, addr;
@@ -2642,6 +1880,8 @@ sock_bind(sock, addr)
     OpenFile *fptr;
 
     StringValue(addr);
+    rb_str_modify(addr);
+
     GetOpenFile(sock, fptr);
     if (bind(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len) < 0)
 	rb_sys_fail("bind(2)");
@@ -2649,197 +1889,20 @@ sock_bind(sock, addr)
     return INT2FIX(0);
 }
 
-/*
- * call-seq:
- * 	socket.listen( int ) => 0
- * 
- * Listens for connections, using the specified +int+ as the backlog. A call
- * to _listen_ only applies if the +socket+ is of type SOCK_STREAM or 
- * SOCK_SEQPACKET.
- * 
- * === Parameter
- * * +backlog+ - the maximum length of the queue for pending connections.
- * 
- * === Example 1
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- * 	socket.bind( sockaddr )
- * 	socket.listen( 5 )
- * 
- * === Example 2 (listening on an arbitary port, unix-based systems only):
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	socket.listen( 1 )
- * 
- * === Unix-based Exceptions
- * On unix based systems the above will work because a new +sockaddr+ struct
- * is created on the address ADDR_ANY, for an arbitrary port number as handed
- * off by the kernel. It will not work on Windows, because Windows requires that
- * the +socket+ is bound by calling _bind_ before it can _listen_.
- * 
- * If the _backlog_ amount exceeds the implementation-dependent maximum
- * queue length, the implementation's maximum queue length will be used.
- * 
- * On unix-based based systems the following system exceptions may be raised if the
- * call to _listen_ fails:
- * * Errno::EBADF - the _socket_ argument is not a valid file descriptor
- * * Errno::EDESTADDRREQ - the _socket_ is not bound to a local address, and 
- *   the protocol does not support listening on an unbound socket
- * * Errno::EINVAL - the _socket_ is already connected
- * * Errno::ENOTSOCK - the _socket_ argument does not refer to a socket
- * * Errno::EOPNOTSUPP - the _socket_ protocol does not support listen
- * * Errno::EACCES - the calling process does not have approriate privileges
- * * Errno::EINVAL - the _socket_ has been shut down
- * * Errno::ENOBUFS - insufficient resources are available in the system to 
- *   complete the call
- * 
- * === Windows Exceptions
- * On Windows systems the following system exceptions may be raised if 
- * the call to _listen_ fails:
- * * Errno::ENETDOWN - the network is down
- * * Errno::EADDRINUSE - the socket's local address is already in use. This 
- *   usually occurs during the execution of _bind_ but could be delayed
- *   if the call to _bind_ was to a partially wildcard address (involving
- *   ADDR_ANY) and if a specific address needs to be commmitted at the 
- *   time of the call to _listen_
- * * Errno::EINPROGRESS - a Windows Sockets 1.1 call is in progress or the
- *   service provider is still processing a callback function
- * * Errno::EINVAL - the +socket+ has not been bound with a call to _bind_.
- * * Errno::EISCONN - the +socket+ is already connected
- * * Errno::EMFILE - no more socket descriptors are available
- * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOTSOC - +socket+ is not a socket
- * * Errno::EOPNOTSUPP - the referenced +socket+ is not a type that supports
- *   the _listen_ method
- * 
- * === See
- * * listen manual pages on unix-based systems
- * * listen function in Microsoft's Winsock functions reference
- */
 static VALUE
 sock_listen(sock, log)
-    VALUE sock, log;
+   VALUE sock, log;
 {
     OpenFile *fptr;
-    int backlog;
 
     rb_secure(4);
-    backlog = NUM2INT(log);
     GetOpenFile(sock, fptr);
-    if (listen(fileno(fptr->f), backlog) < 0)
+    if (listen(fileno(fptr->f), NUM2INT(log)) < 0)
 	rb_sys_fail("listen(2)");
 
     return INT2FIX(0);
 }
 
-/*
- * call-seq:
- * 	socket.recvfrom(maxlen) => [mesg, sender_sockaddr]
- * 	socket.recvfrom(maxlen, flags) => [mesg, sender_sockaddr]
- * 
- * Receives up to _maxlen_ bytes from +socket+. _flags_ is zero or more
- * of the +MSG_+ options. The first element of the results, _mesg_, is the data
- * received. The second element, _sender_sockaddr_, contains protocol-specific information
- * on the sender.
- * 
- * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options 
- * 
- * === Example
- * 	# In one file, start this first
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- * 	socket.bind( sockaddr )
- * 	socket.listen( 5 )
- * 	client, client_sockaddr = socket.accept
- * 	data = client.recvfrom( 20 )[0].chomp
- * 	puts "I only received 20 bytes '#{data}'"
- * 	sleep 1
- * 	socket.close
- * 
- * 	# In another file, start this second
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- * 	socket.connect( sockaddr )
- * 	socket.puts "Watch this get cut short!"
- * 	socket.close 
- * 
- * === Unix-based Exceptions
- * On unix-based based systems the following system exceptions may be raised if the
- * call to _recvfrom_ fails:
- * * Errno::EAGAIN - the +socket+ file descriptor is marked as O_NONBLOCK and no
- *   data is waiting to be received; or MSG_OOB is set and no out-of-band data
- *   is available and either the +socket+ file descriptor is marked as 
- *   O_NONBLOCK or the +socket+ does not support blocking to wait for 
- *   out-of-band-data
- * * Errno::EWOULDBLOCK - see Errno::EAGAIN
- * * Errno::EBADF - the +socket+ is not a valid file descriptor
- * * Errno::ECONNRESET - a connection was forcibly closed by a peer
- * * Errno::EFAULT - the socket's internal buffer, address or address length 
- *   cannot be accessed or written
- * * Errno::EINTR - a signal interupted _recvfrom_ before any data was available
- * * Errno::EINVAL - the MSG_OOB flag is set and no out-of-band data is available
- * * Errno::EIO - an i/o error occurred while reading from or writing to the 
- *   filesystem
- * * Errno::ENOBUFS - insufficient resources were available in the system to 
- *   perform the operation
- * * Errno::ENOMEM - insufficient memory was available to fulfill the request
- * * Errno::ENOSR - there were insufficient STREAMS resources available to 
- *   complete the operation
- * * Errno::ENOTCONN - a receive is attempted on a connection-mode socket that
- *   is not connected
- * * Errno::ENOTSOCK - the +socket+ does not refer to a socket
- * * Errno::EOPNOTSUPP - the specified flags are not supported for this socket type
- * * Errno::ETIMEDOUT - the connection timed out during connection establishment
- *   or due to a transmission timeout on an active connection
- * 
- * === Windows Exceptions
- * On Windows systems the following system exceptions may be raised if 
- * the call to _recvfrom_ fails:
- * * Errno::ENETDOWN - the network is down
- * * Errno::EFAULT - the internal buffer and from parameters on +socket+ are not
- *   part of the user address space, or the internal fromlen parameter is
- *   too small to accomodate the peer address
- * * Errno::EINTR - the (blocking) call was cancelled by an internal call to
- *   the WinSock function WSACancelBlockingCall
- * * Errno::EINPROGRESS - a blocking Windows Sockets 1.1 call is in progress or 
- *   the service provider is still processing a callback function
- * * Errno::EINVAL - +socket+ has not been bound with a call to _bind_, or an
- *   unknown flag was specified, or MSG_OOB was specified for a socket with
- *   SO_OOBINLINE enabled, or (for byte stream-style sockets only) the internal
- *   len parameter on +socket+ was zero or negative
- * * Errno::EISCONN - +socket+ is already connected. The call to _recvfrom_ is
- *   not permitted with a connected socket on a socket that is connetion 
- *   oriented or connectionless.
- * * Errno::ENETRESET - the connection has been broken due to the keep-alive 
- *   activity detecting a failure while the operation was in progress.
- * * Errno::EOPNOTSUPP - MSG_OOB was specified, but +socket+ is not stream-style
- *   such as type SOCK_STREAM. OOB data is not supported in the communication
- *   domain associated with +socket+, or +socket+ is unidirectional and 
- *   supports only send operations
- * * Errno::ESHUTDOWN - +socket+ has been shutdown. It is not possible to 
- *   call _recvfrom_ on a socket after _shutdown_ has been invoked.
- * * Errno::EWOULDBLOCK - +socket+ is marked as nonblocking and a  call to 
- *   _recvfrom_ would block.
- * * Errno::EMSGSIZE - the message was too large to fit into the specified buffer
- *   and was truncated.
- * * Errno::ETIMEDOUT - the connection has been dropped, because of a network
- *   failure or because the system on the other end went down without
- *   notice
- * * Errno::ECONNRESET - the virtual circuit was reset by the remote side 
- *   executing a hard or abortive close. The application should close the
- *   socket; it is no longer usable. On a UDP-datagram socket this error
- *   indicates a previous send operation resulted in an ICMP Port Unreachable
- *   message.
- */
 static VALUE
 sock_recvfrom(argc, argv, sock)
     int argc;
@@ -2849,155 +1912,9 @@ sock_recvfrom(argc, argv, sock)
     return s_recvfrom(sock, argc, argv, RECV_SOCKET);
 }
 
-/*
- * call-seq:
- * 	socket.recvfrom_nonblock(maxlen) => [mesg, sender_sockaddr]
- * 	socket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_sockaddr]
- * 
- * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * _flags_ is zero or more of the +MSG_+ options.
- * The first element of the results, _mesg_, is the data received.
- * The second element, _sender_sockaddr_, contains protocol-specific information
- * on the sender.
- *
- * When recvfrom(2) returns 0, Socket#recvfrom_nonblock returns
- * an empty string as data.
- * The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
- * 
- * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options 
- * 
- * === Example
- * 	# In one file, start this first
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
- * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
- * 	socket.bind(sockaddr)
- * 	socket.listen(5)
- * 	client, client_sockaddr = socket.accept
- * 	begin
- * 	  pair = client.recvfrom_nonblock(20)
- * 	rescue Errno::EAGAIN
- * 	  IO.select([client])
- * 	  retry
- * 	end
- * 	data = pair[0].chomp
- * 	puts "I only received 20 bytes '#{data}'"
- * 	sleep 1
- * 	socket.close
- * 
- * 	# In another file, start this second
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
- * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
- * 	socket.connect(sockaddr)
- * 	socket.puts "Watch this get cut short!"
- * 	socket.close 
- * 
- * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
- * to _recvfrom_nonblock_ fails. 
- *
- * Socket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EAGAIN.
- *
- * === See
- * * Socket#recvfrom
- */
-static VALUE
-sock_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
-{
-    return s_recvfrom_nonblock(sock, argc, argv, RECV_SOCKET);
-}
-
-/*
- * call-seq:
- * 	socket.accept => [ socket, string ]
- * 
- * Accepts an incoming connection returning an array containing a new
- * Socket object and a string holding the +struct+ sockaddr information about 
- * the caller.
- * 
- * === Example
- * 	# In one script, start this first
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- * 	socket.bind( sockaddr )
- * 	socket.listen( 5 )
- * 	client, client_sockaddr = socket.accept
- * 	puts "The client said, '#{socket.readline.chomp}'"
- * 	client.puts "Hello from script one!"
- * 	socket.close
- * 
- * 	# In another script, start this second
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- * 	socket.connect( sockaddr )
- * 	socket.puts "Hello from script 2." 
- * 	puts "The server said, '#{socket.readline.chomp}'"
- * 	socket.close 
- * 
- * === Unix-based Exceptions
- * On unix-based based systems the following system exceptions may be raised if the
- * call to _accept_ fails:
- * * Errno::EAGAIN - O_NONBLOCK is set for the +socket+ file descriptor and no 
- *   connections are parent to be accepted
- * * Errno::EWOULDBLOCK - same as Errno::EAGAIN
- * * Errno::EBADF - the +socket+ is not a valid file descriptor
- * * Errno::ECONNABORTED - a connection has been aborted
- * * Errno::EFAULT - the socket's internal address or address length parameter 
- *   cannot be access or written
- * * Errno::EINTR - the _accept_ method was interrupted by a signal that was 
- *   caught before a valid connection arrived
- * * Errno::EINVAL - the +socket+ is not accepting connections
- * * Errno::EMFILE - OPEN_MAX file descriptors are currently open in the calling 
- *   process
- * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOMEM - there was insufficient memory available to complete the
- *   operation
- * * Errno::ENOSR - there was insufficient STREAMS resources available to 
- *   complete the operation
- * * Errno::ENFILE - the maximum number of file descriptors in the system are 
- *   already open
- * * Errno::ENOTSOCK - the +socket+ does not refer to a socket
- * * Errno::EOPNOTSUPP - the socket type for the calling +socket+ does not 
- *   support accept connections
- * * Errno::EPROTO - a protocol error has occurred
- * 
- * === Windows Exceptions
- * On Windows systems the following system exceptions may be raised if 
- * the call to _accept_ fails:
- * * Errno::ECONNRESET - an incoming connection was indicated, but was 
- *   terminated by the remote peer prior to accepting the connection
- * * Errno::EFAULT - the socket's internal address or address length parameter
- *   is too small or is not a valid part of the user space address
- * * Errno::EINVAL - the _listen_ method was not invoked prior to calling _accept_
- * * Errno::EINPROGRESS - a blocking Windows Sockets 1.1 call is in progress or
- *   the service provider is still processing a callback function
- * * Errno::EMFILE - the queue is not empty, upong etry to _accept_ and there are
- *   no socket descriptors available
- * * Errno::ENETDOWN - the network is down
- * * Errno::ENOBUFS - no buffer space is available
- * * Errno::ENOTSOCK - +socket+ is not a socket
- * * Errno::EOPNOTSUPP - +socket+ is not a type that supports connection-oriented
- *   service.
- * * Errno::EWOULDBLOCK - +socket+ is marked as nonblocking and no connections are
- *   present to be accepted
- * 
- * === See
- * * accept manual pages on unix-based systems
- * * accept function in Microsoft's Winsock functions reference
- */
 static VALUE
 sock_accept(sock)
-    VALUE sock;
+   VALUE sock;
 {
     OpenFile *fptr;
     VALUE sock2;
@@ -3010,110 +1927,9 @@ sock_accept(sock)
     return rb_assoc_new(sock2, rb_str_new(buf, len));
 }
 
-/*
- * call-seq:
- *    socket.accept_nonblock => [client_socket, client_sockaddr]
- * 
- * Accepts an incoming connection using accept(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * It returns an array containg the accpeted socket
- * for the incoming connection, _client_socket_,
- * and a string that contains the +struct+ sockaddr information
- * about the caller, _client_sockaddr_.
- * 
- * === Example
- * 	# In one script, start this first
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
- * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
- * 	socket.bind(sockaddr)
- * 	socket.listen(5)
- * 	begin
- * 	  client_socket, client_sockaddr = socket.accept_nonblock
- * 	rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
- * 	  IO.select([socket])
- * 	  retry
- * 	end
- * 	puts "The client said, '#{socket.readline.chomp}'"
- * 	client_socket.puts "Hello from script one!"
- * 	socket.close
- *
- * 	# In another script, start this second
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
- * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
- * 	socket.connect(sockaddr)
- * 	socket.puts "Hello from script 2." 
- * 	puts "The server said, '#{socket.readline.chomp}'"
- * 	socket.close
- * 
- * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to _accept_nonblock_ fails. 
- *
- * Socket#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EAGAIN.
- * 
- * === See
- * * Socket#accept
- */
-static VALUE
-sock_accept_nonblock(sock)
-    VALUE sock;
-{
-    OpenFile *fptr;
-    VALUE sock2;
-    char buf[1024];
-    socklen_t len = sizeof buf;
-
-    GetOpenFile(sock, fptr);
-    sock2 = s_accept_nonblock(rb_cSocket, fptr, (struct sockaddr *)buf, &len);
-    return rb_assoc_new(sock2, rb_str_new(buf, len));
-}
-
-/*
- * call-seq:
- * 	socket.sysaccept => [client_socket_fd, client_sockaddr]
- * 
- * Accepts an incoming connection returnings an array containg the (integer)
- * file descriptor for the incoming connection, _client_socket_fd_,
- * and a string that contains the +struct+ sockaddr information
- * about the caller, _client_sockaddr_.
- * 
- * === Example
- * 	# In one script, start this first
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- * 	socket.bind( sockaddr )
- * 	socket.listen( 5 )
- * 	client_fd, client_sockaddr = socket.sysaccept
- * 	puts "The client said, '#{socket.readline.chomp}'"
- * 	client_socket = Socket.for_fd( client_fd )
- * 	client_socket.puts "Hello from script one!"
- * 	socket.close
- * 
- * 	# In another script, start this second
- * 	require 'socket'
- * 	include Socket::Constants
- * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- * 	socket.connect( sockaddr )
- * 	socket.puts "Hello from script 2." 
- * 	puts "The server said, '#{socket.readline.chomp}'"
- * 	socket.close
- * 
- * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to _sysaccept_ fails. 
- * 
- * === See
- * * Socket#accept
- */
 static VALUE
 sock_sysaccept(sock)
-    VALUE sock;
+   VALUE sock;
 {
     OpenFile *fptr;
     VALUE sock2;
@@ -3166,7 +1982,41 @@ sock_gethostname(obj)
 #endif
 
 static VALUE
-make_addrinfo(res0)
+sock_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;
@@ -3186,134 +2036,11 @@ make_addrinfo(res0)
     return base;
 }
 
-/* Returns a String containing the binary value of a struct sockaddr. */
-VALUE
-sock_sockaddr(addr, len)
-    struct sockaddr *addr;
-    size_t len;
-{
-    char *ptr;
-
-    switch (addr->sa_family) {
-      case AF_INET:
-	ptr = (char*)&((struct sockaddr_in*)addr)->sin_addr.s_addr;
-	len = sizeof(((struct sockaddr_in*)addr)->sin_addr.s_addr);
-	break;
-#ifdef INET6
-      case AF_INET6:
-	ptr = (char*)&((struct sockaddr_in6*)addr)->sin6_addr.s6_addr;
-	len = sizeof(((struct sockaddr_in6*)addr)->sin6_addr.s6_addr);
-	break;
-#endif
-      default:
-        rb_raise(rb_eSocket, "unknown socket family:%d", addr->sa_family);
-	break;
-    }
-    return rb_str_new(ptr, len);
-}
-
-/*
- * Document-class: IPSocket
- *
- * IPSocket is the parent of TCPSocket and UDPSocket and implements
- * functionality common to them.
- *
- * A number of APIs in IPSocket, Socket, and their descendants return an
- * address as an array. The members of that array are:
- * - address family: A string like "AF_INET" or "AF_INET6" if it is one of the
- *   commonly used families, the string "unknown:#" (where `#' is the address
- *   family number) if it is not one of the common ones.  The strings map to
- *   the Socket::AF_* constants.
- * - port: The port number.
- * - name: Either the canonical name from looking the address up in the DNS, or
- *   the address in presentation format
- * - address: The address in presentation format (a dotted decimal string for
- *   IPv4, a hex string for IPv6).
- *
- * The address and port can be used directly to create sockets and to bind or
- * connect them to the address.
- */
-
-/*
- * Document-class: Socket
- *
- * Socket contains a number of generally useful singleton methods and
- * constants, as well as offering low-level interfaces that can be used to
- * develop socket applications using protocols other than TCP, UDP, and UNIX
- * domain sockets.
- */
-
-/*
- * Document-method: gethostbyname
- * call-seq: Socket.gethostbyname(host) => hostent
- *
- * Resolve +host+ and return name and address information for it, similarly to
- * gethostbyname(3). +host+ can be a domain name or the presentation format of
- * an address.
- *
- * Returns an array of information similar to that found in a +struct hostent+:
- *   - cannonical name: the cannonical name for host in the DNS, or a
- *     string representing the address
- *   - aliases: an array of aliases for the canonical name, there may be no aliases
- *   - address family: usually one of Socket::AF_INET or Socket::AF_INET6
- *   - address: a string, the binary value of the +struct sockaddr+ for this name, in
- *     the indicated address family
- *   - ...: if there are multiple addresses for this host,  a series of
- *     strings/+struct sockaddr+s may follow, not all necessarily in the same
- *     address family. Note that the fact that they may not be all in the same
- *     address family is a departure from the behaviour of gethostbyname(3).
- *
- * Note: I believe that the fact that the multiple addresses returned are not
- * necessarily in the same address family may be a bug, since if this function
- * actually called gethostbyname(3), ALL the addresses returned in the trailing
- * address list (h_addr_list from struct hostent) would be of the same address
- * family!  Examples from my system, OS X 10.3:
- *
- *   ["localhost", [], 30, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001", "\177\000\000\001"]
- *     and
- *   ["ensemble.local", [], 30, "\376\200\000\004\000\000\000\000\002\003\223\377\376\255\010\214", "\300\250{\232" ]
- *
- * Similar information can be returned by Socket.getaddrinfo if called as:
- *
- *    Socket.getaddrinfo(+host+, 0, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME)
- *
- * == Examples
- *   
- *   Socket.gethostbyname "example.com"                                                           
- *   => ["example.com", [], 2, "\300\000\"\246"]
- *   
- * This name has no DNS aliases, and a single IPv4 address.
- *   
- *   Socket.gethostbyname "smtp.telus.net"
- *   => ["smtp.svc.telus.net", ["smtp.telus.net"], 2, "\307\271\334\371"]
- *   
- * This name is an an alias so the canonical name is returned, as well as the
- * alias and a single IPv4 address.
- *   
- *   Socket.gethostbyname "localhost"
- *   => ["localhost", [], 30, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001", "\177\000\000\001"]
- *   
- * This machine has no aliases, returns an IPv6 address, and has an additional IPv4 address.
- *
- * +host+ can also be an IP address in presentation format, in which case a
- * reverse lookup is done on the address:
- *
- *   Socket.gethostbyname("127.0.0.1")
- *   => ["localhost", [], 2, "\177\000\000\001"]
- *
- *   Socket.gethostbyname("192.0.34.166")
- *   => ["www.example.com", [], 2, "\300\000\"\246"]
- *
- *
- * == See
- * See: Socket.getaddrinfo
- */
 static VALUE
 sock_s_gethostbyname(obj, host)
     VALUE obj, host;
 {
-    rb_secure(3);
-    return make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
+    return sock_mkhostent(sock_hostbyname(host));
 }
 
 static VALUE
@@ -3324,8 +2051,6 @@ sock_s_gethostbyaddr(argc, argv)
     VALUE addr, type;
     struct hostent *h;
     struct sockaddr *sa;
-    char **pch;
-    VALUE ary, names;
     int t = AF_INET;
 
     rb_scan_args(argc, argv, "11", &addr, &type);
@@ -3339,62 +2064,26 @@ sock_s_gethostbyaddr(argc, argv)
     }
 #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
-    rb_ary_push(ary, rb_str_new(h->h_addr, h->h_length));
-#endif
 
-    return ary;
+    return sock_mkhostent(h);
 }
 
-/*
- * Document-method: getservbyname
- * call-seq: Socket.getservbyname(name, proto="tcp") => port
- *
- * +name+ is a service name ("ftp", "telnet", ...) and proto is a protocol name
- * ("udp", "tcp", ...). '/etc/services' (or your system's equivalent) is
- * searched for a service for +name+ and +proto+, and the port number is
- * returned.
- *
- * Note that unlike Socket.getaddrinfo, +proto+ may not be specified using the
- * Socket::SOCK_* constants, a string must must be used.
- */
 static VALUE
 sock_s_getservbyaname(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE service, proto;
+    VALUE service, protocol;
+    char *proto;
     struct servent *sp;
     int port;
 
-    rb_scan_args(argc, argv, "11", &service, &proto);
-    if (NIL_P(proto)) proto = rb_str_new2("tcp");
-    StringValue(service);
-    StringValue(proto);
+    rb_scan_args(argc, argv, "11", &service, &protocol);
+    if (NIL_P(protocol)) proto = "tcp";
+    else proto = StringValuePtr(protocol);
 
-    sp = getservbyname(StringValueCStr(service),  StringValueCStr(proto));
+    StringValue(service);
+    sp = getservbyname(RSTRING(service)->ptr, proto);
     if (sp) {
 	port = ntohs(sp->s_port);
     }
@@ -3404,126 +2093,12 @@ sock_s_getservbyaname(argc, argv)
 
 	port = strtoul(s, &end, 0);
 	if (*end != '\0') {
-	    rb_raise(rb_eSocket, "no such service %s/%s", s, RSTRING(proto)->ptr);
+	    rb_raise(rb_eSocket, "no such service %s/%s", s, proto);
 	}
     }
     return INT2FIX(port);
 }
 
-/*
-Documentation should explain the following:
-
-  $ pp Socket.getaddrinfo("", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
-  [["AF_INET", 1, "0.0.0.0", "0.0.0.0", 2, 1, 6]]
-
-  $ pp Socket.getaddrinfo(nil, 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
-  [["AF_INET6", 1, "::", "::", 30, 1, 6],
-   ["AF_INET", 1, "0.0.0.0", "0.0.0.0", 2, 1, 6]]
-
-  $ pp Socket.getaddrinfo("localhost", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
-  [["AF_INET6", 1, "localhost", "::1", 30, 1, 6],
-   ["AF_INET", 1, "localhost", "127.0.0.1", 2, 1, 6]]
-
-  $ pp Socket.getaddrinfo("ensemble.local.", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
-  [["AF_INET", 1, "localhost", "192.168.123.154", 2, 1, 6]]
-
-Does it?
-
-API suggestion: this method has too many arguments, it would be backwards compatible and easier
-to understand if limit args were accepted as :family=>..., :flags=>...
-*/
-
-/*
- * Document-method: getaddrinfo
- * call-seq: Socket.getaddrinfo(host, service, family=nil, socktype=nil, protocol=nil, flags=nil) => addrinfo
- *
- * Return address information for +host+ and +port+. The remaining arguments
- * are hints that limit the address information returned.
- *
- * This method corresponds closely to the POSIX.1g getaddrinfo() definition.
- *
- * === Parameters
- * - +host+ is a host name or an address string (dotted decimal for IPv4, or a hex string
- *   for IPv6) for which to return information. A nil is also allowed, its meaning
- *   depends on +flags+, see below.
- * - +service+ is a service name ("http", "ssh", ...), or 
- *   a port number (80, 22, ...), see Socket.getservbyname for more
- *   information. A nil is also allowed, meaning zero.
- * - +family+ limits the output to a specific address family, one of the
- *   Socket::AF_* constants. Socket::AF_INET (IPv4) and Socket::AF_INET6 (IPv6)
- *   are the most commonly used families. You will usually pass either nil or
- *   Socket::AF_UNSPEC, allowing the IPv6 information to be returned first if
- *   +host+ is reachable via IPv6, and IPv4 information otherwise.  The two
- *   strings "AF_INET" or "AF_INET6" are also allowed, they are converted to
- *   their respective Socket::AF_* constants.
- * - +socktype+ limits the output to a specific type of socket, one of the
- *   Socket::SOCK_* constants. Socket::SOCK_STREAM (for TCP) and
- *   Socket::SOCK_DGRAM (for UDP) are the most commonly used socket types. If
- *   nil, then information for all types of sockets supported by +service+ will
- *   be returned. You will usually know what type of socket you intend to
- *   create, and should pass that socket type in.
- * - +protocol+ limits the output to a specific protocol numpber, one of the
- *   Socket::IPPROTO_* constants. It is usually implied by the socket type
- *   (Socket::SOCK_STREAM => Socket::IPPROTO_TCP, ...), if you pass other than
- *   nil you already know what this is for.
- * - +flags+ is one of the Socket::AI_* constants. They mean:
- *   - Socket::AI_PASSIVE: when set, if +host+ is nil the 'any' address will be
- *     returned, Socket::INADDR_ANY or 0 for IPv4, "0::0" or "::" for IPv6.  This
- *     address is suitable for use by servers that will bind their socket and do
- *     a passive listen, thus the name of the flag. Otherwise the local or
- *     loopback address will be returned, this is "127.0.0.1" for IPv4 and "::1'
- *     for IPv6.
- *   - ...
- *
- *
- * === Returns
- *
- * Returns an array of arrays, where each subarray contains:
- * - address family, a string like "AF_INET" or "AF_INET6"
- * - port number, the port number for +service+
- * - host name, either a canonical name for +host+, or it's address in presentation
- *   format if the address could not be looked up.
- * - host IP, the address of +host+ in presentation format
- * - address family, as a numeric value (one of the Socket::AF_* constants).
- * - socket type, as a numeric value (one of the Socket::SOCK_* constants).
- * - protocol number, as a numeric value (one of the Socket::IPPROTO_* constants).
- *
- * The first four values are identical to what is commonly returned as an
- * address array, see IPSocket for more information.
- *
- * === Examples
- *
- * Not all input combinations are valid, and while there are many combinations,
- * only a few cases are common.
- *
- * A typical client will call getaddrinfo with the +host+ and +service+ it
- * wants to connect to. It knows that it will attempt to connect with either
- * TCP or UDP, and specifies +socktype+ accordingly. It loops through all
- * returned addresses, and try to connect to them in turn:
- *
- *   addrinfo = Socket::getaddrinfo('www.example.com', 'www', nil, Socket::SOCK_STREAM)
- *   addrinfo.each do |af, port, name, addr|
- *     begin
- *       sock = TCPSocket.new(addr, port)
- *       # ...
- *       exit 1
- *     rescue
- *     end
- *   end
- *
- * With UDP you don't know if connect suceeded, but if communication fails,
- * the next address can be tried.
- *
- * A typical server will call getaddrinfo with a +host+ of nil, the +service+
- * it listens to, and a +flags+ of Socket::AI_PASSIVE. It will listen for
- * connections on the first returned address:
- *   addrinfo = Socket::getaddrinfo(nil, 'www', nil, Socket::SOCK_STREAM, nil, Socket::AI_PASSIVE)
- *   af, port, name, addr = addrinfo.first
- *   sock = TCPServer(addr, port)
- *   while( client = s.accept )
- *     # ...
- *   end
- */
 static VALUE
 sock_s_getaddrinfo(argc, argv)
     int argc;
@@ -3549,7 +2124,7 @@ sock_s_getaddrinfo(argc, argv)
 	pptr = NULL;
     }
     else if (FIXNUM_P(port)) {
-	snprintf(pbuf, sizeof(pbuf), "%ld", FIX2LONG(port));
+	snprintf(pbuf, sizeof(pbuf), "%d", FIX2INT(port));
 	pptr = pbuf;
     }
     else {
@@ -3590,7 +2165,7 @@ sock_s_getaddrinfo(argc, argv)
 	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
     }
 
-    ret = make_addrinfo(res);
+    ret = mkaddrinfo(res);
     freeaddrinfo(res);
     return ret;
 }
@@ -3600,7 +2175,7 @@ sock_s_getnameinfo(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags, tmp;
+    VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags;
     char *hptr, *pptr;
     char hbuf[1024], pbuf[1024];
     int fl;
@@ -3617,9 +2192,7 @@ sock_s_getnameinfo(argc, argv)
     if (!NIL_P(flags)) {
 	fl = NUM2INT(flags);
     }
-    tmp = rb_check_string_type(sa);
-    if (!NIL_P(tmp)) {
-	sa = tmp;
+    if (TYPE(sa) == T_STRING) {
 	if (sizeof(ss) < RSTRING(sa)->len) {
 	    rb_raise(rb_eTypeError, "sockaddr length too big");
 	}
@@ -3628,11 +2201,8 @@ sock_s_getnameinfo(argc, argv)
 	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
 	}
 	sap = (struct sockaddr*)&ss;
-	goto call_nameinfo;
     }
-    tmp = rb_check_array_type(sa);
-    if (!NIL_P(tmp)) {
-	sa = tmp;
+    else if (TYPE(sa) == T_ARRAY) {
 	MEMZERO(&hints, struct addrinfo, 1);
 	if (RARRAY(sa)->len == 3) {
 	    af = RARRAY(sa)->ptr[0];
@@ -3651,9 +2221,7 @@ sock_s_getnameinfo(argc, argv)
 		 * 4th element holds numeric form, don't resolve.
 		 * see ipaddr().
 		 */
-#ifdef AI_NUMERICHOST /* AIX 4.3.3 doesn't have AI_NUMERICHOST. */
 		hints.ai_flags |= AI_NUMERICHOST;
-#endif
 	    }
 	}
 	else {
@@ -3675,7 +2243,7 @@ sock_s_getnameinfo(argc, argv)
 	    pptr = NULL;
 	}
 	else if (FIXNUM_P(port)) {
-	    snprintf(pbuf, sizeof(pbuf), "%ld", NUM2LONG(port));
+	    snprintf(pbuf, sizeof(pbuf), "%d", NUM2INT(port));
 	    pptr = pbuf;
 	}
 	else {
@@ -3709,7 +2277,6 @@ sock_s_getnameinfo(argc, argv)
 	rb_raise(rb_eTypeError, "expecting String or Array");
     }
 
-  call_nameinfo:
     error = getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf),
 			pbuf, sizeof(pbuf), fl);
     if (error) goto error_exit_name;
@@ -3761,18 +2328,11 @@ sock_s_unpack_sockaddr_in(self, addr)
     VALUE host;
 
     sockaddr = (struct sockaddr_in*)StringValuePtr(addr);
-    if (((struct sockaddr *)sockaddr)->sa_family != AF_INET
-#ifdef INET6
-        && ((struct sockaddr *)sockaddr)->sa_family != AF_INET6
-#endif
-        ) {
-#ifdef INET6
-        rb_raise(rb_eArgError, "not an AF_INET/AF_INET6 sockaddr");
-#else
-        rb_raise(rb_eArgError, "not an AF_INET sockaddr");
-#endif
+    if (RSTRING(addr)->len != sizeof(struct sockaddr_in)) {
+	rb_raise(rb_eTypeError, "sockaddr_in size differs - %ld required; %d given",
+		 RSTRING(addr)->len, sizeof(struct sockaddr_in));
     }
-    host = make_ipaddr((struct sockaddr*)sockaddr);
+    host = mkipaddr((struct sockaddr*)sockaddr);
     OBJ_INFECT(host, addr);
     return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
 }
@@ -3783,17 +2343,11 @@ sock_s_pack_sockaddr_un(self, path)
     VALUE self, path;
 {
     struct sockaddr_un sockaddr;
-    char *sun_path;
     VALUE addr;
 
     MEMZERO(&sockaddr, struct sockaddr_un, 1);
     sockaddr.sun_family = AF_UNIX;
-    sun_path = StringValueCStr(path);
-    if (sizeof(sockaddr.sun_path) <= strlen(sun_path)) {
-        rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
-            (int)sizeof(sockaddr.sun_path)-1);
-    }
-    strncpy(sockaddr.sun_path, sun_path, sizeof(sockaddr.sun_path)-1);
+    strncpy(sockaddr.sun_path, StringValuePtr(path), sizeof(sockaddr.sun_path)-1);
     addr = rb_str_new((char*)&sockaddr, sizeof(sockaddr));
     OBJ_INFECT(addr, path);
 
@@ -3805,24 +2359,15 @@ sock_s_unpack_sockaddr_un(self, addr)
     VALUE self, addr;
 {
     struct sockaddr_un * sockaddr;
-    char *sun_path;
     VALUE path;
 
     sockaddr = (struct sockaddr_un*)StringValuePtr(addr);
-    if (((struct sockaddr *)sockaddr)->sa_family != AF_UNIX) {
-        rb_raise(rb_eArgError, "not an AF_UNIX sockaddr");
-    }
-    if (sizeof(struct sockaddr_un) < RSTRING(addr)->len) {
-        rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
+    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));
     }
-    sun_path = unixpath(sockaddr, RSTRING(addr)->len);
-    if (sizeof(struct sockaddr_un) == RSTRING(addr)->len &&
-        sun_path == sockaddr->sun_path &&
-        sun_path + strlen(sun_path) == RSTRING(addr)->ptr + RSTRING(addr)->len) {
-        rb_raise(rb_eArgError, "sockaddr_un.sun_path not NUL terminated");
-    }
-    path = rb_str_new2(sun_path);
+    /* xxx: should I check against sun_path size? */
+    path = rb_str_new2(sockaddr->sun_path);
     OBJ_INFECT(path, addr);
     return path;
 }
@@ -3839,31 +2384,6 @@ sock_define_const(name, value)
     rb_define_const(mConst, name, INT2FIX(value));
 }
 
-/*
- * Class +Socket+ provides access to the underlying operating system
- * socket implementations. It can be used to provide more operating system
- * specific functionality than the protocol-specific socket classes but at the
- * expense of greater complexity. In particular, the class handles addresses
- * using +struct sockaddr+ structures packed into Ruby strings, which can be
- * a joy to manipulate.
- * 
- * === Exception Handling
- * Ruby's implementation of +Socket+ causes an exception to be raised
- * based on the error generated by the system dependent implementation.
- * This is why the methods are documented in a way that isolate
- * Unix-based system exceptions from Windows based exceptions. If more
- * information on particular exception is needed please refer to the 
- * Unix manual pages or the Windows WinSock reference.
- * 
- * 
- * === Documentation by
- * * Zach Dennis
- * * Sam Roberts
- * * <em>Programming Ruby</em> from The Pragmatic Bookshelf.  
- * 
- * Much material in this documentation is taken with permission from  
- * <em>Programming Ruby</em> from The Pragmatic Bookshelf.  
- */
 void
 Init_socket()
 {
@@ -3887,7 +2407,6 @@ Init_socket()
     rb_define_method(rb_cBasicSocket, "getpeername", bsock_getpeername, 0);
     rb_define_method(rb_cBasicSocket, "send", bsock_send, -1);
     rb_define_method(rb_cBasicSocket, "recv", bsock_recv, -1);
-    rb_define_method(rb_cBasicSocket, "recv_nonblock", bsock_recv_nonblock, -1);
 
     rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
     rb_define_global_const("IPsocket", rb_cIPSocket);
@@ -3913,7 +2432,6 @@ Init_socket()
     rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket);
     rb_define_global_const("TCPserver", rb_cTCPServer);
     rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0);
-    rb_define_method(rb_cTCPServer, "accept_nonblock", tcp_accept_nonblock, 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);
@@ -3924,7 +2442,6 @@ Init_socket()
     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_nonblock", udp_recvfrom_nonblock, -1);
 
 #ifdef HAVE_SYS_UN_H
     rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket);
@@ -3943,24 +2460,20 @@ Init_socket()
     rb_define_global_const("UNIXserver", rb_cUNIXServer);
     rb_define_method(rb_cUNIXServer, "initialize", unix_svr_init, 1);
     rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0);
-    rb_define_method(rb_cUNIXServer, "accept_nonblock", unix_accept_nonblock, 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_method(rb_cSocket, "initialize", sock_initialize, 3);
+    rb_define_method(rb_cSocket, "initialize", sock_init, 3);
     rb_define_method(rb_cSocket, "connect", sock_connect, 1);
-    rb_define_method(rb_cSocket, "connect_nonblock", sock_connect_nonblock, 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, "accept_nonblock", sock_accept_nonblock, 0);
     rb_define_method(rb_cSocket, "sysaccept", sock_sysaccept, 0);
 
     rb_define_method(rb_cSocket, "recvfrom", sock_recvfrom, -1);
-    rb_define_method(rb_cSocket, "recvfrom_nonblock", sock_recvfrom_nonblock, -1);
 
     rb_define_singleton_method(rb_cSocket, "socketpair", sock_s_socketpair, 3);
     rb_define_singleton_method(rb_cSocket, "pair", sock_s_socketpair, 3);
@@ -4020,201 +2533,12 @@ Init_socket()
     sock_define_const("AF_UNSPEC", AF_UNSPEC);
     sock_define_const("PF_UNSPEC", PF_UNSPEC);
 #endif
-#ifdef INET6
+#ifdef AF_INET6
     sock_define_const("AF_INET6", AF_INET6);
 #endif
-#ifdef INET6
+#ifdef PF_INET6
     sock_define_const("PF_INET6", PF_INET6);
 #endif
-#ifdef AF_LOCAL
-    sock_define_const("AF_LOCAL", AF_LOCAL);
-#endif
-#ifdef PF_LOCAL
-    sock_define_const("PF_LOCAL", PF_LOCAL);
-#endif
-#ifdef AF_IMPLINK
-    sock_define_const("AF_IMPLINK", AF_IMPLINK);
-#endif
-#ifdef PF_IMPLINK
-    sock_define_const("PF_IMPLINK", PF_IMPLINK);
-#endif
-#ifdef AF_PUP
-    sock_define_const("AF_PUP", AF_PUP);
-#endif
-#ifdef PF_PUP
-    sock_define_const("PF_PUP", PF_PUP);
-#endif
-#ifdef AF_CHAOS
-    sock_define_const("AF_CHAOS", AF_CHAOS);
-#endif
-#ifdef PF_CHAOS
-    sock_define_const("PF_CHAOS", PF_CHAOS);
-#endif
-#ifdef AF_NS
-    sock_define_const("AF_NS", AF_NS);
-#endif
-#ifdef PF_NS
-    sock_define_const("PF_NS", PF_NS);
-#endif
-#ifdef AF_ISO
-    sock_define_const("AF_ISO", AF_ISO);
-#endif
-#ifdef PF_ISO
-    sock_define_const("PF_ISO", PF_ISO);
-#endif
-#ifdef AF_OSI
-    sock_define_const("AF_OSI", AF_OSI);
-#endif
-#ifdef PF_OSI
-    sock_define_const("PF_OSI", PF_OSI);
-#endif
-#ifdef AF_ECMA
-    sock_define_const("AF_ECMA", AF_ECMA);
-#endif
-#ifdef PF_ECMA
-    sock_define_const("PF_ECMA", PF_ECMA);
-#endif
-#ifdef AF_DATAKIT
-    sock_define_const("AF_DATAKIT", AF_DATAKIT);
-#endif
-#ifdef PF_DATAKIT
-    sock_define_const("PF_DATAKIT", PF_DATAKIT);
-#endif
-#ifdef AF_CCITT
-    sock_define_const("AF_CCITT", AF_CCITT);
-#endif
-#ifdef PF_CCITT
-    sock_define_const("PF_CCITT", PF_CCITT);
-#endif
-#ifdef AF_SNA
-    sock_define_const("AF_SNA", AF_SNA);
-#endif
-#ifdef PF_SNA
-    sock_define_const("PF_SNA", PF_SNA);
-#endif
-#ifdef AF_DEC
-    sock_define_const("AF_DEC", AF_DEC);
-#endif
-#ifdef PF_DEC
-    sock_define_const("PF_DEC", PF_DEC);
-#endif
-#ifdef AF_DLI
-    sock_define_const("AF_DLI", AF_DLI);
-#endif
-#ifdef PF_DLI
-    sock_define_const("PF_DLI", PF_DLI);
-#endif
-#ifdef AF_LAT
-    sock_define_const("AF_LAT", AF_LAT);
-#endif
-#ifdef PF_LAT
-    sock_define_const("PF_LAT", PF_LAT);
-#endif
-#ifdef AF_HYLINK
-    sock_define_const("AF_HYLINK", AF_HYLINK);
-#endif
-#ifdef PF_HYLINK
-    sock_define_const("PF_HYLINK", PF_HYLINK);
-#endif
-#ifdef AF_ROUTE
-    sock_define_const("AF_ROUTE", AF_ROUTE);
-#endif
-#ifdef PF_ROUTE
-    sock_define_const("PF_ROUTE", PF_ROUTE);
-#endif
-#ifdef AF_LINK
-    sock_define_const("AF_LINK", AF_LINK);
-#endif
-#ifdef PF_LINK
-    sock_define_const("PF_LINK", PF_LINK);
-#endif
-#ifdef AF_COIP
-    sock_define_const("AF_COIP", AF_COIP);
-#endif
-#ifdef PF_COIP
-    sock_define_const("PF_COIP", PF_COIP);
-#endif
-#ifdef AF_CNT
-    sock_define_const("AF_CNT", AF_CNT);
-#endif
-#ifdef PF_CNT
-    sock_define_const("PF_CNT", PF_CNT);
-#endif
-#ifdef AF_SIP
-    sock_define_const("AF_SIP", AF_SIP);
-#endif
-#ifdef PF_SIP
-    sock_define_const("PF_SIP", PF_SIP);
-#endif
-#ifdef AF_NDRV
-    sock_define_const("AF_NDRV", AF_NDRV);
-#endif
-#ifdef PF_NDRV
-    sock_define_const("PF_NDRV", PF_NDRV);
-#endif
-#ifdef AF_ISDN
-    sock_define_const("AF_ISDN", AF_ISDN);
-#endif
-#ifdef PF_ISDN
-    sock_define_const("PF_ISDN", PF_ISDN);
-#endif
-#ifdef AF_NATM
-    sock_define_const("AF_NATM", AF_NATM);
-#endif
-#ifdef PF_NATM
-    sock_define_const("PF_NATM", PF_NATM);
-#endif
-#ifdef AF_SYSTEM
-    sock_define_const("AF_SYSTEM", AF_SYSTEM);
-#endif
-#ifdef PF_SYSTEM
-    sock_define_const("PF_SYSTEM", PF_SYSTEM);
-#endif
-#ifdef AF_NETBIOS
-    sock_define_const("AF_NETBIOS", AF_NETBIOS);
-#endif
-#ifdef PF_NETBIOS
-    sock_define_const("PF_NETBIOS", PF_NETBIOS);
-#endif
-#ifdef AF_PPP
-    sock_define_const("AF_PPP", AF_PPP);
-#endif
-#ifdef PF_PPP
-    sock_define_const("PF_PPP", PF_PPP);
-#endif
-#ifdef AF_ATM
-    sock_define_const("AF_ATM", AF_ATM);
-#endif
-#ifdef PF_ATM
-    sock_define_const("PF_ATM", PF_ATM);
-#endif
-#ifdef AF_NETGRAPH
-    sock_define_const("AF_NETGRAPH", AF_NETGRAPH);
-#endif
-#ifdef PF_NETGRAPH
-    sock_define_const("PF_NETGRAPH", PF_NETGRAPH);
-#endif
-#ifdef AF_MAX
-    sock_define_const("AF_MAX", AF_MAX);
-#endif
-#ifdef PF_MAX
-    sock_define_const("PF_MAX", PF_MAX);
-#endif
-#ifdef AF_E164
-    sock_define_const("AF_E164", AF_E164);
-#endif
-#ifdef PF_XTP
-    sock_define_const("PF_XTP", PF_XTP);
-#endif
-#ifdef PF_RTIP
-    sock_define_const("PF_RTIP", PF_RTIP);
-#endif
-#ifdef PF_PIP
-    sock_define_const("PF_PIP", PF_PIP);
-#endif
-#ifdef PF_KEY
-    sock_define_const("PF_KEY", PF_KEY);
-#endif
 
     sock_define_const("MSG_OOB", MSG_OOB);
 #ifdef MSG_PEEK
@@ -4223,42 +2547,6 @@ Init_socket()
 #ifdef MSG_DONTROUTE
     sock_define_const("MSG_DONTROUTE", MSG_DONTROUTE);
 #endif
-#ifdef MSG_EOR
-    sock_define_const("MSG_EOR", MSG_EOR);
-#endif
-#ifdef MSG_TRUNC
-    sock_define_const("MSG_TRUNC", MSG_TRUNC);
-#endif
-#ifdef MSG_CTRUNC
-    sock_define_const("MSG_CTRUNC", MSG_CTRUNC);
-#endif
-#ifdef MSG_WAITALL
-    sock_define_const("MSG_WAITALL", MSG_WAITALL);
-#endif
-#ifdef MSG_DONTWAIT
-    sock_define_const("MSG_DONTWAIT", MSG_DONTWAIT);
-#endif
-#ifdef MSG_EOF
-    sock_define_const("MSG_EOF", MSG_EOF);
-#endif
-#ifdef MSG_FLUSH
-    sock_define_const("MSG_FLUSH", MSG_FLUSH);
-#endif
-#ifdef MSG_HOLD
-    sock_define_const("MSG_HOLD", MSG_HOLD);
-#endif
-#ifdef MSG_SEND
-    sock_define_const("MSG_SEND", MSG_SEND);
-#endif
-#ifdef MSG_HAVEMORE
-    sock_define_const("MSG_HAVEMORE", MSG_HAVEMORE);
-#endif
-#ifdef MSG_RCVMORE
-    sock_define_const("MSG_RCVMORE", MSG_RCVMORE);
-#endif
-#ifdef MSG_COMPAT
-    sock_define_const("MSG_COMPAT", MSG_COMPAT);
-#endif
 
     sock_define_const("SOL_SOCKET", SOL_SOCKET);
 #ifdef SOL_IP
@@ -4443,9 +2731,6 @@ Init_socket()
     sock_define_const("SO_DEBUG", SO_DEBUG);
 #endif
     sock_define_const("SO_REUSEADDR", SO_REUSEADDR);
-#ifdef SO_REUSEPORT
-    sock_define_const("SO_REUSEPORT", SO_REUSEPORT);
-#endif
 #ifdef SO_TYPE
     sock_define_const("SO_TYPE", SO_TYPE);
 #endif
@@ -4497,33 +2782,6 @@ Init_socket()
 #ifdef SO_SNDTIMEO
     sock_define_const("SO_SNDTIMEO", SO_SNDTIMEO);
 #endif
-#ifdef SO_ACCEPTCONN
-    sock_define_const("SO_ACCEPTCONN", SO_ACCEPTCONN);
-#endif
-#ifdef SO_USELOOPBACK
-    sock_define_const("SO_USELOOPBACK", SO_USELOOPBACK);
-#endif
-#ifdef SO_ACCEPTFILTER
-    sock_define_const("SO_ACCEPTFILTER", SO_ACCEPTFILTER);
-#endif
-#ifdef SO_DONTTRUNC
-    sock_define_const("SO_DONTTRUNC", SO_DONTTRUNC);
-#endif
-#ifdef SO_WANTMORE
-    sock_define_const("SO_WANTMORE", SO_WANTMORE);
-#endif
-#ifdef SO_WANTOOBFLAG
-    sock_define_const("SO_WANTOOBFLAG", SO_WANTOOBFLAG);
-#endif
-#ifdef SO_NREAD
-    sock_define_const("SO_NREAD", SO_NREAD);
-#endif
-#ifdef SO_NKE
-    sock_define_const("SO_NKE", SO_NKE);
-#endif
-#ifdef SO_NOSIGPIPE
-    sock_define_const("SO_NOSIGPIPE", SO_NOSIGPIPE);
-#endif
 
 #ifdef SO_SECURITY_AUTHENTICATION
     sock_define_const("SO_SECURITY_AUTHENTICATION", SO_SECURITY_AUTHENTICATION);
diff --git a/ext/socket/sockport.h b/ext/socket/sockport.h
index 8c7bebf558..e1cddf53f4 100644
--- a/ext/socket/sockport.h
+++ b/ext/socket/sockport.h
@@ -2,8 +2,8 @@
 
   sockport.h -
 
-  $Author: eban $
-  $Date: 2000/08/24 06:29:30 $
+  $Author$
+  $Date$
   created at: Fri Apr 30 23:19:34 JST 1999
 
 ************************************************/
diff --git a/ext/stringio/MANIFEST b/ext/stringio/MANIFEST
new file mode 100644
index 0000000000..4f3a7dc6d0
--- /dev/null
+++ b/ext/stringio/MANIFEST
@@ -0,0 +1,4 @@
+MANIFEST
+README
+stringio.c
+depend
diff --git a/ext/stringio/README b/ext/stringio/README
index 190052309c..c4031f7e97 100644
--- a/ext/stringio/README
+++ b/ext/stringio/README
@@ -1,6 +1,6 @@
 -*- rd -*-
-$Author: nobu $
-$Date: 2002/02/19 13:16:24 $
+$Author$
+$Date$
 
 =begin
 
diff --git a/ext/stringio/extconf.rb b/ext/stringio/extconf.rb
deleted file mode 100644
index 8fc84b3735..0000000000
--- a/ext/stringio/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('stringio')
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index fcc596d5f0..93d7460daf 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -2,8 +2,8 @@
 
   stringio.c -
 
-  $Author: nobu $
-  $Date: 2005/08/13 09:36:12 $
+  $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
 
@@ -14,13 +14,8 @@
 
 #include "ruby.h"
 #include "rubyio.h"
-#if defined(HAVE_FCNTL_H) || defined(_WIN32)
-#include <fcntl.h>
-#elif defined(HAVE_SYS_FCNTL_H)
-#include <sys/fcntl.h>
-#endif
 
-#define STRIO_EOF FMODE_SYNC
+#define STRIO_APPEND 4
 
 struct StringIO {
     VALUE string;
@@ -78,7 +73,7 @@ check_strio(self)
 {
     Check_Type(self, T_DATA);
     if (!IS_STRIO(self)) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected StringIO)",
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected String::IO)",
 		 rb_class2name(CLASS_OF(self)));
     }
     return DATA_PTR(self);
@@ -98,9 +93,9 @@ get_strio(self)
 
 #define StringIO(obj) get_strio(obj)
 
-#define CLOSED(ptr) (!((ptr)->flags & FMODE_READWRITE))
-#define READABLE(ptr) ((ptr)->flags & FMODE_READABLE)
-#define WRITABLE(ptr) ((ptr)->flags & FMODE_WRITABLE)
+#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)
@@ -136,7 +131,6 @@ check_modifiable(ptr)
 
 static VALUE strio_s_allocate _((VALUE));
 static VALUE strio_s_open _((int, VALUE *, VALUE));
-static void strio_init _((int, VALUE *, struct StringIO *));
 static VALUE strio_initialize _((int, VALUE *, VALUE));
 static VALUE strio_finalize _((VALUE));
 static VALUE strio_self _((VALUE));
@@ -154,6 +148,7 @@ 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));
@@ -161,16 +156,19 @@ 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_internal _((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));
@@ -188,13 +186,6 @@ strio_s_allocate(klass)
     return Data_Wrap_Struct(klass, strio_mark, strio_free, 0);
 }
 
-/*
- * call-seq: StringIO.open(string=""[, mode]) {|strio| ...}
- *
- * Equivalent to StringIO.new except that when it is called with a block, it
- * yields with the new instance and closes it, and returns the result which
- * returned from the block.
- */
 static VALUE
 strio_s_open(argc, argv, klass)
     int argc;
@@ -206,11 +197,6 @@ strio_s_open(argc, argv, klass)
     return rb_ensure(rb_yield, obj, strio_finalize, obj);
 }
 
-/*
- * call-seq: StringIO.new(string=""[, mode])
- *
- * Creates new StringIO instance from with _string_ and _mode_.
- */
 static VALUE
 strio_initialize(argc, argv, self)
     int argc;
@@ -218,43 +204,30 @@ strio_initialize(argc, argv, self)
     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);
-    strio_init(argc, argv, ptr);
-    return self;
-}
-
-static void
-strio_init(argc, argv, ptr)
-    int argc;
-    VALUE *argv;
-    struct StringIO *ptr;
-{
-    VALUE string, mode;
-    int trunc = Qfalse;
-
     switch (rb_scan_args(argc, argv, "02", &string, &mode)) {
       case 2:
-	if (FIXNUM_P(mode)) {
-	    int flags = FIX2INT(mode);
-	    ptr->flags = rb_io_modenum_flags(flags);
-	    trunc = flags & O_TRUNC;
-	}
-	else {
-	    const char *m = StringValueCStr(mode);
-	    ptr->flags = rb_io_mode_flags(m);
-	    trunc = *m == 'w';
-	}
+	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);
 	}
-	if (trunc) {
+	switch (*m) {
+	  case 'a':
+	    ptr->flags |= STRIO_APPEND;
+	    break;
+	  case 'w':
 	    rb_str_resize(string, 0);
+	    break;
 	}
 	break;
       case 1:
@@ -267,6 +240,7 @@ strio_init(argc, argv, ptr)
 	break;
     }
     ptr->string = string;
+    return self;
 }
 
 static VALUE
@@ -279,9 +253,6 @@ strio_finalize(self)
     return self;
 }
 
-/*
- * Returns +false+.  Just for compatibility to IO.
- */
 static VALUE
 strio_false(self)
     VALUE self;
@@ -290,9 +261,6 @@ strio_false(self)
     return Qfalse;
 }
 
-/*
- * Returns +nil+.  Just for compatibility to IO.
- */
 static VALUE
 strio_nil(self)
     VALUE self;
@@ -301,9 +269,6 @@ strio_nil(self)
     return Qnil;
 }
 
-/*
- * Returns *strio* itself.  Just for compatibility to IO.
- */
 static VALUE
 strio_self(self)
     VALUE self;
@@ -312,9 +277,6 @@ strio_self(self)
     return self;
 }
 
-/*
- * Returns 0.  Just for compatibility to IO.
- */
 static VALUE
 strio_0(self)
     VALUE self;
@@ -323,9 +285,6 @@ strio_0(self)
     return INT2FIX(0);
 }
 
-/*
- * Returns the argument unchanged.  Just for compatibility to IO.
- */
 static VALUE
 strio_first(self, arg)
     VALUE self, arg;
@@ -334,9 +293,6 @@ strio_first(self, arg)
     return arg;
 }
 
-/*
- * Raises NotImplementedError.
- */
 static VALUE
 strio_unimpl(argc, argv, self)
     int argc;
@@ -348,11 +304,6 @@ strio_unimpl(argc, argv, self)
     return Qnil;		/* not reached */
 }
 
-/*
- * call-seq: strio.string     -> string
- *
- * Returns underlying String object, the subject of IO.
- */
 static VALUE
 strio_get_string(self)
     VALUE self;
@@ -360,34 +311,22 @@ strio_get_string(self)
     return StringIO(self)->string;
 }
 
-/*
- * call-seq:
- *   strio.string = string  -> string
- *
- * Changes underlying String object, the subject of IO.
- */
 static VALUE
 strio_set_string(self, string)
     VALUE self, string;
 {
     struct StringIO *ptr = StringIO(self);
 
-    if (!OBJ_TAINTED(self)) rb_secure(4);
     ptr->flags &= ~FMODE_READWRITE;
-    StringValue(string);
-    ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : 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;
 }
 
-/*
- * call-seq:
- *   strio.close  -> nil
- *
- * Closes strio.  The *strio* is unavailable for any further data 
- * operations; an +IOError+ is raised if such an attempt is made.
- */
 static VALUE
 strio_close(self)
     VALUE self;
@@ -396,17 +335,11 @@ strio_close(self)
     if (CLOSED(ptr)) {
 	rb_raise(rb_eIOError, "closed stream");
     }
+    ptr->string = Qnil;
     ptr->flags &= ~FMODE_READWRITE;
-    return Qnil;
+    return self;
 }
 
-/*
- * call-seq:
- *   strio.close_read    -> nil
- *
- * Closes the read end of a StringIO.  Will raise an +IOError+ if the
- * *strio* is not readable.
- */
 static VALUE
 strio_close_read(self)
     VALUE self;
@@ -415,17 +348,12 @@ strio_close_read(self)
     if (!READABLE(ptr)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
     }
-    ptr->flags &= ~FMODE_READABLE;
-    return Qnil;
+    if (!((ptr->flags &= ~FMODE_READABLE) & FMODE_READWRITE)) {
+	ptr->string = Qnil;
+    }
+    return self;
 }
 
-/*
- * call-seq:
- *   strio.close_write    -> nil
- *
- * Closes the write end of a StringIO.  Will raise an  +IOError+ if the
- * *strio* is not writeable.
- */
 static VALUE
 strio_close_write(self)
     VALUE self;
@@ -434,16 +362,12 @@ strio_close_write(self)
     if (!WRITABLE(ptr)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
     }
-    ptr->flags &= ~FMODE_WRITABLE;
-    return Qnil;
+    if (!((ptr->flags &= ~FMODE_WRITABLE) & FMODE_READWRITE)) {
+	ptr->string = Qnil;
+    }
+    return self;
 }
 
-/*
- * call-seq:
- *   strio.closed?    -> true or false
- *
- * Returns +true+ if *strio* is completely closed, +false+ otherwise.
- */
 static VALUE
 strio_closed(self)
     VALUE self;
@@ -453,12 +377,6 @@ strio_closed(self)
     return Qtrue;
 }
 
-/*
- * call-seq:
- *   strio.closed_read?    -> true or false
- *
- * Returns +true+ if *strio* is not readable, +false+ otherwise.
- */
 static VALUE
 strio_closed_read(self)
     VALUE self;
@@ -468,12 +386,6 @@ strio_closed_read(self)
     return Qtrue;
 }
 
-/*
- * call-seq:
- *   strio.closed_write?    -> true or false
- *
- * Returns +true+ if *strio* is not writable, +false+ otherwise.
- */
 static VALUE
 strio_closed_write(self)
     VALUE self;
@@ -483,14 +395,6 @@ strio_closed_write(self)
     return Qtrue;
 }
 
-/*
- * call-seq:
- *   strio.eof     -> true or false
- *   strio.eof?    -> true or false
- *
- * Returns true if *strio* is at end of file. The stringio must be  
- * opened for reading or an +IOError+ will be raised.
- */
 static VALUE
 strio_eof(self)
     VALUE self;
@@ -500,7 +404,6 @@ strio_eof(self)
     return Qtrue;
 }
 
-/* :nodoc: */
 static VALUE
 strio_copy(copy, orig)
     VALUE copy, orig;
@@ -514,21 +417,10 @@ strio_copy(copy, orig)
 	strio_free(DATA_PTR(copy));
     }
     DATA_PTR(copy) = ptr;
-    OBJ_INFECT(copy, orig);
     ++ptr->count;
     return copy;
 }
 
-/*
- * call-seq:
- *   strio.lineno    -> integer
- *
- * Returns the current line number in *strio*. The stringio must be
- * opened for reading. +lineno+ counts the number of times  +gets+ is
- * called, rather than the number of newlines  encountered. The two
- * values will differ if +gets+ is  called with a separator other than
- * newline.  See also the  <code>$.</code> variable.
- */
 static VALUE
 strio_get_lineno(self)
     VALUE self;
@@ -536,13 +428,6 @@ strio_get_lineno(self)
     return LONG2NUM(StringIO(self)->lineno);
 }
 
-/*
- * call-seq:
- *   strio.lineno = integer    -> integer
- *
- * Manually sets the current line number to the given value.
- * <code>$.</code> is updated only on the next read.
- */
 static VALUE
 strio_set_lineno(self, lineno)
     VALUE self, lineno;
@@ -551,47 +436,27 @@ strio_set_lineno(self, lineno)
     return lineno;
 }
 
-/* call-seq: strio.binmode -> true */
 #define strio_binmode strio_self
 
-/* call-seq: strio.fcntl */
 #define strio_fcntl strio_unimpl
 
-/* call-seq: strio.flush -> strio */
 #define strio_flush strio_self
 
-/* call-seq: strio.fsync -> 0 */
 #define strio_fsync strio_0
 
-/*
- * call-seq:
- *   strio.reopen(other_StrIO)     -> strio
- *   strio.reopen(string, mode)    -> strio
- *
- * Reinitializes *strio* with the given <i>other_StrIO</i> or _string_ 
- * and _mode_ (see StringIO#new).
- */
 static VALUE
 strio_reopen(argc, argv, self)
     int argc;
     VALUE *argv;
     VALUE self;
 {
-    if (!OBJ_TAINTED(self)) rb_secure(4);
+    rb_secure(4);
     if (argc == 1 && TYPE(*argv) != T_STRING) {
 	return strio_copy(self, *argv);
     }
-    strio_init(argc, argv, StringIO(self));
-    return self;
+    return strio_initialize(argc, argv, self);
 }
 
-/*
- * call-seq:
- *   strio.pos     -> integer
- *   strio.tell    -> integer
- *
- * Returns the current offset (in bytes) of *strio*.
- */
 static VALUE
 strio_get_pos(self)
     VALUE self;
@@ -599,12 +464,6 @@ strio_get_pos(self)
     return LONG2NUM(StringIO(self)->pos);
 }
 
-/*
- * call-seq:
- *   strio.pos = integer    -> integer
- *
- * Seeks to the given position (in bytes) in *strio*.
- */
 static VALUE
 strio_set_pos(self, pos)
     VALUE self;
@@ -616,17 +475,9 @@ strio_set_pos(self, pos)
 	error_inval(0);
     }
     ptr->pos = p;
-    ptr->flags &= ~STRIO_EOF;
     return pos;
 }
 
-/*
- * call-seq:
- *   strio.rewind    -> 0
- *
- * Positions *strio* to the beginning of input, resetting
- * +lineno+ to zero.
- */
 static VALUE
 strio_rewind(self)
     VALUE self;
@@ -634,17 +485,9 @@ strio_rewind(self)
     struct StringIO *ptr = StringIO(self);
     ptr->pos = 0;
     ptr->lineno = 0;
-    ptr->flags &= ~STRIO_EOF;
     return INT2FIX(0);
 }
 
-/*
- * call-seq:
- *   strio.seek(amount, whence=SEEK_SET) -> 0
- *
- * Seeks to a given offset _amount_ in the stream according to
- * the value of _whence_ (see IO#seek).
- */
 static VALUE
 strio_seek(argc, argv, self)
     int argc;
@@ -673,16 +516,9 @@ strio_seek(argc, argv, self)
 	error_inval(0);
     }
     ptr->pos = offset;
-    ptr->flags &= ~STRIO_EOF;
     return INT2FIX(0);
 }
 
-/*
- * call-seq:
- *   strio.sync    -> true
- *
- * Returns +true+ always.
- */
 static VALUE
 strio_get_sync(self)
     VALUE self;
@@ -691,17 +527,10 @@ strio_get_sync(self)
     return Qtrue;
 }
 
-/* call-seq: strio.sync = boolean -> boolean */
 #define strio_set_sync strio_first
 
 #define strio_tell strio_get_pos
 
-/*
- * call-seq:
- *   strio.each_byte {|byte| block }  -> strio
- *
- * See IO#each_byte.
- */
 static VALUE
 strio_each_byte(self)
     VALUE self;
@@ -714,12 +543,6 @@ strio_each_byte(self)
     return Qnil;
 }
 
-/*
- * call-seq:
- *   strio.getc   -> fixnum or nil
- *
- * See IO#getc.
- */
 static VALUE
 strio_getc(self)
     VALUE self;
@@ -727,42 +550,12 @@ strio_getc(self)
     struct StringIO *ptr = readable(StringIO(self));
     int c;
     if (ptr->pos >= RSTRING(ptr->string)->len) {
-	ptr->flags |= STRIO_EOF;
 	return Qnil;
     }
     c = RSTRING(ptr->string)->ptr[ptr->pos++];
     return CHR2FIX(c);
 }
 
-static void
-strio_extend(ptr, pos, len)
-    struct StringIO *ptr;
-    long pos, len;
-{
-    long olen;
-
-    check_modifiable(ptr);
-    olen = RSTRING(ptr->string)->len;
-    if (pos + len > olen) {
-	rb_str_resize(ptr->string, pos + len);
-	if (pos > olen)
-	    MEMZERO(RSTRING(ptr->string)->ptr + olen, char, pos - olen);
-    }
-    else {
-	rb_str_modify(ptr->string);
-    }
-}
-
-/*
- * call-seq:
- *   strio.ungetc(integer)   -> nil
- *
- * Pushes back one character (passed as a parameter) onto *strio*
- * such that a subsequent buffered read will return it.  Pushing back 
- * behind the beginning of the buffer string is not possible.  Nothing
- * will be done if such an attempt is made.
- * In other case, there is no limitation for multiple pushbacks.
- */
 static VALUE
 strio_ungetc(self, ch)
     VALUE self, ch;
@@ -772,25 +565,24 @@ strio_ungetc(self, 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] !=
+	if ((len = RSTRING(ptr->string)->len) < pos ||
+	    (unsigned char)RSTRING(ptr->string)->ptr[pos - 1] !=
 	    (unsigned char)cc) {
-	    strio_extend(ptr, pos, 1);
-	    RSTRING(ptr->string)->ptr[pos] = cc;
-	    OBJ_INFECT(ptr->string, self);
+	    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;
-	ptr->flags &= ~STRIO_EOF;
     }
     return Qnil;
 }
 
-/*
- * call-seq:
- *   strio.readchar   -> fixnum
- *
- * See IO#readchar.
- */
 static VALUE
 strio_readchar(self)
     VALUE self;
@@ -841,7 +633,7 @@ bm_search(little, llen, big, blen, skip)
 }
 
 static VALUE
-strio_getline(argc, argv, ptr)
+strio_gets_internal(argc, argv, ptr)
     int argc;
     VALUE *argv;
     struct StringIO *ptr;
@@ -858,10 +650,7 @@ strio_getline(argc, argv, ptr)
 	if (!NIL_P(str)) StringValue(str);
     }
 
-    if (ptr->pos >= (n = RSTRING(ptr->string)->len)) {
-	ptr->flags |= STRIO_EOF;
-	return Qnil;
-    }
+    if (ptr->pos >= (n = RSTRING(ptr->string)->len)) return Qnil;
     s = RSTRING(ptr->string)->ptr;
     e = s + RSTRING(ptr->string)->len;
     s += ptr->pos;
@@ -871,13 +660,11 @@ strio_getline(argc, argv, ptr)
     else if ((n = RSTRING(str)->len) == 0) {
 	p = s;
 	while (*p == '\n') {
-	    if (++p == e) {
-		ptr->flags |= STRIO_EOF;
-		return Qnil;
-	    }
+	    if (++p == e) return Qnil;
 	}
 	s = p;
-	while ((p = memchr(p, '\n', e - p)) && (p != e)) {
+	while (p = memchr(p, '\n', e - p)) {
+	    if (p == e) break;
 	    if (*++p == '\n') {
 		e = p;
 		break;
@@ -886,7 +673,7 @@ strio_getline(argc, argv, ptr)
 	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)) != 0) {
+	if (p = memchr(s, RSTRING(str)->ptr[0], e - s)) {
 	    e = p + 1;
 	}
 	str = rb_str_substr(ptr->string, ptr->pos, e - s);
@@ -914,51 +701,30 @@ strio_getline(argc, argv, ptr)
     }
     ptr->pos = e - RSTRING(ptr->string)->ptr;
     ptr->lineno++;
+    rb_lastline_set(str);
     return str;
 }
 
-/*
- * call-seq:
- *   strio.gets(sep_string=$/)   -> string or nil
- *
- * See IO#gets.
- */
 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;
+    return strio_gets_internal(argc, argv, readable(StringIO(self)));
 }
 
-/*
- * call-seq:
- *   strio.readline(sep_string=$/)   -> string
- *
- * See IO#readline.
- */
 static VALUE
 strio_readline(argc, argv, self)
     int argc;
     VALUE *argv;
     VALUE self;
 {
-    VALUE line = strio_getline(argc, argv, readable(StringIO(self)));
+    VALUE line = strio_gets_internal(argc, argv, readable(StringIO(self)));
     if (NIL_P(line)) rb_eof_error();
     return line;
 }
 
-/*
- * call-seq:
- *   strio.each(sep_string=$/)      {|line| block }  -> strio
- *   strio.each_line(sep_string=$/) {|line| block }  -> strio
- *
- * See IO#each.
- */
 static VALUE
 strio_each(argc, argv, self)
     int argc;
@@ -968,18 +734,12 @@ strio_each(argc, argv, self)
     struct StringIO *ptr = StringIO(self);
     VALUE line;
 
-    while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
+    while (!NIL_P(line = strio_gets_internal(argc, argv, readable(ptr)))) {
 	rb_yield(line);
     }
     return self;
 }
 
-/*
- * call-seq:
- *   strio.readlines(sep_string=$/)  ->   array
- *
- * See IO#readlines.
- */
 static VALUE
 strio_readlines(argc, argv, self)
     int argc;
@@ -988,114 +748,72 @@ strio_readlines(argc, argv, self)
 {
     struct StringIO *ptr = StringIO(self);
     VALUE ary = rb_ary_new(), line;
-    while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
+    while (!NIL_P(line = strio_gets_internal(argc, argv, readable(ptr)))) {
 	rb_ary_push(ary, line);
     }
     return ary;
 }
 
-/*
- * call-seq:
- *   strio.write(string)    -> integer
- *   strio.syswrite(string) -> integer
- *
- * Appends the given string to the underlying buffer string of *strio*.
- * The stream must be opened for writing.  If the argument is not a
- * string, it will be converted to a string using <code>to_s</code>.
- * Returns the number of bytes written.  See IO#write.
- */
 static VALUE
 strio_write(self, str)
     VALUE self, str;
 {
     struct StringIO *ptr = writable(StringIO(self));
-    long len, olen;
+    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);
-    olen = RSTRING(ptr->string)->len;
-    if (ptr->flags & FMODE_APPEND) {
-	ptr->pos = olen;
+    if (ptr->flags & STRIO_APPEND) {
+	ptr->pos = RSTRING(ptr->string)->len;
     }
-    if (ptr->pos == olen) {
+    if (ptr->pos == RSTRING(ptr->string)->len) {
 	rb_str_cat(ptr->string, RSTRING(str)->ptr, len);
     }
     else {
-	strio_extend(ptr, ptr->pos, len);
+	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);
     }
-    OBJ_INFECT(ptr->string, self);
     ptr->pos += len;
     return LONG2NUM(len);
 }
 
-/*
- * call-seq:
- *   strio << obj     -> strio
- *
- * See IO#<<.
- */
 #define strio_addstr rb_io_addstr
 
-/*
- * call-seq:
- *   strio.print()             -> nil
- *   strio.print(obj, ...)     -> nil
- *
- * See IO#print.
- */
 #define strio_print rb_io_print
 
-/*
- * call-seq:
- *   strio.printf(format_string [, obj, ...] )   -> nil
- *
- * See IO#printf.
- */
 #define strio_printf rb_io_printf
 
-/*
- * call-seq:
- *   strio.putc(obj)    -> obj
- *
- * See IO#putc.
- */
 static VALUE
 strio_putc(self, ch)
     VALUE self, ch;
 {
     struct StringIO *ptr = writable(StringIO(self));
     int c = NUM2CHR(ch);
-    long olen;
 
     check_modifiable(ptr);
-    olen = RSTRING(ptr->string)->len;
-    if (ptr->flags & FMODE_APPEND) {
-	ptr->pos = olen;
+    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);
     }
-    strio_extend(ptr, ptr->pos, 1);
     RSTRING(ptr->string)->ptr[ptr->pos++] = c;
-    OBJ_INFECT(ptr->string, self);
     return ch;
 }
 
-/*
- * call-seq:
- *   strio.puts(obj, ...)    -> nil
- *
- * See IO#puts.
- */
 #define strio_puts rb_io_puts
 
-/*
- * call-seq:
- *   strio.read([length [, buffer]])    -> string, buffer, or nil
- *
- * See IO#read.
- */
 static VALUE
 strio_read(argc, argv, self)
     int argc;
@@ -1103,79 +821,30 @@ strio_read(argc, argv, self)
     VALUE self;
 {
     struct StringIO *ptr = readable(StringIO(self));
-    VALUE str = Qnil;
-    long len, olen;
+    VALUE str;
+    long len;
 
+    if (ptr->pos >= RSTRING(ptr->string)->len) {
+	return Qnil;
+    }
     switch (argc) {
-      case 2:
-	str = argv[1];
-	StringValue(str);
-	rb_str_modify(str);
       case 1:
 	if (!NIL_P(argv[0])) {
-	    len = olen = NUM2LONG(argv[0]);
-	    if (len < 0) {
-		rb_raise(rb_eArgError, "negative length %ld given", len);
-	    }
-	    if (len > 0 && ptr->pos >= RSTRING(ptr->string)->len) {
-		ptr->flags |= STRIO_EOF;
-		if (!NIL_P(str)) rb_str_resize(str, 0);
-		return Qnil;
-	    }
-	    else if (ptr->flags & STRIO_EOF) {
-		if (!NIL_P(str)) rb_str_resize(str, 0);
-		return Qnil;
-	    }
+	    len = NUM2LONG(argv[0]);
 	    break;
 	}
 	/* fall through */
       case 0:
-	olen = -1;
-	len = RSTRING(ptr->string)->len;
-	if (len <= ptr->pos) {
-	    ptr->flags |= STRIO_EOF;
-	    if (NIL_P(str)) {
-		str = rb_str_new(0, 0);
-	    }
-	    else {
-		rb_str_resize(str, 0);
-	    }
-	    return str;
-	}
-	else {
-	    len -= ptr->pos;
-	}
+	len = RSTRING(ptr->string)->len - ptr->pos;
 	break;
       default:
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	rb_raise(rb_eArgError, "wrong number arguments (%d for 0)", argc);
     }
-    if (NIL_P(str)) {
-	str = rb_str_substr(ptr->string, ptr->pos, len);
-    }
-    else {
-	long rest = RSTRING(ptr->string)->len - ptr->pos;
-	if (len > rest) len = rest;
-	rb_str_resize(str, len);
-	MEMCPY(RSTRING(str)->ptr, RSTRING(ptr->string)->ptr + ptr->pos, char, len);
-    }
-    if (NIL_P(str)) {
-	if (!(ptr->flags & STRIO_EOF)) str = rb_str_new(0, 0);
-	len = 0;
-    }
-    else {
-	ptr->pos += len = RSTRING(str)->len;
-    }
-    if (olen < 0 || olen > len) ptr->flags |= STRIO_EOF;
+    str = rb_str_substr(ptr->string, ptr->pos, len);
+    ptr->pos += len;
     return str;
 }
 
-/*
- * call-seq:
- *   strio.sysread(integer[, outbuf])    -> string
- *
- * Similar to #read, but raises +EOFError+ at end of string instead of
- * returning +nil+, as well as IO#sysread does.
- */
 static VALUE
 strio_sysread(argc, argv, self)
     int argc;
@@ -1183,7 +852,7 @@ strio_sysread(argc, argv, self)
     VALUE self;
 {
     VALUE val = strio_read(argc, argv, self);
-    if (NIL_P(val) || RSTRING(val)->len == 0) {
+    if (NIL_P(val)) {
 	rb_eof_error();
     }
     return val;
@@ -1191,29 +860,14 @@ strio_sysread(argc, argv, self)
 
 #define strio_syswrite strio_write
 
-/* call-seq: strio.path -> nil */
-#define strio_path strio_nil
+#define strio_path rb_inspect
 
-/*
- * call-seq:
- *   strio.isatty -> nil
- *   strio.tty? -> nil
- *
- */
 #define strio_isatty strio_false
 
-/* call-seq: strio.pid -> nil */
 #define strio_pid strio_nil
 
-/* call-seq: strio.fileno -> nil */
 #define strio_fileno strio_nil
 
-/*
- * call-seq:
- *   strio.size   -> integer
- *
- * Returns the size of the buffer string.
- */
 static VALUE
 strio_size(self)
     VALUE self;
@@ -1225,43 +879,28 @@ strio_size(self)
     return ULONG2NUM(RSTRING(string)->len);
 }
 
-/*
- * call-seq:
- *   strio.truncate(integer)    -> 0
- *
- * Truncates the buffer string to at most _integer_ bytes. The *strio*
- * must be opened for writing.
- */
 static VALUE
 strio_truncate(self, len)
     VALUE self, len;
 {
     VALUE string = writable(StringIO(self))->string;
     long l = NUM2LONG(len);
-    long plen = RSTRING(string)->len;
     if (l < 0) {
 	error_inval("negative legnth");
     }
     rb_str_resize(string, l);
-    if (plen < l) {
-	MEMZERO(RSTRING(string)->ptr + plen, char, l - plen);
-    }
     return len;
 }
 
-/*
- * Pseudo I/O on String object.
- */
 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_enable_super(StringIO, "initialize");
+    rb_define_method(StringIO, "copy_object", strio_copy, 1);
     rb_define_method(StringIO, "reopen", strio_reopen, -1);
 
     rb_define_method(StringIO, "string", strio_get_string, 0);
diff --git a/ext/strscan/MANIFEST b/ext/strscan/MANIFEST
new file mode 100644
index 0000000000..5fdf598f2c
--- /dev/null
+++ b/ext/strscan/MANIFEST
@@ -0,0 +1,4 @@
+MANIFEST
+strscan.c
+extconf.rb
+depend
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 5e5ab5db1f..5c30c3cc4b 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -1,15 +1,26 @@
-/*
-    $Id: strscan.c,v 1.7.2.8 2006/07/26 09:37:00 aamine Exp $
+/* vi:set sw=4:
 
-    Copyright (c) 1999-2006 Minero Aoki
+    strscan.c
+
+    Copyright (c) 1999-2002 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"
 
@@ -41,10 +52,10 @@ struct strscanner
 #define MATCHED(s)             (s)->flags |= FLAG_MATCHED
 #define CLEAR_MATCH_STATUS(s)  (s)->flags &= ~FLAG_MATCHED
 
-#define S_PBEG(s)  (RSTRING((s)->str)->ptr)
+#define S_PTR(s)  (RSTRING((s)->str)->ptr)
 #define S_LEN(s)  (RSTRING((s)->str)->len)
-#define S_PEND(s)  (S_PBEG(s) + S_LEN(s))
-#define CURPTR(s) (S_PBEG(s) + (s)->curr)
+#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)
@@ -62,19 +73,15 @@ 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 check_strscan _((VALUE obj));
 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_init_copy _((VALUE vself, VALUE vorig));
 
 static VALUE strscan_s_mustc _((VALUE self));
 static VALUE strscan_terminate _((VALUE self));
-static VALUE strscan_clear _((VALUE self));
 static VALUE strscan_get_string _((VALUE self));
 static VALUE strscan_set_string _((VALUE self, VALUE str));
-static VALUE strscan_concat _((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,
@@ -93,13 +100,9 @@ static VALUE strscan_search_full _((VALUE self, VALUE re,
 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_getbyte _((VALUE self));
 static VALUE strscan_peek _((VALUE self, VALUE len));
-static VALUE strscan_peep _((VALUE self, VALUE len));
 static VALUE strscan_unscan _((VALUE self));
-static VALUE strscan_bol_p _((VALUE self));
 static VALUE strscan_eos_p _((VALUE self));
-static VALUE strscan_empty_p _((VALUE self));
 static VALUE strscan_rest_p _((VALUE self));
 static VALUE strscan_matched_p _((VALUE self));
 static VALUE strscan_matched _((VALUE self));
@@ -111,57 +114,63 @@ static VALUE strscan_rest _((VALUE self));
 static VALUE strscan_rest_size _((VALUE self));
 
 static VALUE strscan_inspect _((VALUE self));
-static VALUE inspect1 _((struct strscanner *p));
-static VALUE inspect2 _((struct strscanner *p));
+static char* inspect_before _((struct strscanner *p, char *buf));
+static char* inspect_after _((struct strscanner *p, char *buf));
 
 /* =======================================================================
                                    Utils
    ======================================================================= */
 
 static VALUE
-infect(VALUE str, struct strscanner *p)
+infect(str, p)
+    VALUE str;
+    struct strscanner *p;
 {
     OBJ_INFECT(str, p->str);
     return str;
 }
 
 static VALUE
-extract_range(struct strscanner *p, long beg_i, long end_i)
+extract_range(p, beg_i, end_i)
+    struct strscanner *p;
+    long beg_i, end_i;
 {
-    if (beg_i > S_LEN(p)) return Qnil;
-    if (end_i > S_LEN(p))
-        end_i = S_LEN(p);
-    return infect(rb_str_new(S_PBEG(p) + beg_i, end_i - beg_i), p);
+    return infect(rb_str_new(S_PTR(p) + beg_i, end_i - beg_i), p);
 }
 
 static VALUE
-extract_beg_len(struct strscanner *p, long beg_i, long len)
+extract_beg_len(p, beg_i, len)
+    struct strscanner *p;
+    long beg_i, len;
 {
-    if (beg_i > S_LEN(p)) return Qnil;
-    if (beg_i + len > S_LEN(p))
-        len = S_LEN(p) - beg_i;
-    return infect(rb_str_new(S_PBEG(p) + beg_i, len), p);
+    return infect(rb_str_new(S_PTR(p) + beg_i, len), p);
 }
 
+
 /* =======================================================================
                                Constructor
    ======================================================================= */
 
+
 static void
-strscan_mark(struct strscanner *p)
+strscan_mark(p)
+    struct strscanner *p;
 {
     rb_gc_mark(p->str);
 }
 
 static void
-strscan_free(struct strscanner *p)
+strscan_free(p)
+    struct strscanner *p;
 {
     re_free_registers(&(p->regs));
+    memset(p, sizeof(struct strscanner), 0);
     free(p);
 }
 
 static VALUE
-strscan_s_allocate(VALUE klass)
+strscan_s_allocate(klass)
+    VALUE klass;
 {
     struct strscanner *p;
     
@@ -173,81 +182,40 @@ strscan_s_allocate(VALUE klass)
     return Data_Wrap_Struct(klass, strscan_mark, strscan_free, p);
 }
 
-/*
- * call-seq: StringScanner.new(string, dup = false)
- *
- * Creates a new StringScanner object to scan over the given +string+.
- * +dup+ argument is obsolete and not used now.
- */
 static VALUE
-strscan_initialize(int argc, VALUE *argv, VALUE self)
+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);
-    rb_scan_args(argc, argv, "11", &str, &need_dup);
+    if (rb_scan_args(argc, argv, "11", &str, &need_dup) == 1)
+        need_dup = Qtrue;
     StringValue(str);
-    p->str = str;
+    p->str = RTEST(need_dup) ? rb_str_dup(str) : str;
+    rb_obj_freeze(p->str);
 
     return self;
 }
 
-static void
-check_strscan(VALUE obj)
-{
-    if (TYPE(obj) != T_DATA || RDATA(obj)->dmark != (RUBY_DATA_FUNC)strscan_mark) {
-        rb_raise(rb_eTypeError,
-                 "wrong argument type %s (expected StringScanner)",
-                 rb_obj_classname(obj));
-    }
-}
-
-/*
- * call-seq:
- *   dup
- *   clone
- *
- * Duplicates a StringScanner object.
- */
-static VALUE
-strscan_init_copy(VALUE vself, VALUE vorig)
-{
-    struct strscanner *self, *orig;
-
-    Data_Get_Struct(vself, struct strscanner, self);
-    check_strscan(vorig);
-    Data_Get_Struct(vorig, struct strscanner, orig);
-    if (self != orig) {
-        self->flags = orig->flags;
-        self->str = orig->str;
-        self->prev = orig->prev;
-        self->curr = orig->curr;
-        re_copy_registers(&self->regs, &orig->regs);
-    }
-    return vself;
-}
 
 /* =======================================================================
                           Instance Methods
    ======================================================================= */
 
-/*
- * call-seq: StringScanner.must_C_version
- *
- * This method is defined for backward compatibility.
- */
 static VALUE
-strscan_s_mustc(VALUE self)
+strscan_s_mustc(self)
+    VALUE self;
 {
     return self;
 }
 
-/*
- * Reset the scan pointer (index 0) and clear matching data.
- */
 static VALUE
-strscan_reset(VALUE self)
+strscan_reset(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -257,15 +225,9 @@ strscan_reset(VALUE self)
     return self;
 }
 
-/*
- * call-seq:
- *   terminate
- *   clear
- *
- * Set the scan pointer to the end of the string and clear matching data.
- */
 static VALUE
-strscan_terminate(VALUE self)
+strscan_terminate(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -275,22 +237,9 @@ strscan_terminate(VALUE self)
     return self;
 }
 
-/*
- * Equivalent to #terminate.
- * This method is obsolete; use #terminate instead.
- */
 static VALUE
-strscan_clear(VALUE self)
-{
-    rb_warning("StringScanner#clear is obsolete; use #terminate instead");
-    return strscan_terminate(self);
-}
-
-/*
- * Returns the string being scanned.
- */
-static VALUE
-strscan_get_string(VALUE self)
+strscan_get_string(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -298,14 +247,9 @@ strscan_get_string(VALUE self)
     return p->str;
 }
 
-/*
- * call-seq: string=(str)
- *
- * Changes the string being scanned to +str+ and resets the scanner.
- * Returns +str+.
- */
 static VALUE
-strscan_set_string(VALUE self, VALUE str)
+strscan_set_string(self, str)
+    VALUE self, str;
 {
     struct strscanner *p;
 
@@ -318,47 +262,9 @@ strscan_set_string(VALUE self, VALUE str)
     return str;
 }
 
-/*
- * call-seq:
- *   concat(str)
- *   <<(str)
- *
- * Appends +str+ to the string being scanned.
- * This method does not affect scan pointer.
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.scan(/Fri /)
- *   s << " +1000 GMT"
- *   s.string            # -> "Fri Dec 12 1975 14:39 +1000 GMT"
- *   s.scan(/Dec/)       # -> "Dec"
- */
-static VALUE
-strscan_concat(VALUE self, VALUE str)
-{
-    struct strscanner *p;
-
-    GET_SCANNER(self, p);
-    StringValue(str);
-    rb_str_append(p->str, str);
-    return self;
-}
-
-/*
- * Returns the position of the scan pointer.  In the 'reset' position, this
- * value is zero.  In the 'terminated' position (i.e. the string is exhausted),
- * this value is the length of the string.
- *
- * In short, it's a 0-based index into the string.
- *
- *   s = StringScanner.new('test string')
- *   s.pos               # -> 0
- *   s.scan_until /str/  # -> "test str"
- *   s.pos               # -> 8
- *   s.terminate         # -> #<StringScanner fin>
- *   s.pos               # -> 11
- */
 static VALUE
-strscan_get_pos(VALUE self)
+strscan_get_pos(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -366,17 +272,9 @@ strscan_get_pos(VALUE self)
     return INT2FIX(p->curr);
 }
 
-/*
- * call-seq: pos=(n)
- *
- * Modify the scan pointer.
- *
- *   s = StringScanner.new('test string')
- *   s.pos = 7            # -> 7
- *   s.rest               # -> "ring"
- */
 static VALUE
-strscan_set_pos(VALUE self, VALUE v)
+strscan_set_pos(self, v)
+    VALUE self, v;
 {
     struct strscanner *p;
     long i;
@@ -390,8 +288,14 @@ strscan_set_pos(VALUE self, VALUE v)
     return INT2NUM(i);
 }
 
+
+/* I should implement this function? */
+#define strscan_prepare_re(re)  /* none */
+
 static VALUE
-strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
+strscan_do_scan(self, regex, succptr, getstr, headonly)
+    VALUE self, regex;
+    int succptr, getstr, headonly;
 {
     struct strscanner *p;
     int ret;
@@ -400,9 +304,7 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
     GET_SCANNER(self, p);
 
     CLEAR_MATCH_STATUS(p);
-    if (S_RESTLEN(p) < 0) {
-        return Qnil;
-    }
+    strscan_prepare_re(regex);
     if (headonly) {
         ret = re_match(RREGEXP(regex)->ptr,
                        CURPTR(p), S_RESTLEN(p),
@@ -436,201 +338,81 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
     }
 }
 
-/*
- * call-seq: scan(pattern) => String
- *
- * Tries to match with +pattern+ at the current position. If there's a match,
- * the scanner advances the "scan pointer" and returns the matched string.
- * Otherwise, the scanner returns +nil+.
- *
- *   s = StringScanner.new('test string')
- *   p s.scan(/\w+/)   # -> "test"
- *   p s.scan(/\w+/)   # -> nil
- *   p s.scan(/\s+/)   # -> " "
- *   p s.scan(/\w+/)   # -> "string"
- *   p s.scan(/./)     # -> nil
- *
- */
 static VALUE
-strscan_scan(VALUE self, VALUE re)
+strscan_scan(self, re)
+    VALUE self, re;
 {
     return strscan_do_scan(self, re, 1, 1, 1);
 }
 
-/*
- * call-seq: match?(pattern)
- *
- * Tests whether the given +pattern+ is matched from the current scan pointer.
- * Returns the length of the match, or +nil+.  The scan pointer is not advanced.
- *
- *   s = StringScanner.new('test string')
- *   p s.match?(/\w+/)   # -> 4
- *   p s.match?(/\w+/)   # -> 4
- *   p s.match?(/\s+/)   # -> nil
- */
 static VALUE
-strscan_match_p(VALUE self, VALUE re)
+strscan_match_p(self, re)
+    VALUE self, re;
 {
     return strscan_do_scan(self, re, 0, 0, 1);
 }
 
-/*
- * call-seq: skip(pattern)
- *
- * Attempts to skip over the given +pattern+ beginning with the scan pointer.
- * If it matches, the scan pointer is advanced to the end of the match, and the
- * length of the match is returned.  Otherwise, +nil+ is returned.
- *
- * It's similar to #scan, but without returning the matched string.
- *
- *   s = StringScanner.new('test string')
- *   p s.skip(/\w+/)   # -> 4
- *   p s.skip(/\w+/)   # -> nil
- *   p s.skip(/\s+/)   # -> 1
- *   p s.skip(/\w+/)   # -> 6
- *   p s.skip(/./)     # -> nil
- *
- */
 static VALUE
-strscan_skip(VALUE self, VALUE re)
+strscan_skip(self, re)
+    VALUE self, re;
 {
     return strscan_do_scan(self, re, 1, 0, 1);
 }
 
-/*
- * call-seq: check(pattern)
- *
- * This returns the value that #scan would return, without advancing the scan
- * pointer.  The match register is affected, though.
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.check /Fri/               # -> "Fri"
- *   s.pos                       # -> 0
- *   s.matched                   # -> "Fri"
- *   s.check /12/                # -> nil
- *   s.matched                   # -> nil
- *
- * Mnemonic: it "checks" to see whether a #scan will return a value.
- */
 static VALUE
-strscan_check(VALUE self, VALUE re)
+strscan_check(self, re)
+    VALUE self, re;
 {
     return strscan_do_scan(self, re, 0, 1, 1);
 }
 
-/*
- * call-seq: scan_full(pattern, return_string_p, advance_pointer_p)
- *
- * Tests whether the given +pattern+ is matched from the current scan pointer.
- * Returns the matched string if +return_string_p+ is true.
- * Advances the scan pointer if +advance_pointer_p+ is true.
- * The match register is affected.
- *
- * "full" means "#scan with full parameters".
- */
 static VALUE
-strscan_scan_full(VALUE self, VALUE re, VALUE s, VALUE f)
+strscan_scan_full(self, re, s, f)
+    VALUE self, re, s, f;
 {
     return strscan_do_scan(self, re, RTEST(s), RTEST(f), 1);
 }
 
 
-/*
- * call-seq: scan_until(pattern)
- *
- * Scans the string _until_ the +pattern+ is matched.  Returns the substring up
- * to and including the end of the match, advancing the scan pointer to that
- * location. If there is no match, +nil+ is returned.
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.scan_until(/1/)        # -> "Fri Dec 1"
- *   s.pre_match              # -> "Fri Dec "
- *   s.scan_until(/XYZ/)      # -> nil
- */
 static VALUE
-strscan_scan_until(VALUE self, VALUE re)
+strscan_scan_until(self, re)
+    VALUE self, re;
 {
     return strscan_do_scan(self, re, 1, 1, 0);
 }
 
-/*
- * call-seq: exist?(pattern)
- *
- * Looks _ahead_ to see if the +pattern+ exists _anywhere_ in the string,
- * without advancing the scan pointer.  This predicates whether a #scan_until
- * will return a value.
- *
- *   s = StringScanner.new('test string')
- *   s.exist? /s/            # -> 3
- *   s.scan /test/           # -> "test"
- *   s.exist? /s/            # -> 6
- *   s.exist? /e/            # -> nil
- */
 static VALUE
-strscan_exist_p(VALUE self, VALUE re)
+strscan_exist_p(self, re)
+    VALUE self, re;
 {
     return strscan_do_scan(self, re, 0, 0, 0);
 }
 
-/*
- * call-seq: skip_until(pattern)
- *
- * Advances the scan pointer until +pattern+ is matched and consumed.  Returns
- * the number of bytes advanced, or +nil+ if no match was found.
- *
- * Look ahead to match +pattern+, and advance the scan pointer to the _end_
- * of the match.  Return the number of characters advanced, or +nil+ if the
- * match was unsuccessful.
- *
- * It's similar to #scan_until, but without returning the intervening string.
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.skip_until /12/           # -> 10
- *   s                           # 
- */
 static VALUE
-strscan_skip_until(VALUE self, VALUE re)
+strscan_skip_until(self, re)
+    VALUE self, re;
 {
     return strscan_do_scan(self, re, 1, 0, 0);
 }
 
-/*
- * call-seq: check_until(pattern)
- *
- * This returns the value that #scan_until would return, without advancing the
- * scan pointer.  The match register is affected, though.
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.check_until /12/          # -> "Fri Dec 12"
- *   s.pos                       # -> 0
- *   s.matched                   # -> 12
- *
- * Mnemonic: it "checks" to see whether a #scan_until will return a value.
- */
 static VALUE
-strscan_check_until(VALUE self, VALUE re)
+strscan_check_until(self, re)
+    VALUE self, re;
 {
     return strscan_do_scan(self, re, 0, 1, 0);
 }
 
-/*
- * call-seq: search_full(pattern, return_string_p, advance_pointer_p)
- *
- * Scans the string _until_ the +pattern+ is matched.
- * Returns the matched string if +return_string_p+ is true, otherwise
- * returns the number of bytes advanced.
- * Advances the scan pointer if +advance_pointer_p+, otherwise not.
- * This method does affect the match register.
- */
 static VALUE
-strscan_search_full(VALUE self, VALUE re, VALUE s, VALUE f)
+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(struct strscanner *p)
+adjust_registers_to_matched(p)
+    struct strscanner *p;
 {
     if (p->regs.allocated == 0) {
         p->regs.beg = ALLOC_N(int, RE_NREGS);
@@ -642,23 +424,9 @@ adjust_registers_to_matched(struct strscanner *p)
     p->regs.end[0] = p->curr - p->prev;
 }
 
-/*
- * Scans one character and returns it.
- * This method is multi-byte character sensitive.
- * See also #get_byte.
- *
- *   s = StringScanner.new('ab')
- *   s.getch           # => "a"
- *   s.getch           # => "b"
- *   s.getch           # => nil
- *
- *   $KCODE = 'EUC'
- *   s = StringScanner.new("\244\242")
- *   s.getch           # => "\244\242"   # Japanese hira-kana "A" in EUC-JP
- *   s.getch           # => nil
- */
 static VALUE
-strscan_getch(VALUE self)
+strscan_getch(self)
+    VALUE self;
 {
     struct strscanner *p;
     long len;
@@ -667,10 +435,10 @@ strscan_getch(VALUE self)
     CLEAR_MATCH_STATUS(p);
     if (EOS_P(p))
         return Qnil;
+
     len = mbclen(*CURPTR(p));
-    if (p->curr + len > S_LEN(p)) {
+    if (p->curr + len > S_LEN(p))
         len = S_LEN(p) - p->curr;
-    }
     p->prev = p->curr;
     p->curr += len;
     MATCHED(p);
@@ -679,31 +447,17 @@ strscan_getch(VALUE self)
                             p->prev + p->regs.end[0]);
 }
 
-/*
- * Scans one byte and returns it.
- * This method is NOT multi-byte character sensitive.
- * See also #getch.
- *
- *   s = StringScanner.new('ab')
- *   s.get_byte         # => "a"
- *   s.get_byte         # => "b"
- *   s.get_byte         # => nil
- *
- *   s = StringScanner.new("\244\242")
- *   s.get_byte         # => "\244"
- *   s.get_byte         # => "\242"
- *   s.get_byte         # => nil
- */
 static VALUE
-strscan_get_byte(VALUE self)
+strscan_get_byte(self)
+    VALUE self;
 {
     struct strscanner *p;
 
     GET_SCANNER(self, p);
     CLEAR_MATCH_STATUS(p);
-    if (EOS_P(p)) {
+    if (EOS_P(p))
         return Qnil;
-    }
+
     p->prev = p->curr;
     p->curr++;
     MATCHED(p);
@@ -712,178 +466,85 @@ strscan_get_byte(VALUE self)
                             p->prev + p->regs.end[0]);
 }
 
-/*
- * Equivalent to #get_byte.
- * This method is obsolete; use #get_byte instead.
- */
-static VALUE
-strscan_getbyte(VALUE self)
-{
-    rb_warning("StringScanner#getbyte is obsolete; use #get_byte instead");
-    return strscan_get_byte(self);
-}
 
-/*
- * call-seq: peek(len)
- *
- * Extracts a string corresponding to <tt>string[pos,len]</tt>, without
- * advancing the scan pointer.
- *
- *   s = StringScanner.new('test string')
- *   s.peek(7)          # => "test st"
- *   s.peek(7)          # => "test st"
- *
- */
 static VALUE
-strscan_peek(VALUE self, VALUE vlen)
+strscan_peek(self, vlen)
+    VALUE self, vlen;
 {
     struct strscanner *p;
     long len;
 
     GET_SCANNER(self, p);
+
     len = NUM2LONG(vlen);
-    if (EOS_P(p)) {
+    if (EOS_P(p))
         return infect(rb_str_new("", 0), p);
-    }
-    if (p->curr + len > S_LEN(p)) {
+
+    if (p->curr + len > S_LEN(p))
         len = S_LEN(p) - p->curr;
-    }
     return extract_beg_len(p, p->curr, len);
 }
 
-/*
- * Equivalent to #peek.
- * This method is obsolete; use #peek instead.
- */
-static VALUE
-strscan_peep(VALUE self, VALUE vlen)
-{
-    rb_warning("StringScanner#peep is obsolete; use #peek instead");
-    return strscan_peek(self, vlen);
-}
 
-/*
- * Set the scan pointer to the previous position.  Only one previous position is
- * remembered, and it changes with each scanning operation.
- *
- *   s = StringScanner.new('test string')
- *   s.scan(/\w+/)        # => "test"
- *   s.unscan
- *   s.scan(/../)         # => "te"
- *   s.scan(/\d/)         # => nil
- *   s.unscan             # ScanError: unscan failed: previous match had failed
- */
 static VALUE
-strscan_unscan(VALUE self)
+strscan_unscan(self)
+    VALUE self;
 {
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    if (! MATCHED_P(p)) {
-        rb_raise(ScanError, "unscan failed: previous match had failed");
-    }
+    if (! MATCHED_P(p))
+        rb_raise(ScanError, "cannot unscan: prev match had failed");
+
     p->curr = p->prev;
     CLEAR_MATCH_STATUS(p);
     return self;
 }
 
-/*
- * Returns +true+ iff the scan pointer is at the beginning of the line.
- *
- *   s = StringScanner.new("test\ntest\n")
- *   s.bol?           # => true
- *   s.scan(/te/)
- *   s.bol?           # => false
- *   s.scan(/st\n/)
- *   s.bol?           # => true
- *   s.terminate
- *   s.bol?           # => true
- */
-static VALUE
-strscan_bol_p(VALUE self)
-{
-    struct strscanner *p;
 
-    GET_SCANNER(self, p);
-    if (CURPTR(p) > S_PEND(p)) return Qnil;
-    if (p->curr == 0) return Qtrue;
-    return (*(CURPTR(p) - 1) == '\n') ? Qtrue : Qfalse;
-}
-
-/*
- * Returns +true+ if the scan pointer is at the end of the string.
- *
- *   s = StringScanner.new('test string')
- *   p s.eos?          # => false
- *   s.scan(/test/)
- *   p s.eos?          # => false
- *   s.terminate
- *   p s.eos?          # => true
- */
 static VALUE
-strscan_eos_p(VALUE self)
+strscan_eos_p(self)
+    VALUE self;
 {
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    return EOS_P(p) ? Qtrue : Qfalse;
-}
-
-/*
- * Equivalent to #eos?.
- * This method is obsolete, use #eos? instead.
- */
-static VALUE
-strscan_empty_p(VALUE self)
-{
-    rb_warning("StringScanner#empty? is obsolete; use #eos? instead");
-    return strscan_eos_p(self);
+    if (EOS_P(p))
+        return Qtrue;
+    else
+        return Qfalse;
 }
 
-/*
- * Returns true iff there is more data in the string.  See #eos?.
- * This method is obsolete; use #eos? instead.
- *
- *   s = StringScanner.new('test string')
- *   s.eos?              # These two
- *   s.rest?             # are opposites.
- */
 static VALUE
-strscan_rest_p(VALUE self)
+strscan_rest_p(self)
+    VALUE self;
 {
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    return EOS_P(p) ? Qfalse : Qtrue;
+    if (EOS_P(p))
+        return Qfalse;
+    else
+        return Qtrue;
 }
 
-/*
- * Returns +true+ iff the last match was successful.
- *
- *   s = StringScanner.new('test string')
- *   s.match?(/\w+/)     # => 4
- *   s.matched?          # => true
- *   s.match?(/\d+/)     # => nil
- *   s.matched?          # => false
- */
+
 static VALUE
-strscan_matched_p(VALUE self)
+strscan_matched_p(self)
+    VALUE self;
 {
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    return MATCHED_P(p) ? Qtrue : Qfalse;
+    if (MATCHED_P(p))
+        return Qtrue;
+    else
+        return Qfalse;
 }
 
-/*
- * Returns the last matched string.
- * 
- *   s = StringScanner.new('test string')
- *   s.match?(/\w+/)     # -> 4
- *   s.matched           # -> "test"
- */
 static VALUE
-strscan_matched(VALUE self)
+strscan_matched(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -894,18 +555,9 @@ strscan_matched(VALUE self)
                             p->prev + p->regs.end[0]);
 }
 
-/*
- * Returns the size of the most recent match (see #matched), or +nil+ if there
- * was no recent match.
- *
- *   s = StringScanner.new('test string')
- *   s.check /\w+/           # -> "test"
- *   s.matched_size          # -> 4
- *   s.check /\d+/           # -> nil
- *   s.matched_size          # -> nil
- */
 static VALUE
-strscan_matched_size(VALUE self)
+strscan_matched_size(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -915,33 +567,9 @@ strscan_matched_size(VALUE self)
     return INT2NUM(p->regs.end[0] - p->regs.beg[0]);
 }
 
-/*
- * Equivalent to #matched_size.
- * This method is obsolete; use #matched_size instead.
- */
-static VALUE
-strscan_matchedsize(VALUE self)
-{
-    rb_warning("StringScanner#matchedsize is obsolete; use #matched_size instead");
-    return strscan_matched_size(self);
-}
-
-/*
- * call-seq: [](n)
- *
- * Return the n-th subgroup in the most recent match.
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
- *   s[0]                               # -> "Fri Dec 12 "
- *   s[1]                               # -> "Fri"
- *   s[2]                               # -> "Dec"
- *   s[3]                               # -> "12"
- *   s.post_match                       # -> "1975 14:39"
- *   s.pre_match                        # -> ""
- */
 static VALUE
-strscan_aref(VALUE self, VALUE idx)
+strscan_aref(self, idx)
+    VALUE self, idx;
 {
     struct strscanner *p;
     long i;
@@ -960,17 +588,9 @@ strscan_aref(VALUE self, VALUE idx)
                             p->prev + p->regs.end[i]);
 }
 
-/*
- * Return the <i><b>pre</b>-match</i> (in the regular expression sense) of the last scan.
- *
- *   s = StringScanner.new('test string')
- *   s.scan(/\w+/)           # -> "test"
- *   s.scan(/\s+/)           # -> " "
- *   s.pre_match             # -> "test"
- *   s.post_match            # -> "string"
- */
 static VALUE
-strscan_pre_match(VALUE self)
+strscan_pre_match(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -980,17 +600,9 @@ strscan_pre_match(VALUE self)
     return extract_range(p, 0, p->prev + p->regs.beg[0]);
 }
 
-/*
- * Return the <i><b>post</b>-match</i> (in the regular expression sense) of the last scan.
- *
- *   s = StringScanner.new('test string')
- *   s.scan(/\w+/)           # -> "test"
- *   s.scan(/\s+/)           # -> " "
- *   s.pre_match             # -> "test"
- *   s.post_match            # -> "string"
- */
 static VALUE
-strscan_post_match(VALUE self)
+strscan_post_match(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -1000,12 +612,10 @@ strscan_post_match(VALUE self)
     return extract_range(p, p->prev + p->regs.end[0], S_LEN(p));
 }
 
-/*
- * Returns the "rest" of the string (i.e. everything after the scan pointer).
- * If there is no more data (eos? = true), it returns <tt>""</tt>.
- */
+
 static VALUE
-strscan_rest(VALUE self)
+strscan_rest(self)
+    VALUE self;
 {
     struct strscanner *p;
 
@@ -1016,11 +626,9 @@ strscan_rest(VALUE self)
     return extract_range(p, p->curr, S_LEN(p));
 }
 
-/*
- * <tt>s.rest_size</tt> is equivalent to <tt>s.rest.size</tt>.
- */
 static VALUE
-strscan_rest_size(VALUE self)
+strscan_rest_size(self)
+    VALUE self;
 {
     struct strscanner *p;
     long i;
@@ -1034,76 +642,48 @@ strscan_rest_size(VALUE self)
     return INT2FIX(i);
 }
 
-/*
- * <tt>s.restsize</tt> is equivalent to <tt>s.rest_size</tt>.
- * This method is obsolete; use #rest_size instead.
- */
-static VALUE
-strscan_restsize(VALUE self)
-{
-    rb_warning("StringScanner#restsize is obsolete; use #rest_size instead");
-    return strscan_rest_size(self);
-}
 
 #define INSPECT_LENGTH 5
-#define BUFSIZE 256
-
-/*
- * Returns a string that represents the StringScanner object, showing:
- * - the current position
- * - the size of the string
- * - the characters surrounding the scan pointer
- *
- *   s = StringScanner.new("Fri Dec 12 1975 14:39")
- *   s.inspect            # -> '#<StringScanner 0/21 @ "Fri D...">'
- *   s.scan_until /12/    # -> "Fri Dec 12"
- *   s.inspect            # -> '#<StringScanner 10/21 "...ec 12" @ " 1975...">'
- */
+
 static VALUE
-strscan_inspect(VALUE self)
+strscan_inspect(self)
+    VALUE self;
 {
     struct strscanner *p;
-    char buf[BUFSIZE];
+    char buf[256];
+    char buf_before[16];
+    char buf_after[16];
     long len;
-    VALUE a, b;
 
     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);
+        len = sprintf(buf, "#<%s (uninitialized)>",
+                      rb_class2name(CLASS_OF(self)));
+        return rb_str_new(buf, len);
     }
     if (EOS_P(p)) {
-        len = snprintf(buf, BUFSIZE, "#<%s fin>",
-                       rb_class2name(CLASS_OF(self)));
-        return infect(rb_str_new(buf, len), p);
-    }
-    if (p->curr == 0) {
-        b = inspect2(p);
-        len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld @ %s>",
-                       rb_class2name(CLASS_OF(self)),
-                       p->curr, S_LEN(p),
-                       RSTRING(b)->ptr);
-        return infect(rb_str_new(buf, len), p);
+        len = sprintf(buf, "#<%s fin>",
+                      rb_class2name(CLASS_OF(self)));
+        return rb_str_new(buf, len);
     }
-    a = inspect1(p);
-    b = inspect2(p);
-    len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld %s @ %s>",
-                   rb_class2name(CLASS_OF(self)),
-                   p->curr, S_LEN(p),
-                   RSTRING(a)->ptr,
-                   RSTRING(b)->ptr);
-    return infect(rb_str_new(buf, len), p);
+    len = sprintf(buf, "#<%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 rb_str_new(buf, len);
 }
 
-static VALUE
-inspect1(struct strscanner *p)
+static char*
+inspect_before(p, buf)
+    struct strscanner *p;
+    char *buf;
 {
-    char buf[BUFSIZE];
     char *bp = buf;
     long len;
 
-    if (p->curr == 0) return rb_str_new2("");
+    if (p->curr == 0) return "";
+    *bp++ = '"';
     if (p->curr > INSPECT_LENGTH) {
         strcpy(bp, "..."); bp += 3;
         len = INSPECT_LENGTH;
@@ -1112,17 +692,22 @@ inspect1(struct strscanner *p)
         len = p->curr;
     }
     memcpy(bp, CURPTR(p) - len, len); bp += len;
-    return rb_str_dump(rb_str_new(buf, bp - buf));
+    *bp++ = '"';
+    *bp++ = ' ';
+    *bp++ = '\0';
+    return buf;
 }
 
-static VALUE
-inspect2(struct strscanner *p)
+static char*
+inspect_after(p, buf)
+    struct strscanner *p;
+    char *buf;
 {
-    char buf[BUFSIZE];
     char *bp = buf;
     long len;
 
-    if (EOS_P(p)) return rb_str_new2("");
+    *bp++ = ' ';
+    *bp++ = '"';
     len = S_LEN(p) - p->curr;
     if (len > INSPECT_LENGTH) {
         len = INSPECT_LENGTH;
@@ -1132,145 +717,46 @@ inspect2(struct strscanner *p)
     else {
         memcpy(bp, CURPTR(p), len); bp += len;
     }
-    return rb_str_dump(rb_str_new(buf, bp - buf));
+    *bp++ = '"';
+    *bp++ = '\0';
+    return buf;
 }
 
 /* =======================================================================
                               Ruby Interface
    ======================================================================= */
 
-/*
- * Document-class: StringScanner
- * 
- * StringScanner provides for lexical scanning operations on a String.  Here is
- * an example of its usage:
- *
- *   s = StringScanner.new('This is an example string')
- *   s.eos?               # -> false
- *   
- *   p s.scan(/\w+/)      # -> "This"
- *   p s.scan(/\w+/)      # -> nil
- *   p s.scan(/\s+/)      # -> " "
- *   p s.scan(/\s+/)      # -> nil
- *   p s.scan(/\w+/)      # -> "is"
- *   s.eos?               # -> false
- *   
- *   p s.scan(/\s+/)      # -> " "
- *   p s.scan(/\w+/)      # -> "an"
- *   p s.scan(/\s+/)      # -> " "
- *   p s.scan(/\w+/)      # -> "example"
- *   p s.scan(/\s+/)      # -> " "
- *   p s.scan(/\w+/)      # -> "string"
- *   s.eos?               # -> true
- *   
- *   p s.scan(/\s+/)      # -> nil
- *   p s.scan(/\w+/)      # -> nil
- *
- * Scanning a string means remembering the position of a <i>scan pointer</i>,
- * which is just an index.  The point of scanning is to move forward a bit at
- * a time, so matches are sought after the scan pointer; usually immediately
- * after it.
- *
- * Given the string "test string", here are the pertinent scan pointer
- * positions:
- *
- *     t e s t   s t r i n g
- *   0 1 2 ...             1
- *                         0
- *
- * When you #scan for a pattern (a regular expression), the match must occur
- * at the character after the scan pointer.  If you use #scan_until, then the
- * match can occur anywhere after the scan pointer.  In both cases, the scan
- * pointer moves <i>just beyond</i> the last character of the match, ready to
- * scan again from the next character onwards.  This is demonstrated by the
- * example above.
- *
- * == Method Categories
- *
- * There are other methods besides the plain scanners.  You can look ahead in
- * the string without actually scanning.  You can access the most recent match.
- * You can modify the string being scanned, reset or terminate the scanner,
- * find out or change the position of the scan pointer, skip ahead, and so on.
- * 
- * === Advancing the Scan Pointer
- *
- * - #getch
- * - #get_byte
- * - #scan
- * - #scan_until
- * - #skip
- * - #skip_until
- *
- * === Looking Ahead
- *
- * - #check
- * - #check_until
- * - #exist?
- * - #match?
- * - #peek
- *
- * === Finding Where we Are
- *
- * - #beginning_of_line? (#bol?)
- * - #eos?
- * - #rest?
- * - #rest_size
- * - #pos
- *
- * === Setting Where we Are
- *
- * - #reset
- * - #terminate
- * - #pos=
- * 
- * === Match Data
- *
- * - #matched
- * - #matched?
- * - #matched_size
- * - []
- * - #pre_match
- * - #post_match
- *
- * === Miscellaneous
- *
- * - <<
- * - #concat
- * - #string
- * - #string=
- * - #unscan
- *
- * There are aliases to several of the methods.
- */
 void
-Init_strscan(void)
+Init_strscan()
 {
     ID id_scanerr = rb_intern("ScanError");
-    VALUE tmp;
+    volatile VALUE tmp;
 
-    StringScanner = rb_define_class("StringScanner", rb_cObject);
-    ScanError = rb_define_class_under(StringScanner, "Error", rb_eStandardError);
-    if (!rb_const_defined(rb_cObject, id_scanerr)) {
-	rb_const_set(rb_cObject, id_scanerr, ScanError);
+    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: strscan.c,v 1.7.2.8 2006/07/26 09:37:00 aamine Exp $");
+    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_private_method(StringScanner, "initialize_copy", strscan_init_copy, 1);
-    rb_define_singleton_method(StringScanner, "must_C_version", strscan_s_mustc, 0);
+    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_clear,       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, "concat",      strscan_concat,      1);
-    rb_define_method(StringScanner, "<<",          strscan_concat,      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);
@@ -1290,29 +776,27 @@ Init_strscan(void)
 
     rb_define_method(StringScanner, "getch",       strscan_getch,       0);
     rb_define_method(StringScanner, "get_byte",    strscan_get_byte,    0);
-    rb_define_method(StringScanner, "getbyte",     strscan_getbyte,     0);
+    rb_define_method(StringScanner, "getbyte",     strscan_get_byte,    0);
     rb_define_method(StringScanner, "peek",        strscan_peek,        1);
-    rb_define_method(StringScanner, "peep",        strscan_peep,        1);
+    rb_define_method(StringScanner, "peep",        strscan_peek,        1);
 
     rb_define_method(StringScanner, "unscan",      strscan_unscan,      0);
 
-    rb_define_method(StringScanner, "beginning_of_line?", strscan_bol_p, 0);
-    rb_alias(StringScanner, rb_intern("bol?"), rb_intern("beginning_of_line?"));
     rb_define_method(StringScanner, "eos?",        strscan_eos_p,       0);
-    rb_define_method(StringScanner, "empty?",      strscan_empty_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_matchedsize, 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_restsize,    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/bytecode.c b/ext/syck/bytecode.c
deleted file mode 100644
index acda3b15a4..0000000000
--- a/ext/syck/bytecode.c
+++ /dev/null
@@ -1,1166 +0,0 @@
-/* Generated by re2c 0.9.10 on Mon Sep 19 23:21:26 2005 */
-#line 1 "bytecode.re"
-/*
- * bytecode.re
- *
- * $Author: why $
- * $Date: 2005/09/20 06:46:43 $
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-#include "ruby.h"
-#include "syck.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
-
-/*
- * Track line numbers
- */
-#define CHK_NL(ptr)    if ( *( ptr - 1 ) == '\n' && ptr > YYLINECTPTR ) { YYLINEPTR = ptr; 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;
-
-/*
- * 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_iseq || last_lvl->status == syck_lvl_imap ) \
-            { \
-                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;
-    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 172 "bytecode.re"
-
-
-    lvl = CURRENT_LEVEL();
-    if ( lvl->status == syck_lvl_doc )
-    {
-        goto Document;
-    }
-
-/* Header: */
-
-    YYTOKEN = YYCURSOR;
-
-
-#line 165 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy0;
-	++YYCURSOR;
-yy0:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	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 0x0A:	goto yy6;
-	case 0x0D:	goto yy8;
-	default:	goto yy4;
-	}
-yy4:
-#line 199 "bytecode.re"
-{   YYPOS(0);
-            goto Document;
-        }
-#line 195 "<stdout>"
-yy5:	yych = *++YYCURSOR;
-	goto yy4;
-yy6:	++YYCURSOR;
-	goto yy7;
-yy7:
-#line 186 "bytecode.re"
-{   if ( lvl->status == syck_lvl_header )
-            {
-                CHK_NL(YYCURSOR);
-                goto Directive;
-            }
-            else
-            {
-                ENSURE_YAML_IEND(lvl, -1);
-                YYPOS(0);
-                return 0;
-            }
-        }
-#line 214 "<stdout>"
-yy8:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy6;
-	default:	goto yy2;
-	}
-}
-#line 203 "bytecode.re"
-
-
-Document:
-    {
-        lvl = CURRENT_LEVEL();
-        if ( lvl->status == syck_lvl_header )
-        {
-            lvl->status = syck_lvl_doc;
-        }
-
-        YYTOKEN = YYCURSOR;
-
-
-#line 235 "<stdout>"
-{
-	YYCTYPE yych;
-	goto yy9;
-	++YYCURSOR;
-yy9:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy30;
-	case 0x0A:	goto yy27;
-	case 0x0D:	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 0x0A:	goto yy41;
-	case 0x0D:	goto yy44;
-	default:	goto yy11;
-	}
-yy13:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy41;
-	case 0x0D:	goto yy43;
-	default:	goto yy11;
-	}
-yy14:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy38;
-	case 0x0D:	goto yy40;
-	default:	goto yy11;
-	}
-yy15:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy35;
-	case 0x0D:	goto yy37;
-	default:	goto yy11;
-	}
-yy16:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy32;
-	case 0x0D:	goto yy34;
-	default:	goto yy11;
-	}
-yy17:	++YYCURSOR;
-	goto yy18;
-yy18:
-#line 288 "bytecode.re"
-{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str); 
-            goto Scalar;
-        }
-#line 296 "<stdout>"
-yy19:	++YYCURSOR;
-	goto yy20;
-yy20:
-#line 292 "bytecode.re"
-{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
-            sycklval->name = get_inline( parser );
-            syck_hdlr_remove_anchor( parser, sycklval->name );
-            CHK_NL(YYCURSOR);
-            return YAML_ANCHOR;
-        }
-#line 307 "<stdout>"
-yy21:	++YYCURSOR;
-	goto yy22;
-yy22:
-#line 299 "bytecode.re"
-{   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;
-        }
-#line 318 "<stdout>"
-yy23:	++YYCURSOR;
-	goto yy24;
-yy24:
-#line 306 "bytecode.re"
-{   char *qstr;
-            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
-            qstr = get_inline( parser );
-            CHK_NL(YYCURSOR);
-            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;
-        }
-#line 382 "<stdout>"
-yy25:	++YYCURSOR;
-	goto yy26;
-yy26:
-#line 366 "bytecode.re"
-{   goto Comment; }
-#line 388 "<stdout>"
-yy27:	++YYCURSOR;
-	goto yy28;
-yy28:
-#line 368 "bytecode.re"
-{   CHK_NL(YYCURSOR);
-            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;
-        }
-#line 405 "<stdout>"
-yy29:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy27;
-	default:	goto yy11;
-	}
-yy30:	++YYCURSOR;
-	goto yy31;
-yy31:
-#line 381 "bytecode.re"
-{   ENSURE_YAML_IEND(lvl, -1);
-            YYPOS(0);
-            return 0;
-        }
-#line 419 "<stdout>"
-yy32:	++YYCURSOR;
-	goto yy33;
-yy33:
-#line 252 "bytecode.re"
-{   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);
-                }
-            }
-            CHK_NL(YYCURSOR);
-            return YAML_IEND;
-        }
-#line 459 "<stdout>"
-yy34:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy32;
-	default:	goto yy11;
-	}
-yy35:	++YYCURSOR;
-	goto yy36;
-yy36:
-#line 237 "bytecode.re"
-{   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);
-            CHK_NL(YYCURSOR);
-            if ( complex )
-            {
-                FORCE_NEXT_TOKEN( YAML_IOPEN );
-                return '?';
-            }
-            return YAML_IOPEN;
-        }
-#line 483 "<stdout>"
-yy37:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy35;
-	default:	goto yy11;
-	}
-yy38:	++YYCURSOR;
-	goto yy39;
-yy39:
-#line 222 "bytecode.re"
-{   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); 
-            CHK_NL(YYCURSOR);
-            if ( complex )
-            {
-                FORCE_NEXT_TOKEN( YAML_IOPEN );
-                return '?';
-            }
-            return YAML_IOPEN;
-        }
-#line 507 "<stdout>"
-yy40:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy38;
-	default:	goto yy11;
-	}
-yy41:	++YYCURSOR;
-	goto yy42;
-yy42:
-#line 217 "bytecode.re"
-{   ENSURE_YAML_IEND(lvl, -1);
-                YYPOS(0);
-                return 0;
-            }
-#line 521 "<stdout>"
-yy43:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy41;
-	default:	goto yy11;
-	}
-yy44:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy41;
-	default:	goto yy11;
-	}
-}
-#line 386 "bytecode.re"
-
-
-    }
-
-Directive:
-    {
-        YYTOKEN = YYCURSOR;
-
-
-#line 543 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy45;
-	++YYCURSOR;
-yy45:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	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 399 "bytecode.re"
-{   YYCURSOR = YYTOKEN;
-               return YAML_DOCSEP;
-           }
-#line 646 "<stdout>"
-yy50:	yych = *++YYCURSOR;
-	goto yy49;
-yy51:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy52;
-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) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy55;
-yy55:	switch(yych){
-	case 0x0A:	goto yy56;
-	case 0x0D:	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:	++YYCURSOR;
-	goto yy57;
-yy57:
-#line 396 "bytecode.re"
-{   CHK_NL(YYCURSOR);
-               goto Directive; }
-#line 899 "<stdout>"
-yy58:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy56;
-	default:	goto yy47;
-	}
-}
-#line 402 "bytecode.re"
-
-
-    }
-
-Comment:
-    {
-        YYTOKEN = YYCURSOR;
-
-
-#line 916 "<stdout>"
-{
-	YYCTYPE yych;
-	goto yy59;
-	++YYCURSOR;
-yy59:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy61;
-	case 0x0A:	goto yy62;
-	case 0x0D:	goto yy64;
-	default:	goto yy66;
-	}
-yy61:yy62:	++YYCURSOR;
-	goto yy63;
-yy63:
-#line 412 "bytecode.re"
-{   CHK_NL(YYCURSOR);
-                goto Document; }
-#line 936 "<stdout>"
-yy64:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy67;
-	default:	goto yy65;
-	}
-yy65:
-#line 415 "bytecode.re"
-{   goto Comment; }
-#line 945 "<stdout>"
-yy66:	yych = *++YYCURSOR;
-	goto yy65;
-yy67:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy63;
-}
-#line 417 "bytecode.re"
-
-
-    }
-
-Scalar:
-    {
-    int idx = 0;
-    int cap = 100;
-    char *str = S_ALLOC_N( char, cap );
-    char *tok;
-
-    str[0] = '\0';
-
-Scalar2:
-    tok = YYCURSOR;
-
-
-#line 970 "<stdout>"
-{
-	YYCTYPE yych;
-	goto yy68;
-	++YYCURSOR;
-yy68:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy74;
-	case 0x0A:	goto yy70;
-	case 0x0D:	goto yy72;
-	default:	goto yy76;
-	}
-yy70:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 'C':	goto yy78;
-	case 'N':	goto yy80;
-	case 'Z':	goto yy83;
-	default:	goto yy71;
-	}
-yy71:
-#line 461 "bytecode.re"
-{   YYCURSOR = tok;
-            goto ScalarEnd; 
-        }
-#line 996 "<stdout>"
-yy72:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy77;
-	default:	goto yy73;
-	}
-yy73:
-#line 469 "bytecode.re"
-{   CAT(str, cap, idx, tok[0]);
-            goto Scalar2; 
-        }
-#line 1007 "<stdout>"
-yy74:	++YYCURSOR;
-	goto yy75;
-yy75:
-#line 465 "bytecode.re"
-{   YYCURSOR = tok;
-            goto ScalarEnd;
-        }
-#line 1015 "<stdout>"
-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:	++YYCURSOR;
-	goto yy79;
-yy79:
-#line 435 "bytecode.re"
-{   CHK_NL(tok+1);
-            goto Scalar2; }
-#line 1031 "<stdout>"
-yy80:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy81;
-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 438 "bytecode.re"
-{   CHK_NL(tok+1);
-            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;
-        }
-#line 1068 "<stdout>"
-yy83:	++YYCURSOR;
-	goto yy84;
-yy84:
-#line 456 "bytecode.re"
-{   CHK_NL(tok+1);
-            CAT(str, cap, idx, '\0');
-            goto Scalar2; 
-        }
-#line 1077 "<stdout>"
-}
-#line 473 "bytecode.re"
-
-
-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;
-
-
-#line 1114 "<stdout>"
-{
-	YYCTYPE yych;
-	goto yy85;
-	++YYCURSOR;
-yy85:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy91;
-	case 0x0A:	goto yy87;
-	case 0x0D:	goto yy89;
-	default:	goto yy93;
-	}
-yy87:	++YYCURSOR;
-	goto yy88;
-yy88:
-#line 508 "bytecode.re"
-{   CHK_NL(YYCURSOR);
-                return str; }
-#line 1134 "<stdout>"
-yy89:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy94;
-	default:	goto yy90;
-	}
-yy90:
-#line 515 "bytecode.re"
-{   CAT(str, cap, idx, tok[0]);
-                goto Inline; 
-            }
-#line 1145 "<stdout>"
-yy91:	++YYCURSOR;
-	goto yy92;
-yy92:
-#line 511 "bytecode.re"
-{   YYCURSOR = tok;
-                return str;
-            }
-#line 1153 "<stdout>"
-yy93:	yych = *++YYCURSOR;
-	goto yy90;
-yy94:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy88;
-}
-#line 519 "bytecode.re"
-
-
-    }
-
-}
-
diff --git a/ext/syck/depend b/ext/syck/depend
deleted file mode 100644
index 3eec4de72a..0000000000
--- a/ext/syck/depend
+++ /dev/null
@@ -1,12 +0,0 @@
-ruby_headers = $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
-  $(hdrdir)/missing.h $(hdrdir)/intern.h $(hdrdir)/st.h
-bytecode.o: bytecode.c syck.h gram.h $(ruby_headers)
-emitter.o: emitter.c syck.h $(ruby_headers)
-gram.o: gram.c syck.h $(hdrdir)/st.h
-handler.o: handler.c syck.h $(ruby_headers)
-implicit.o: implicit.c syck.h $(ruby_headers)
-node.o: node.c syck.h $(ruby_headers)
-rubyext.o: rubyext.c syck.h $(ruby_headers)
-syck.o: syck.c syck.h $(ruby_headers)
-token.o: token.c syck.h gram.h $(ruby_headers)
-yaml2byte.o: yaml2byte.c syck.h yamlbyte.h $(ruby_headers)
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
deleted file mode 100644
index 8d32784cd5..0000000000
--- a/ext/syck/emitter.c
+++ /dev/null
@@ -1,1242 +0,0 @@
-/*
- * emitter.c
- *
- * $Author: matz $
- * $Date: 2006/05/03 17:29:34 $
- *
- * Copyright (C) 2003 why the lucky stiff
- * 
- * All Base64 code from Ruby's pack.c.
- * Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto 
- */
-#include "ruby.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "syck.h"
-
-#define DEFAULT_ANCHOR_FORMAT "id%03d"
-
-const char hex_table[] = 
-"0123456789ABCDEF";
-static char b64_table[] =
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-/*
- * Built-in base64 (from Ruby's pack.c)
- */
-char *
-syck_base64enc( char *s, long len )
-{
-    long i = 0;
-    int padding = '=';
-    char *buff = S_ALLOC_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->use_header = 0;
-    e->use_version = 0;
-    e->sort_keys = 0;
-    e->anchor_format = NULL;
-    e->explicit_typing = 0;
-    e->best_width = 80;
-    e->style = scalar_none;
-    e->stage = doc_open;
-    e->indent = 2;
-    e->level = -1;
-    e->anchors = NULL;
-    e->markers = NULL;
-    e->anchored = NULL;
-    e->bufsize = SYCK_BUFFERSIZE;
-    e->buffer = NULL;
-    e->marker = NULL;
-    e->bufpos = 0;
-    e->emitter_handler = NULL;
-    e->output_handler = NULL;
-    e->lvl_idx = 0;
-    e->lvl_capa = ALLOC_CT;
-    e->levels = S_ALLOC_N( SyckLevel, e->lvl_capa ); 
-    syck_emitter_reset_levels( e );
-    e->bonus = NULL;
-    return e;
-}
-
-int
-syck_st_free_anchors( char *key, char *name, char *arg )
-{
-    S_FREE( name );
-    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;
-    }
-
-    if ( e->anchored != NULL )
-    {
-        st_free_table( e->anchored );
-        e->anchored = NULL;
-    }
-
-    /*
-     * Free the markers tables
-     */
-    if ( e->markers != NULL )
-    {
-        st_free_table( e->markers );
-        e->markers = NULL;
-    }
-}
-
-SyckLevel *
-syck_emitter_current_level( SyckEmitter *e )
-{
-    return &e->levels[e->lvl_idx-1];
-}
-
-SyckLevel *
-syck_emitter_parent_level( SyckEmitter *e )
-{
-    return &e->levels[e->lvl_idx-2];
-}
-
-void
-syck_emitter_pop_level( SyckEmitter *e )
-{
-    ASSERT( e != NULL );
-
-    /* The root level should never be popped */
-    if ( e->lvl_idx <= 1 ) return;
-
-    e->lvl_idx -= 1;
-    free( e->levels[e->lvl_idx].domain );
-}
-
-void 
-syck_emitter_add_level( SyckEmitter *e, int len, enum syck_level_status status )
-{
-    ASSERT( e != NULL );
-    if ( e->lvl_idx + 1 > e->lvl_capa )
-    {
-        e->lvl_capa += ALLOC_CT;
-        S_REALLOC_N( e->levels, SyckLevel, e->lvl_capa );
-    }
-
-    ASSERT( len > e->levels[e->lvl_idx-1].spaces );
-    e->levels[e->lvl_idx].spaces = len;
-    e->levels[e->lvl_idx].ncount = 0;
-    e->levels[e->lvl_idx].domain = syck_strndup( e->levels[e->lvl_idx-1].domain, strlen( e->levels[e->lvl_idx-1].domain ) );
-    e->levels[e->lvl_idx].status = status;
-    e->levels[e->lvl_idx].anctag = 0;
-    e->lvl_idx += 1;
-}
-
-void
-syck_emitter_reset_levels( SyckEmitter *e )
-{
-    while ( e->lvl_idx > 1 )
-    {
-        syck_emitter_pop_level( e );
-    }
-
-    if ( e->lvl_idx < 1 )
-    {
-        e->lvl_idx = 1;
-        e->levels[0].spaces = -1;
-        e->levels[0].ncount = 0;
-        e->levels[0].domain = syck_strndup( "", 0 );
-        e->levels[0].anctag = 0;
-    }
-    e->levels[0].status = syck_lvl_header;
-}
-
-void
-syck_emitter_handler( SyckEmitter *e, SyckEmitterHandler hdlr )
-{
-    e->emitter_handler = hdlr;
-}
-
-void
-syck_output_handler( SyckEmitter *e, SyckOutputHandler hdlr )
-{
-    e->output_handler = hdlr;
-}
-
-void
-syck_free_emitter( SyckEmitter *e )
-{
-    /*
-     * Free tables
-     */
-    syck_emitter_st_free( e );
-    syck_emitter_reset_levels( e );
-    S_FREE( e->levels[0].domain );
-    S_FREE( e->levels );
-    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 );
-	for (;;) {
-	    long rest = e->bufsize - (e->marker - e->buffer);
-	    if (len <= rest) break;
-	    S_MEMCPY( e->marker, str, char, rest );
-	    e->marker += rest;
-	    str += rest;
-	    len -= rest;
-	    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;
-    }
-
-    /*
-     * Commit buffer.
-     */
-    if ( check_room > e->marker - e->buffer )
-    {
-        check_room = e->marker - e->buffer;
-    }
-    (e->output_handler)( e, e->buffer, check_room );
-    e->bufpos += check_room;
-    e->marker -= check_room;
-}
-
-/*
- * Start emitting from the given node, check for anchoring and then
- * issue the callback to the emitter handler.
- */
-void
-syck_emit( SyckEmitter *e, st_data_t n )
-{
-    SYMID oid;
-    char *anchor_name = NULL;
-    int indent = 0;
-    long x = 0;
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    
-    /*
-     * Determine headers.
-     */
-    if ( e->stage == doc_open && ( e->headless == 0 || e->use_header == 1 ) )
-    {
-        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 );
-            syck_emitter_write( e, header, strlen( header ) );
-            S_FREE( header );
-        }
-        else
-        {
-            syck_emitter_write( e, "--- ", 4 );
-        }
-        e->stage = doc_processing;
-    }
-
-    /* Add new level */
-    if ( lvl->spaces >= 0 ) {
-        indent = lvl->spaces + e->indent;
-    }
-    syck_emitter_add_level( e, indent, syck_lvl_open );
-    lvl = syck_emitter_current_level( e );
-
-    /* Look for anchor */
-    if ( e->anchors != NULL &&
-        st_lookup( e->markers, n, (st_data_t *)&oid ) &&
-        st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
-    {
-        if ( e->anchored == NULL )
-        {
-            e->anchored = st_init_numtable();
-        }
-
-        if ( ! st_lookup( e->anchored, (st_data_t)anchor_name, (st_data_t *)&x ) )
-        {
-            char *an = S_ALLOC_N( char, strlen( anchor_name ) + 3 );
-            sprintf( an, "&%s ", anchor_name );
-            syck_emitter_write( e, an, strlen( anchor_name ) + 2 );
-            free( an );
-
-            x = 1;
-            st_insert( e->anchored, (st_data_t)anchor_name, (st_data_t)x );
-            lvl->anctag = 1;
-        }
-        else
-        {
-            char *an = S_ALLOC_N( char, strlen( anchor_name ) + 2 );
-            sprintf( an, "*%s", anchor_name );
-            syck_emitter_write( e, an, strlen( anchor_name ) + 1 );
-            free( an );
-
-            goto end_emit;
-        }
-    }
-
-    (e->emitter_handler)( e, n );
-
-    /* Pop the level */
-end_emit:
-    syck_emitter_pop_level( e );
-    if ( e->lvl_idx == 1 ) {
-        syck_emitter_write( e, "\n", 1 );
-        e->headless = 0;
-        e->stage = doc_open;
-    }
-}
-
-/*
- * Determine what tag needs to be written, based on the taguri of the node
- * and the implicit tag which would be assigned to this node.  If a tag is
- * required, write the tag.
- */
-void syck_emit_tag( SyckEmitter *e, char *tag, char *ignore )
-{
-    SyckLevel *lvl;
-    if ( tag == NULL ) return;
-    if ( ignore != NULL && syck_tagcmp( tag, ignore ) == 0 && e->explicit_typing == 0 ) return;
-    lvl = syck_emitter_current_level( e );
-
-    /* implicit */
-    if ( strlen( tag ) == 0 ) {
-        syck_emitter_write( e, "! ", 2 );
-
-    /* global types */
-    } else if ( strncmp( tag, "tag:", 4 ) == 0 ) {
-        int taglen = strlen( tag );
-        syck_emitter_write( e, "!", 1 );
-        if ( strncmp( tag + 4, YAML_DOMAIN, strlen( YAML_DOMAIN ) ) == 0 ) {
-            int skip = 4 + strlen( YAML_DOMAIN ) + 1;
-            syck_emitter_write( e, tag + skip, taglen - skip );
-        } else {
-            char *subd = tag + 4;
-            while ( *subd != ':' && *subd != '\0' ) subd++;
-            if ( *subd == ':' ) {
-                if ( subd - tag > ( strlen( YAML_DOMAIN ) + 5 ) &&
-                     strncmp( subd - strlen( YAML_DOMAIN ), YAML_DOMAIN, strlen( YAML_DOMAIN ) ) == 0 ) {
-                    syck_emitter_write( e, tag + 4, subd - strlen( YAML_DOMAIN ) - ( tag + 4 ) - 1 );
-                    syck_emitter_write( e, "/", 1 );
-                    syck_emitter_write( e, subd + 1, ( tag + taglen ) - ( subd + 1 ) );
-                } else {
-                    syck_emitter_write( e, tag + 4, subd - ( tag + 4 ) );
-                    syck_emitter_write( e, "/", 1 );
-                    syck_emitter_write( e, subd + 1, ( tag + taglen ) - ( subd + 1 ) );
-                }
-            } else {
-                /* TODO: Invalid tag (no colon after domain) */
-                return;
-            }
-        }
-        syck_emitter_write( e, " ", 1 );
-
-    /* private types */
-    } else if ( strncmp( tag, "x-private:", 10 ) == 0 ) {
-        syck_emitter_write( e, "!!", 2 );
-        syck_emitter_write( e, tag + 10, strlen( tag ) - 10 );
-        syck_emitter_write( e, " ", 1 );
-    }
-    lvl->anctag = 1;
-}
-
-/* 
- * Emit a newline and an appropriately spaced indent.
- */
-void syck_emit_indent( SyckEmitter *e )
-{
-    int i;
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    if ( e->bufpos == 0 && ( e->marker - e->buffer ) == 0 ) return;
-    if ( lvl->spaces >= 0 ) {
-        char *spcs = S_ALLOC_N( char, lvl->spaces + 2 );
-
-        spcs[0] = '\n'; spcs[lvl->spaces + 1] = '\0';
-        for ( i = 0; i < lvl->spaces; i++ ) spcs[i+1] = ' ';
-        syck_emitter_write( e, spcs, lvl->spaces + 1 );
-        free( spcs );
-    }
-}
-
-/* Clear the scan */
-#define SCAN_NONE       0
-/* All printable characters? */
-#define SCAN_NONPRINT   1
-/* Any indented lines? */
-#define SCAN_INDENTED   2
-/* Larger than the requested width? */
-#define SCAN_WIDE       4
-/* Opens or closes with whitespace? */
-#define SCAN_WHITEEDGE  8
-/* Contains a newline */
-#define SCAN_NEWLINE    16
-/* Contains a single quote */
-#define SCAN_SINGLEQ    32
-/* Contains a double quote */
-#define SCAN_DOUBLEQ    64
-/* Starts with a token */
-#define SCAN_INDIC_S    128
-/* Contains a flow indicator */
-#define SCAN_INDIC_C    256
-/* Ends without newlines */
-#define SCAN_NONL_E     512
-/* Ends with many newlines */
-#define SCAN_MANYNL_E   1024
-/* Contains flow map indicators */
-#define SCAN_FLOWMAP    2048
-/* Contains flow seq indicators */
-#define SCAN_FLOWSEQ    4096
-/* Contains a valid doc separator */
-#define SCAN_DOCSEP     8192
-
-/*
- * Basic printable test for LATIN-1 characters.
- */
-int
-syck_scan_scalar( int req_width, char *cursor, long len )
-{
-    long i = 0, start = 0;
-    int flags = SCAN_NONE;
-
-    if ( len < 1 )  return flags;
-
-    /* c-indicators from the spec */
-    if ( cursor[0] == '[' || cursor[0] == ']' ||
-         cursor[0] == '{' || cursor[0] == '}' ||
-         cursor[0] == '!' || cursor[0] == '*' ||
-         cursor[0] == '&' || cursor[0] == '|' ||
-         cursor[0] == '>' || cursor[0] == '\'' ||
-         cursor[0] == '"' || cursor[0] == '#' ||
-         cursor[0] == '%' || cursor[0] == '@' ||
-         cursor[0] == '&' ) {
-            flags |= SCAN_INDIC_S;
-    }
-    if ( ( cursor[0] == '-' || cursor[0] == ':' ||
-           cursor[0] == '?' || cursor[0] == ',' ) &&
-           ( len == 1 || cursor[1] == ' ' || cursor[1] == '\n' ) )
-    {
-            flags |= SCAN_INDIC_S;
-    }
-
-    /* whitespace edges */
-    if ( cursor[len-1] != '\n' ) {
-        flags |= SCAN_NONL_E;
-    } else if ( len > 1 && cursor[len-2] == '\n' ) {
-        flags |= SCAN_MANYNL_E;
-    }
-    if ( 
-        ( len > 0 && ( cursor[0] == ' ' || cursor[0] == '\t' ) ) ||
-        ( len > 1 && ( cursor[len-1] == ' ' || cursor[len-1] == '\t' ) )
-    ) {
-        flags |= SCAN_WHITEEDGE;
-    }
-
-    /* opening doc sep */
-    if ( len >= 3 && strncmp( cursor, "---", 3 ) == 0 )
-        flags |= SCAN_DOCSEP;
-
-    /* scan string */
-    for ( i = 0; i < len; i++ ) {
-
-        if ( ! ( cursor[i] == 0x9 ||
-                 cursor[i] == 0xA ||
-                 cursor[i] == 0xD ||
-               ( cursor[i] >= 0x20 && cursor[i] <= 0x7E ) )
-        ) {
-            flags |= SCAN_NONPRINT;
-        }
-        else if ( cursor[i] == '\n' ) {
-            flags |= SCAN_NEWLINE;
-            if ( len - i >= 3 && strncmp( &cursor[i+1], "---", 3 ) == 0 )
-                flags |= SCAN_DOCSEP;
-            if ( cursor[i+1] == ' ' || cursor[i+1] == '\t' ) 
-                flags |= SCAN_INDENTED;
-            if ( req_width > 0 && i - start > req_width )
-                flags |= SCAN_WIDE;
-            start = i;
-        }
-        else if ( cursor[i] == '\'' )
-        {
-            flags |= SCAN_SINGLEQ;
-        }
-        else if ( cursor[i] == '"' )
-        {
-            flags |= SCAN_DOUBLEQ;
-        }
-        else if ( cursor[i] == ']' )
-        {
-            flags |= SCAN_FLOWSEQ;
-        }
-        else if ( cursor[i] == '}' )
-        {
-            flags |= SCAN_FLOWMAP;
-        }
-        /* remember, if plain collections get implemented, to add nb-plain-flow-char */
-        else if ( ( cursor[i] == ' ' && cursor[i+1] == '#' ) ||
-                  ( cursor[i] == ':' && 
-                    ( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) ) )
-        {
-            flags |= SCAN_INDIC_C;
-        }
-        else if ( cursor[i] == ',' && 
-                  ( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) )
-        {
-            flags |= SCAN_FLOWMAP;
-            flags |= SCAN_FLOWSEQ;
-        }
-    }
-
-    /* printf( "---STR---\n%s\nFLAGS: %d\n", cursor, flags ); */
-    return flags;
-}
-/*
- * All scalars should be emitted through this function, which determines an appropriate style,
- * tag and indent.
- */
-void syck_emit_scalar( SyckEmitter *e, char *tag, enum scalar_style force_style, int force_indent, int force_width,
-                       char keep_nl, char *str, long len )
-{
-    enum scalar_style favor_style = scalar_literal;
-    SyckLevel *parent = syck_emitter_parent_level( e );
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    int scan = 0;
-    char *implicit;
-    
-    if ( str == NULL ) str = "";
-
-    /* No empty nulls as map keys */
-    if ( len == 0 && ( parent->status == syck_lvl_map || parent->status == syck_lvl_imap ) && 
-         parent->ncount % 2 == 1 && syck_tagcmp( tag, "tag:yaml.org,2002:null" ) == 0 ) 
-    {
-        str = "~";
-        len = 1;
-    }
-
-    scan = syck_scan_scalar( force_width, str, len );
-    implicit = syck_match_implicit( str, len );
-
-    /* quote strings which default to implicits */
-    implicit = syck_taguri( YAML_DOMAIN, implicit, strlen( implicit ) );
-    if ( syck_tagcmp( tag, implicit ) != 0 && syck_tagcmp( tag, "tag:yaml.org,2002:str" ) == 0 ) {
-        force_style = scalar_2quote;
-    } else {
-        /* complex key */
-        if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 &&
-             ( !( tag == NULL || 
-             ( implicit != NULL && syck_tagcmp( tag, implicit ) == 0 && e->explicit_typing == 0 ) ) ) ) 
-        {
-            syck_emitter_write( e, "? ", 2 );
-            parent->status = syck_lvl_mapx;
-        }
-        syck_emit_tag( e, tag, implicit );
-    }
-    S_FREE( implicit );
-
-    /* if still arbitrary, sniff a good block style. */
-    if ( force_style == scalar_none ) {
-        if ( scan & SCAN_NEWLINE ) {
-            force_style = scalar_literal;
-        } else {
-            force_style = scalar_plain;
-        }
-    }
-
-    if ( e->style == scalar_fold ) {
-        favor_style = scalar_fold;
-    }
-
-    /* Determine block style */
-    if ( scan & SCAN_NONPRINT ) {
-        force_style = scalar_2quote;
-    } else if ( scan & SCAN_WHITEEDGE ) {
-        force_style = scalar_2quote;
-    } else if ( force_style != scalar_fold && ( scan & SCAN_INDENTED ) ) {
-        force_style = scalar_literal;
-    } else if ( force_style == scalar_plain && ( scan & SCAN_NEWLINE ) ) {
-        force_style = favor_style;
-    } else if ( force_style == scalar_plain && parent->status == syck_lvl_iseq && ( scan & SCAN_FLOWSEQ ) ) {
-        force_style = scalar_2quote;
-    } else if ( force_style == scalar_plain && parent->status == syck_lvl_imap && ( scan & SCAN_FLOWMAP ) ) {
-        force_style = scalar_2quote;
-    /* } else if ( force_style == scalar_fold && ( ! ( scan & SCAN_WIDE ) ) ) {
-        force_style = scalar_literal; */
-    } else if ( force_style == scalar_plain && ( scan & SCAN_INDIC_S || scan & SCAN_INDIC_C ) ) {
-        if ( scan & SCAN_NEWLINE ) {
-            force_style = favor_style;
-        } else {
-            force_style = scalar_2quote;
-        }
-    }
-
-    if ( force_indent > 0 ) {
-        lvl->spaces = parent->spaces + force_indent;
-    } else if ( scan & SCAN_DOCSEP ) {
-        lvl->spaces = parent->spaces + e->indent;
-    }
-
-    /* For now, all ambiguous keys are going to be double-quoted */
-    if ( ( parent->status == syck_lvl_map || parent->status == syck_lvl_mapx ) && parent->ncount % 2 == 1 ) {
-        if ( force_style != scalar_plain ) {
-            force_style = scalar_2quote;
-        }
-    }
-
-    /* If the parent is an inline, double quote anything complex */
-    if ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) {
-        if ( force_style != scalar_plain && force_style != scalar_1quote ) {
-            force_style = scalar_2quote;
-        }
-    }
-
-    /* Fix the ending newlines */
-    if ( scan & SCAN_NONL_E ) {
-        keep_nl = NL_CHOMP;
-    } else if ( scan & SCAN_MANYNL_E ) {
-        keep_nl = NL_KEEP;
-    }
-
-    /* Write the text node */
-    switch ( force_style )
-    {
-        case scalar_1quote:
-            syck_emit_1quoted( e, force_width, str, len );
-        break;
-
-        case scalar_none:
-        case scalar_2quote:
-            syck_emit_2quoted( e, force_width, str, len );
-        break;
-
-        case scalar_fold:
-            syck_emit_folded( e, force_width, keep_nl, str, len );
-        break;
-
-        case scalar_literal:
-            syck_emit_literal( e, keep_nl, str, len );
-        break;
-
-        case scalar_plain:
-            syck_emitter_write( e, str, len );
-        break;
-    }
-
-    if ( parent->status == syck_lvl_mapx )
-    {
-        syck_emitter_write( e, "\n", 1 );
-    }
-}
-
-void
-syck_emitter_escape( SyckEmitter *e, char *src, long len )
-{
-    int i;
-    for( i = 0; i < len; i++ )
-    {
-        if( (src[i] < 0x20) || (0x7E < src[i]) )
-        {
-            syck_emitter_write( e, "\\", 1 );
-            if( '\0' == src[i] )
-                syck_emitter_write( e, "0", 1 );
-            else
-            {
-                syck_emitter_write( e, "x", 1 );
-                syck_emitter_write( e, (char *)hex_table + ((src[i] & 0xF0) >> 4), 1 );
-                syck_emitter_write( e, (char *)hex_table + (src[i] & 0x0F), 1 );
-            }
-        }
-        else
-        {
-            syck_emitter_write( e, src + i, 1 );
-            if( '\\' == src[i] )
-                syck_emitter_write( e, "\\", 1 );
-        }
-    }
-}
-
-/*
- * Outputs a single-quoted block.
- */
-void syck_emit_1quoted( SyckEmitter *e, int width, char *str, long len )
-{
-    char do_indent = 0;
-    char *mark = str;
-    char *start = str;
-    char *end = str;
-    syck_emitter_write( e, "'", 1 );
-    while ( mark < str + len ) {
-        if ( do_indent ) {
-            syck_emit_indent( e );
-            do_indent = 0;
-        }
-        switch ( *mark ) {
-            case '\'':  syck_emitter_write( e, "'", 1 ); break;
-
-            case '\n':
-                end = mark + 1;
-                if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) {
-                    syck_emitter_write( e, "\n\n", 2 );
-                } else {
-                    syck_emitter_write( e, "\n", 1 );
-                }
-                do_indent = 1;
-                start = mark + 1;
-            break;
-
-            case ' ':
-                if ( width > 0 && *start != ' ' && mark - end > width ) {
-                    do_indent = 1;
-                    end = mark + 1;
-                } else {
-                    syck_emitter_write( e, " ", 1 );
-                }
-            break;
-
-            default:
-                syck_emitter_write( e, mark, 1 );
-            break;
-        }
-        mark++;
-    }
-    syck_emitter_write( e, "'", 1 );
-}
-
-/*
- * Outputs a double-quoted block.
- */
-void syck_emit_2quoted( SyckEmitter *e, int width, char *str, long len )
-{
-    char do_indent = 0;
-    char *mark = str;
-    char *start = str;
-    char *end = str;
-    syck_emitter_write( e, "\"", 1 );
-    while ( mark < str + len ) {
-        if ( do_indent > 0 ) {
-            if ( do_indent == 2 ) {
-                syck_emitter_write( e, "\\", 1 );
-            }
-            syck_emit_indent( e );
-            do_indent = 0;
-        }
-        switch ( *mark ) {
-
-            /* Escape sequences allowed within double quotes. */
-            case '"':  syck_emitter_write( e, "\\\"", 2 ); break;
-            case '\\': syck_emitter_write( e, "\\\\", 2 ); break;
-            case '\0': syck_emitter_write( e, "\\0",  2 ); break;
-            case '\a': syck_emitter_write( e, "\\a",  2 ); break;
-            case '\b': syck_emitter_write( e, "\\b",  2 ); break;
-            case '\f': syck_emitter_write( e, "\\f",  2 ); break;
-            case '\r': syck_emitter_write( e, "\\r",  2 ); break;
-            case '\t': syck_emitter_write( e, "\\t",  2 ); break;
-            case '\v': syck_emitter_write( e, "\\v",  2 ); break;
-            case 0x1b: syck_emitter_write( e, "\\e",  2 ); break;
-
-            case '\n':
-                end = mark + 1;
-                syck_emitter_write( e, "\\n", 2 );
-                do_indent = 2;
-                start = mark + 1;
-                if ( start < str + len && ( *start == ' ' || *start == '\n' ) ) {
-                    do_indent = 0;
-                }
-            break;
-
-            case ' ':
-                if ( width > 0 && *start != ' ' && mark - end > width ) {
-                    do_indent = 1;
-                    end = mark + 1;
-                } else {
-                    syck_emitter_write( e, " ", 1 );
-                }
-            break;
-
-            default:
-                syck_emitter_escape( e, mark, 1 );
-            break;
-        }
-        mark++;
-    }
-    syck_emitter_write( e, "\"", 1 );
-}
-
-/*
- * Outputs a literal block.
- */
-void syck_emit_literal( SyckEmitter *e, char keep_nl, char *str, long len )
-{
-    char *mark = str;
-    char *start = str;
-    char *end = str;
-    syck_emitter_write( e, "|", 1 );
-    if ( keep_nl == NL_CHOMP ) {
-        syck_emitter_write( e, "-", 1 );
-    } else if ( keep_nl == NL_KEEP ) {
-        syck_emitter_write( e, "+", 1 );
-    }
-    syck_emit_indent( e );
-    while ( mark < str + len ) {
-        if ( *mark == '\n' ) {
-            end = mark;
-            if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) end += 1;
-            syck_emitter_write( e, start, end - start );
-            if ( mark + 1 == str + len ) {
-                if ( keep_nl != NL_KEEP ) syck_emitter_write( e, "\n", 1 );
-            } else {
-                syck_emit_indent( e );
-            }
-            start = mark + 1;
-        }
-        mark++;
-    }
-    end = str + len;
-    if ( start < end ) {
-        syck_emitter_write( e, start, end - start );
-    }
-}
-
-/*
- * Outputs a folded block.
- */
-void syck_emit_folded( SyckEmitter *e, int width, char keep_nl, char *str, long len )
-{
-    char *mark = str;
-    char *start = str;
-    char *end = str;
-    syck_emitter_write( e, ">", 1 );
-    if ( keep_nl == NL_CHOMP ) {
-        syck_emitter_write( e, "-", 1 );
-    } else if ( keep_nl == NL_KEEP ) {
-        syck_emitter_write( e, "+", 1 );
-    }
-    syck_emit_indent( e );
-    if ( width <= 0 ) width = e->best_width;
-    while ( mark < str + len ) {
-        switch ( *mark ) {
-            case '\n':
-                syck_emitter_write( e, end, mark - end );
-                end = mark + 1;
-                if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) {
-                    syck_emitter_write( e, "\n", 1 );
-                }
-                if ( mark + 1 == str + len ) {
-                    if ( keep_nl != NL_KEEP ) syck_emitter_write( e, "\n", 1 );
-                } else {
-                    syck_emit_indent( e );
-                }
-                start = mark + 1;
-            break;
-
-            case ' ':
-                if ( *start != ' ' ) {
-                    if ( mark - end > width ) {
-                        syck_emitter_write( e, end, mark - end );
-                        syck_emit_indent( e );
-                        end = mark + 1;
-                    }
-                }
-            break;
-        }
-        mark++;
-    }
-    if ( end < mark ) {
-        syck_emitter_write( e, end, mark - end );
-    }
-}
-
-/*
- * Begins emission of a sequence.
- */
-void syck_emit_seq( SyckEmitter *e, char *tag, enum seq_style style )
-{
-    SyckLevel *parent = syck_emitter_parent_level( e );
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    syck_emit_tag( e, tag, "tag:yaml.org,2002:seq" );
-    if ( style == seq_inline || ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) ) {
-        syck_emitter_write( e, "[", 1 );
-        lvl->status = syck_lvl_iseq;
-    } else {
-        /* complex key */
-        if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 ) {
-            syck_emitter_write( e, "? ", 2 );
-            parent->status = syck_lvl_mapx;
-        }
-        lvl->status = syck_lvl_seq;
-    }
-}
-
-/*
- * Begins emission of a mapping.
- */
-void syck_emit_map( SyckEmitter *e, char *tag, enum map_style style )
-{
-    SyckLevel *parent = syck_emitter_parent_level( e );
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    syck_emit_tag( e, tag, "tag:yaml.org,2002:map" );
-    if ( style == map_inline || ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) ) {
-        syck_emitter_write( e, "{", 1 );
-        lvl->status = syck_lvl_imap;
-    } else {
-        /* complex key */
-        if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 ) {
-            syck_emitter_write( e, "? ", 2 );
-            parent->status = syck_lvl_mapx;
-        }
-        lvl->status = syck_lvl_map;
-    }
-}
-
-/*
- * Handles emitting of a collection item (for both
- * sequences and maps)
- */
-void syck_emit_item( SyckEmitter *e, st_data_t n )
-{
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    switch ( lvl->status )
-    {
-        case syck_lvl_seq:
-        {
-            SyckLevel *parent = syck_emitter_parent_level( e );
-
-            /* seq-in-map shortcut -- the lvl->anctag check should be unneccesary but
-             * there is a nasty shift/reduce in the parser on this point and
-             * i'm not ready to tickle it. */
-            if ( lvl->anctag == 0 && parent->status == syck_lvl_map && lvl->ncount == 0 ) {
-                lvl->spaces = parent->spaces;
-            }
-
-            /* seq-in-seq shortcut */
-            else if ( lvl->anctag == 0 && parent->status == syck_lvl_seq && lvl->ncount == 0 ) {
-                int spcs = ( lvl->spaces - parent->spaces ) - 2;
-                if ( spcs >= 0 ) {
-                    int i = 0;
-                    for ( i = 0; i < spcs; i++ ) {
-                        syck_emitter_write( e, " ", 1 );
-                    }
-                    syck_emitter_write( e, "- ", 2 );
-                    break;
-                }
-            }
-
-            syck_emit_indent( e );
-            syck_emitter_write( e, "- ", 2 );
-        }
-        break;
-
-        case syck_lvl_iseq:
-        {
-            if ( lvl->ncount > 0 ) {
-                syck_emitter_write( e, ", ", 2 );
-            }
-        }
-        break;
-
-        case syck_lvl_map:
-        {
-            SyckLevel *parent = syck_emitter_parent_level( e );
-
-            /* map-in-seq shortcut */
-            if ( lvl->anctag == 0 && parent->status == syck_lvl_seq && lvl->ncount == 0 ) {
-                int spcs = ( lvl->spaces - parent->spaces ) - 2;
-                if ( spcs >= 0 ) {
-                    int i = 0;
-                    for ( i = 0; i < spcs; i++ ) {
-                        syck_emitter_write( e, " ", 1 );
-                    }
-                    break;
-                }
-            }
-
-            if ( lvl->ncount % 2 == 0 ) {
-                syck_emit_indent( e );
-            } else {
-                syck_emitter_write( e, ": ", 2 );
-            }
-        }
-        break;
-
-        case syck_lvl_mapx:
-        {
-            if ( lvl->ncount % 2 == 0 ) {
-                syck_emit_indent( e );
-                lvl->status = syck_lvl_map;
-            } else {
-                int i;
-                if ( lvl->spaces > 0 ) {
-                    char *spcs = S_ALLOC_N( char, lvl->spaces + 1 );
-
-                    spcs[lvl->spaces] = '\0';
-                    for ( i = 0; i < lvl->spaces; i++ ) spcs[i] = ' ';
-                    syck_emitter_write( e, spcs, lvl->spaces );
-                    S_FREE( spcs );
-                }
-                syck_emitter_write( e, ": ", 2 );
-            }
-        }
-        break;
-
-        case syck_lvl_imap:
-        {
-            if ( lvl->ncount > 0 ) {
-                if ( lvl->ncount % 2 == 0 ) {
-                    syck_emitter_write( e, ", ", 2 );
-                } else {
-                    syck_emitter_write( e, ": ", 2 );
-                }
-            }
-        }
-        break;
-
-        default: break;
-    }
-    lvl->ncount++;
-
-    syck_emit( e, n );
-}
-
-/*
- * Closes emission of a collection.
- */
-void syck_emit_end( SyckEmitter *e )
-{
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    SyckLevel *parent = syck_emitter_parent_level( e );
-    switch ( lvl->status )
-    {
-        case syck_lvl_seq:
-            if ( lvl->ncount == 0 ) {
-                syck_emitter_write( e, "[]\n", 3 );
-            } else if ( parent->status == syck_lvl_mapx ) {
-                syck_emitter_write( e, "\n", 1 );
-            }
-        break;
-
-        case syck_lvl_iseq:
-            syck_emitter_write( e, "]\n", 1 );
-        break;
-
-        case syck_lvl_map:
-            if ( lvl->ncount == 0 ) {
-                syck_emitter_write( e, "{}\n", 3 );
-            } else if ( lvl->ncount % 2 == 1 ) {
-                syck_emitter_write( e, ":\n", 1 );
-            } else if ( parent->status == syck_lvl_mapx ) {
-                syck_emitter_write( e, "\n", 1 );
-            }
-        break;
-
-        case syck_lvl_imap:
-            syck_emitter_write( e, "}\n", 1 );
-        break;
-
-        default: break;
-    }
-}
-
-/*
- * Fill markers table with emitter nodes in the
- * soon-to-be-emitted tree.
- */
-SYMID
-syck_emitter_mark_node( SyckEmitter *e, st_data_t n )
-{
-    SYMID oid = 0;
-    char *anchor_name = NULL;
-
-    /*
-     * Ensure markers table is initialized.
-     */
-    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, n, (st_data_t *)&oid ) )
-    {
-        /*
-         * Store all markers
-         */
-        oid = e->markers->num_entries + 1;
-        st_insert( e->markers, n, (st_data_t)oid );
-    }
-    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;
-            char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
-
-            /*
-             * Second time hitting this object, let's give it an anchor
-             */
-            idx = e->anchors->num_entries + 1;
-            anchor_name = S_ALLOC_N( char, strlen( anc ) + 10 );
-            S_MEMZERO( anchor_name, char, strlen( anc ) + 10 );
-            sprintf( anchor_name, anc, idx );
-
-            /*
-             * Insert into anchors table
-             */
-            st_insert( e->anchors, (st_data_t)oid, (st_data_t)anchor_name );
-        }
-    }
-    return oid;
-}
-
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 615a594f61..0000000000
--- a/ext/syck/gram.c
+++ /dev/null
@@ -1,1894 +0,0 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 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
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* 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"
-
-void apply_seq_in_map( SyckParser *parser, SyckNode *n );
-
-#define YYPARSE_PARAM   parser
-#define YYLEX_PARAM     parser
-
-#define NULL_NODE(parser, node) \
-        SyckNode *node = syck_new_str( "", scalar_plain ); \
-        if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
-        { \
-            node->type_id = syck_taguri( YAML_DOMAIN, "null", 4 ); \
-        } \
-        else \
-        { \
-            node->type_id = syck_strndup( "null", 4 ); \
-        }
-
-
-/* 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
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 35 "gram.y"
-typedef union YYSTYPE {
-    SYMID nodeId;
-    SyckNode *nodeData;
-    char *name;
-} YYSTYPE;
-/* Line 191 of yacc.c.  */
-#line 140 "gram.c"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-/* Copy the second part of user declarations.  */
-
-
-/* Line 214 of yacc.c.  */
-#line 152 "gram.c"
-
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
-
-# ifndef YYFREE
-#  define YYFREE free
-# endif
-# ifndef YYMALLOC
-#  define YYMALLOC malloc
-# endif
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   define YYSTACK_ALLOC alloca
-#  endif
-# else
-#  if defined (alloca) || defined (_ALLOCA_H)
-#   define YYSTACK_ALLOC alloca
-#  else
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   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 YYMALLOC
-#  define YYSTACK_FREE YYFREE
-# endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
-
-
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short int yyss;
-  YYSTYPE yyvs;
-  };
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (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 int) + sizeof (YYSTYPE))			\
-      + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined (__GNUC__) && 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_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (0)
-
-#endif
-
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short int yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL  52
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   396
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  23
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  29
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  79
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  128
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   269
-
-#define YYTRANSLATE(YYX) 						\
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : 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,
-      21,    24,    28,    30,    32,    36,    37,    40,    43,    46,
-      49,    51,    54,    56,    58,    60,    63,    66,    69,    72,
-      75,    77,    79,    81,    85,    87,    89,    91,    93,    95,
-      99,   103,   106,   110,   113,   117,   120,   124,   127,   129,
-     133,   136,   140,   143,   145,   149,   151,   153,   157,   161,
-     165,   168,   172,   175,   179,   182,   184,   188,   190,   194,
-     196,   200,   204,   207,   211,   215,   218,   220,   224,   226
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yysigned_char yyrhs[] =
-{
-      24,     0,    -1,    25,    -1,    11,    27,    -1,    -1,    33,
-      -1,    26,    -1,    34,    -1,     5,    26,    -1,     6,    26,
-      -1,     3,    26,    -1,    29,    26,    32,    -1,    25,    -1,
-      28,    -1,    29,    28,    30,    -1,    -1,     7,    28,    -1,
-       5,    28,    -1,     6,    28,    -1,     3,    28,    -1,    12,
-      -1,    29,    13,    -1,    14,    -1,    13,    -1,    14,    -1,
-      31,    32,    -1,     5,    33,    -1,     6,    33,    -1,     7,
-      33,    -1,     3,    33,    -1,     4,    -1,     8,    -1,     9,
-      -1,    29,    33,    32,    -1,    10,    -1,    35,    -1,    39,
-      -1,    42,    -1,    49,    -1,    29,    37,    30,    -1,    29,
-      38,    30,    -1,    15,    27,    -1,     5,    31,    38,    -1,
-       5,    37,    -1,     6,    31,    38,    -1,     6,    37,    -1,
-       3,    31,    38,    -1,     3,    37,    -1,    36,    -1,    38,
-      31,    36,    -1,    38,    31,    -1,    17,    40,    18,    -1,
-      17,    18,    -1,    41,    -1,    40,    21,    41,    -1,    25,
-      -1,    48,    -1,    29,    43,    30,    -1,    29,    47,    30,
-      -1,     5,    31,    47,    -1,     5,    43,    -1,     6,    31,
-      47,    -1,     6,    43,    -1,     3,    31,    47,    -1,     3,
-      43,    -1,    33,    -1,    22,    25,    31,    -1,    27,    -1,
-      44,    16,    45,    -1,    46,    -1,    47,    31,    36,    -1,
-      47,    31,    46,    -1,    47,    31,    -1,    25,    16,    27,
-      -1,    19,    50,    20,    -1,    19,    20,    -1,    51,    -1,
-      50,    21,    51,    -1,    25,    -1,    48,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
-{
-       0,    56,    56,    60,    65,    70,    71,    74,    75,    80,
-      85,    94,   100,   101,   104,   109,   113,   121,   126,   131,
-     145,   146,   149,   152,   155,   156,   164,   169,   174,   182,
-     186,   194,   207,   208,   218,   219,   220,   221,   222,   228,
-     232,   238,   244,   249,   254,   259,   264,   268,   274,   278,
-     283,   292,   296,   302,   306,   313,   314,   320,   325,   332,
-     337,   342,   347,   352,   356,   362,   363,   369,   379,   396,
-     397,   409,   417,   426,   434,   438,   444,   445,   454,   461
-};
-#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", "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", "inline_seq_atom",
-  "implicit_map", "top_imp_map", "complex_key", "complex_value",
-  "complex_mapping", "in_implicit_map", "basic_mapping", "inline_map",
-  "in_inline_map", "inline_map_atom", 0
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const unsigned short int 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,    26,    27,    27,    28,    28,    28,    28,    28,    28,
-      29,    29,    30,    31,    32,    32,    33,    33,    33,    33,
-      33,    33,    33,    33,    34,    34,    34,    34,    34,    35,
-      35,    36,    37,    37,    37,    37,    37,    37,    38,    38,
-      38,    39,    39,    40,    40,    41,    41,    42,    42,    43,
-      43,    43,    43,    43,    43,    44,    44,    45,    46,    47,
-      47,    47,    47,    48,    49,    49,    50,    50,    51,    51
-};
-
-/* 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,     2,
-       2,     3,     1,     1,     3,     0,     2,     2,     2,     2,
-       1,     2,     1,     1,     1,     2,     2,     2,     2,     2,
-       1,     1,     1,     3,     1,     1,     1,     1,     1,     3,
-       3,     2,     3,     2,     3,     2,     3,     2,     1,     3,
-       2,     3,     2,     1,     3,     1,     1,     3,     3,     3,
-       2,     3,     2,     3,     2,     1,     3,     1,     3,     1,
-       3,     3,     2,     3,     3,     2,     1,     3,     1,     1
-};
-
-/* 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,    30,     0,     0,     0,    31,    32,    34,    15,
-      20,     0,     0,     0,     2,     6,     0,     5,     7,    35,
-      36,    37,    38,    10,    29,     8,    26,     9,    27,     0,
-       0,     0,     0,    28,    15,    15,    15,    15,    12,     3,
-      13,    15,    52,    55,     0,    53,    56,    75,    78,    79,
-       0,    76,     1,     0,     0,     0,    21,    15,     0,     0,
-      65,    48,     0,     0,     0,     0,    69,     0,     0,    19,
-      17,    18,    15,    15,    15,    16,    15,    15,    15,    15,
-       0,    15,    51,     0,    74,     0,    23,     0,    47,    64,
-       0,    43,    60,     0,    45,    62,    41,     0,    24,     0,
-      11,    33,    22,    39,    40,    50,    57,    15,    58,    72,
-      14,    73,    54,    77,    65,    46,    63,    42,    59,    44,
-      61,    66,    25,    49,    67,    68,    70,    71
-};
-
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yysigned_char yydefgoto[] =
-{
-      -1,    13,    38,    15,    39,    40,    16,   103,    99,   101,
-      17,    18,    19,    61,    62,    63,    20,    44,    45,    21,
-      64,    65,   125,    66,    67,    46,    22,    50,    51
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -97
-static const short int yypact[] =
-{
-     250,   318,   -97,   318,   318,   374,   -97,   -97,   -97,   335,
-     -97,   267,   232,     7,   -97,   -97,   192,   -97,   -97,   -97,
-     -97,   -97,   -97,   -97,   -97,   -97,   -97,   -97,   -97,   374,
-     374,   374,   352,   -97,   335,   335,   335,   384,   -97,   -97,
-     -97,   212,   -97,    10,     0,   -97,   -97,   -97,    10,   -97,
-      -4,   -97,   -97,   284,   284,   284,   -97,   335,   318,    30,
-      30,   -97,    -2,    36,    -2,    16,   -97,    36,    30,   -97,
-     -97,   -97,   384,   384,   384,   -97,   363,   301,   301,   301,
-      -2,   335,   -97,   318,   -97,   318,   -97,   158,   -97,   -97,
-     158,   -97,   -97,   158,   -97,   -97,   -97,    24,   -97,    30,
-     -97,   -97,   -97,   -97,   -97,    26,   -97,   335,   -97,   158,
-     -97,   -97,   -97,   -97,   -97,    24,    24,    24,    24,    24,
-      24,   -97,   -97,   -97,   -97,   -97,   -97,   -97
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const yysigned_char yypgoto[] =
-{
-     -97,   -97,     8,    81,   -56,   109,    33,   -53,    74,   -54,
-      -1,   -97,   -97,   -96,   -31,   -32,   -97,   -97,   -44,   -97,
-      77,   -97,   -97,   -52,     9,    -6,   -97,   -97,   -29
-};
-
-/* 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, syntax error.  */
-#define YYTABLE_NINF -1
-static const unsigned char yytable[] =
-{
-      24,    96,    26,    28,    33,   100,    49,    52,    14,   123,
-     104,   106,   102,   126,   108,    60,    84,    85,    82,    43,
-      48,    83,    88,    91,    94,   111,    81,   110,    24,    26,
-      28,    68,   107,    24,    26,    28,    33,    86,    32,   112,
-      60,    57,    41,    86,    98,   122,    88,    91,    94,    86,
-     102,   124,    24,    26,    28,   115,   113,   127,   117,     0,
-       0,   119,    32,    32,    32,    32,    97,    41,    41,    41,
-      76,    24,    26,    28,    41,    68,    24,    26,    28,    49,
-       0,     0,    23,     0,    25,    27,   114,     0,     0,   114,
-      41,    43,   114,    48,     0,     0,   116,    59,     0,   118,
-       0,     0,   120,     0,     0,    76,    76,    76,   114,    76,
-      41,    41,    41,     0,    41,    23,    25,    27,     0,     0,
-      32,     0,    59,    32,     0,     0,    32,    87,    90,    93,
-      89,    92,    95,     0,    23,    25,    27,   105,     0,     0,
-      41,   109,    32,    69,    70,    71,    75,     0,     0,     0,
-      80,    87,    90,    93,    89,    92,    95,     0,    23,    25,
-      27,    29,     2,    30,    31,     5,     6,     7,     0,     0,
-      10,   121,     0,    57,     0,     0,     0,     0,     0,     0,
-      58,    69,    70,    71,     0,    80,    69,    70,    71,   105,
-     109,   105,   109,   105,   109,    53,     2,    54,    55,     5,
-       6,     7,     8,     0,    10,    56,     0,    57,     0,    11,
-       0,    12,     0,     0,    58,    77,     2,    78,    79,    37,
-       6,     7,     8,     0,    10,    56,     0,    57,     0,    11,
-       0,    12,     0,     0,    58,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,    10,     0,     0,     0,     0,    11,
-       0,    12,    47,     1,     2,     3,     4,     5,     6,     7,
-       8,     9,    10,     0,     0,     0,     0,    11,     0,    12,
-       1,     2,     3,     4,     5,     6,     7,     8,     0,    10,
-       0,     0,     0,     0,    11,    42,    12,    53,     2,    54,
-      55,     5,     6,     7,     8,     0,    10,    86,     0,     0,
-       0,    11,     0,    12,    77,     2,    78,    79,    37,     6,
-       7,     8,     0,    10,    86,     0,     0,     0,    11,     0,
-      12,     1,     2,     3,     4,     5,     6,     7,     8,     0,
-      10,     0,     0,     0,     0,    11,     0,    12,    34,     2,
-      35,    36,    37,     6,     7,     8,     0,    10,     0,     0,
-       0,     0,    11,     0,    12,    29,     2,    30,    31,     5,
-       6,     7,     0,     0,    10,    56,    72,     2,    73,    74,
-      37,     6,     7,     0,     0,    10,    56,    29,     2,    30,
-      31,     5,     6,     7,     0,     0,    10,    72,     2,    73,
-      74,    37,     6,     7,     0,     0,    10
-};
-
-static const yysigned_char yycheck[] =
-{
-       1,    57,     3,     4,     5,    59,    12,     0,     0,   105,
-      63,    64,    14,   109,    67,    16,    20,    21,    18,    11,
-      12,    21,    53,    54,    55,    81,    16,    80,    29,    30,
-      31,    32,    16,    34,    35,    36,    37,    13,     5,    83,
-      41,    15,     9,    13,    14,    99,    77,    78,    79,    13,
-      14,   107,    53,    54,    55,    87,    85,   109,    90,    -1,
-      -1,    93,    29,    30,    31,    32,    58,    34,    35,    36,
-      37,    72,    73,    74,    41,    76,    77,    78,    79,    85,
-      -1,    -1,     1,    -1,     3,     4,    87,    -1,    -1,    90,
-      57,    83,    93,    85,    -1,    -1,    87,    16,    -1,    90,
-      -1,    -1,    93,    -1,    -1,    72,    73,    74,   109,    76,
-      77,    78,    79,    -1,    81,    34,    35,    36,    -1,    -1,
-      87,    -1,    41,    90,    -1,    -1,    93,    53,    54,    55,
-      53,    54,    55,    -1,    53,    54,    55,    63,    -1,    -1,
-     107,    67,   109,    34,    35,    36,    37,    -1,    -1,    -1,
-      41,    77,    78,    79,    77,    78,    79,    -1,    77,    78,
-      79,     3,     4,     5,     6,     7,     8,     9,    -1,    -1,
-      12,    97,    -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,
-      22,    72,    73,    74,    -1,    76,    77,    78,    79,   115,
-     116,   117,   118,   119,   120,     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,    10,    -1,    12,    13,    -1,    15,    -1,    17,
-      -1,    19,    -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,    11,    12,    -1,    -1,    -1,    -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,    13,    -1,    -1,
-      -1,    17,    -1,    19,     3,     4,     5,     6,     7,     8,
-       9,    10,    -1,    12,    13,    -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,    10,    -1,    12,    -1,    -1,
-      -1,    -1,    17,    -1,    19,     3,     4,     5,     6,     7,
-       8,     9,    -1,    -1,    12,    13,     3,     4,     5,     6,
-       7,     8,     9,    -1,    -1,    12,    13,     3,     4,     5,
-       6,     7,     8,     9,    -1,    -1,    12,     3,     4,     5,
-       6,     7,     8,     9,    -1,    -1,    12
-};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
-{
-       0,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    17,    19,    24,    25,    26,    29,    33,    34,    35,
-      39,    42,    49,    26,    33,    26,    33,    26,    33,     3,
-       5,     6,    29,    33,     3,     5,     6,     7,    25,    27,
-      28,    29,    18,    25,    40,    41,    48,    20,    25,    48,
-      50,    51,     0,     3,     5,     6,    13,    15,    22,    26,
-      33,    36,    37,    38,    43,    44,    46,    47,    33,    28,
-      28,    28,     3,     5,     6,    28,    29,     3,     5,     6,
-      28,    16,    18,    21,    20,    21,    13,    31,    37,    43,
-      31,    37,    43,    31,    37,    43,    27,    25,    14,    31,
-      32,    32,    14,    30,    30,    31,    30,    16,    30,    31,
-      30,    27,    41,    51,    33,    38,    47,    38,    47,    38,
-      47,    31,    32,    36,    27,    45,    36,    46
-};
-
-#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 yyerrorlab
-
-
-/* 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);						\
-      yytoken = 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)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_stack_print (short int *bottom, short int *top)
-#else
-static void
-yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
-#endif
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (0)
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_reduce_print (int yyrule)
-#else
-static void
-yy_reduce_print (yyrule)
-    int yyrule;
-#endif
-{
-  int yyi;
-  unsigned int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
-}
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} 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)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#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 defined (YYMAXDEPTH) && 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 YYOUTPUT.  |
-`--------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-  YYFPRINTF (yyoutput, ")");
-}
-
-#endif /* ! YYDEBUG */
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yytype, yyvaluep)
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
-}
-
-
-/* Prevent warnings from -Wmissing-prototypes.  */
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM);
-# else
-int yyparse ();
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-
-
-
-
-/*----------.
-| yyparse.  |
-`----------*/
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
-{
-  /* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-
-/* Number of syntax 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 yytoken = 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 int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  register short int *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 (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* 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 int *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 (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
-
-      {
-	short int *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 (yyss + yystacksize - 1 <= yyssp)
-	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 lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
-    }
-
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    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 %s, ", yytname[yytoken]));
-
-  /* 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];
-
-
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 2:
-#line 57 "gram.y"
-    {
-           ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
-        }
-    break;
-
-  case 3:
-#line 61 "gram.y"
-    {
-           ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
-        }
-    break;
-
-  case 4:
-#line 65 "gram.y"
-    {
-           ((SyckParser *)parser)->eof = 1;
-        }
-    break;
-
-  case 8:
-#line 76 "gram.y"
-    { 
-            syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-            yyval.nodeData = yyvsp[0].nodeData;
-        }
-    break;
-
-  case 9:
-#line 81 "gram.y"
-    {
-            syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-            yyval.nodeData = yyvsp[0].nodeData;
-        }
-    break;
-
-  case 10:
-#line 86 "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 11:
-#line 95 "gram.y"
-    {
-           yyval.nodeData = yyvsp[-1].nodeData;
-        }
-    break;
-
-  case 14:
-#line 105 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 15:
-#line 109 "gram.y"
-    {
-                    NULL_NODE( parser, n );
-                    yyval.nodeData = n;
-                }
-    break;
-
-  case 16:
-#line 114 "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 17:
-#line 122 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 18:
-#line 127 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 19:
-#line 132 "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 26:
-#line 165 "gram.y"
-    { 
-               syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-               yyval.nodeData = yyvsp[0].nodeData;
-            }
-    break;
-
-  case 27:
-#line 170 "gram.y"
-    { 
-               syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-               yyval.nodeData = yyvsp[0].nodeData;
-            }
-    break;
-
-  case 28:
-#line 175 "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 29:
-#line 183 "gram.y"
-    { 
-               yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-            }
-    break;
-
-  case 30:
-#line 187 "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 31:
-#line 195 "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 33:
-#line 209 "gram.y"
-    {
-               yyval.nodeData = yyvsp[-1].nodeData;
-            }
-    break;
-
-  case 39:
-#line 229 "gram.y"
-    { 
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 40:
-#line 233 "gram.y"
-    { 
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 41:
-#line 239 "gram.y"
-    { 
-                    yyval.nodeId = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 42:
-#line 245 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 43:
-#line 250 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 44:
-#line 255 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 45:
-#line 260 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 46:
-#line 265 "gram.y"
-    { 
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 47:
-#line 269 "gram.y"
-    { 
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 48:
-#line 275 "gram.y"
-    {
-                    yyval.nodeData = syck_new_seq( yyvsp[0].nodeId );
-                }
-    break;
-
-  case 49:
-#line 279 "gram.y"
-    { 
-                    syck_seq_add( yyvsp[-2].nodeData, yyvsp[0].nodeId );
-                    yyval.nodeData = yyvsp[-2].nodeData;
-				}
-    break;
-
-  case 50:
-#line 284 "gram.y"
-    { 
-                    yyval.nodeData = yyvsp[-1].nodeData;
-				}
-    break;
-
-  case 51:
-#line 293 "gram.y"
-    { 
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 52:
-#line 297 "gram.y"
-    { 
-                    yyval.nodeData = syck_alloc_seq();
-                }
-    break;
-
-  case 53:
-#line 303 "gram.y"
-    {
-                    yyval.nodeData = syck_new_seq( syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                }
-    break;
-
-  case 54:
-#line 307 "gram.y"
-    { 
-                    syck_seq_add( yyvsp[-2].nodeData, syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                    yyval.nodeData = yyvsp[-2].nodeData;
-				}
-    break;
-
-  case 57:
-#line 321 "gram.y"
-    { 
-                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 58:
-#line 326 "gram.y"
-    { 
-                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 59:
-#line 333 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 60:
-#line 338 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 61:
-#line 343 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 62:
-#line 348 "gram.y"
-    { 
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 63:
-#line 353 "gram.y"
-    { 
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 64:
-#line 357 "gram.y"
-    { 
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 66:
-#line 364 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 68:
-#line 380 "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 70:
-#line 398 "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 71:
-#line 410 "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 );
-                    yyvsp[0].nodeData = NULL;
-                    yyval.nodeData = yyvsp[-2].nodeData;
-                }
-    break;
-
-  case 72:
-#line 418 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 73:
-#line 427 "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 74:
-#line 435 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 75:
-#line 439 "gram.y"
-    {
-                    yyval.nodeData = syck_alloc_map();
-                }
-    break;
-
-  case 77:
-#line 446 "gram.y"
-    {
-                    syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
-                    syck_free_node( yyvsp[0].nodeData );
-                    yyvsp[0].nodeData = NULL;
-                    yyval.nodeData = yyvsp[-2].nodeData;
-				}
-    break;
-
-  case 78:
-#line 455 "gram.y"
-    {
-                    NULL_NODE( parser, n );
-                    yyval.nodeData = syck_new_map( 
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ), 
-                        syck_hdlr_add_node( (SyckParser *)parser, n ) );
-                }
-    break;
-
-
-    }
-
-/* Line 1010 of yacc.c.  */
-#line 1651 "gram.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
-  YY_STACK_PRINT (yyss, yyssp);
-
-  *++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);
-	  const char* yyprefix;
-	  char *yymsg;
-	  int yyx;
-
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 0;
-
-	  yyprefix = ", expecting ";
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-		yycount += 1;
-		if (yycount == 5)
-		  {
-		    yysize = 0;
-		    break;
-		  }
-	      }
-	  yysize += (sizeof ("syntax error, unexpected ")
-		     + yystrlen (yytname[yytype]));
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
-		{
-		  yyprefix = ", expecting ";
-		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			yyp = yystpcpy (yyp, yyprefix);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yyprefix = " or ";
-		      }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
-    }
-
-
-
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
-
-      if (yychar <= YYEOF)
-        {
-          /* If at end of input, pop the error token,
-	     then the rest of the stack, then return failure.  */
-	  if (yychar == YYEOF)
-	     for (;;)
-	       {
-		 YYPOPSTACK;
-		 if (yyssp == yyss)
-		   YYABORT;
-		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-		 yydestruct (yystos[*yyssp], yyvsp);
-	       }
-        }
-      else
-	{
-	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-	  yydestruct (yytoken, &yylval);
-	  yychar = YYEMPTY;
-
-	}
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-#ifdef __GNUC__
-  /* Pacify GCC when the user code never invokes YYERROR and the label
-     yyerrorlab therefore never appears in user code.  */
-  if (0)
-     goto yyerrorlab;
-#endif
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  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;
-
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      YYPOPSTACK;
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-
-  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 464 "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 547149ab4b..0000000000
--- a/ext/syck/gram.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 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.  */
-
-/* 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
-
-
-
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 35 "gram.y"
-typedef union YYSTYPE {
-    SYMID nodeId;
-    SyckNode *nodeData;
-    char *name;
-} YYSTYPE;
-/* Line 1285 of yacc.c.  */
-#line 71 "gram.h"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-
-
diff --git a/ext/syck/handler.c b/ext/syck/handler.c
deleted file mode 100644
index 26fb258318..0000000000
--- a/ext/syck/handler.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * handler.c
- *
- * $Author: why $
- * $Date: 2005/09/20 06:46:43 $
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#include "ruby.h"
-#include "syck.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 )
-{
-    SyckNode *ntmp = NULL;
-
-    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();
-    }
-    if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&ntmp ) )
-    {
-        if ( ntmp != (void *)1 )
-        {
-            syck_free_node( ntmp );
-        }
-    }
-    st_insert( p->anchors, (st_data_t)a, (st_data_t)n );
-    return n;
-}
-
-void
-syck_hdlr_remove_anchor( SyckParser *p, char *a )
-{
-    char *atmp = a;
-    SyckNode *ntmp;
-    if ( p->anchors == NULL )
-    {
-        p->anchors = st_init_strtable();
-    }
-    if ( st_delete( p->anchors, (st_data_t *)&atmp, (st_data_t *)&ntmp ) )
-    {
-        if ( ntmp != (void *)1 )
-        {
-            syck_free_node( ntmp );
-        }
-    }
-    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 0f922f4d1b..0000000000
--- a/ext/syck/implicit.c
+++ /dev/null
@@ -1,2990 +0,0 @@
-/* Generated by re2c 0.9.10 on Mon Sep 19 21:46:50 2005 */
-#line 1 "implicit.re"
-/*
- * implicit.re
- *
- * $Author: ocean $
- * $Date: 2005/10/26 00:28:39 $
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#include "ruby.h"
-#include "syck.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 ( n->type_id != NULL ) S_FREE( n->type_id );
-    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;
-
-
-#line 55 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy0;
-	++YYCURSOR;
-yy0:
-	if((YYLIMIT - YYCURSOR) < 26) YYFILL(26);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	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 yy11;
-	case 'Y':	goto yy9;
-	case 'f':	goto yy14;
-	case 'n':	goto yy4;
-	case 'o':	goto yy12;
-	case 't':	goto yy10;
-	case 'y':	goto yy8;
-	case '~':	goto yy2;
-	default:	goto yy23;
-	}
-yy2:	++YYCURSOR;
-	if((yych = *YYCURSOR) <= 0x00)	goto yy6;
-	goto yy3;
-yy3:
-#line 123 "implicit.re"
-{   return "str"; }
-#line 100 "<stdout>"
-yy4:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'o':	goto yy172;
-	case 'u':	goto yy200;
-	default:	goto yy3;
-	}
-yy5:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'O':	case 'o':	goto yy172;
-	case 'U':	goto yy195;
-	case 'u':	goto yy196;
-	default:	goto yy3;
-	}
-yy6:	++YYCURSOR;
-	goto yy7;
-yy7:
-#line 85 "implicit.re"
-{   return "null"; }
-#line 121 "<stdout>"
-yy8:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'e':	goto yy194;
-	default:	goto yy3;
-	}
-yy9:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'E':	goto yy192;
-	case 'e':	goto yy193;
-	default:	goto yy3;
-	}
-yy10:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'r':	goto yy190;
-	default:	goto yy3;
-	}
-yy11:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'R':	goto yy186;
-	case 'r':	goto yy187;
-	default:	goto yy3;
-	}
-yy12:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'f':	goto yy185;
-	case 'n':	goto yy182;
-	default:	goto yy3;
-	}
-yy13:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'F':	goto yy180;
-	case 'N':	case 'n':	goto yy182;
-	case 'f':	goto yy181;
-	default:	goto yy3;
-	}
-yy14:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'a':	goto yy177;
-	default:	goto yy3;
-	}
-yy15:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'A':	goto yy168;
-	case 'a':	goto yy169;
-	default:	goto yy3;
-	}
-yy16:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':	goto yy167;
-	case '0':	goto yy158;
-	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 yy157;
-	case '0':	goto yy158;
-	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 0x00:	goto yy52;
-	case ',':	goto yy142;
-	case '.':	goto yy50;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy140;
-	case '8':
-	case '9':	goto yy141;
-	case ':':	goto yy49;
-	case 'x':	goto yy144;
-	default:	goto yy3;
-	}
-yy19:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x00:	goto yy52;
-	case ',':	goto yy47;
-	case '.':	goto yy50;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy46;
-	case ':':	goto yy49;
-	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 <= 0x00)	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 <= 0x00)	goto yy26;
-	goto yy25;
-yy25:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy3;
-	}
-yy26:	++YYCURSOR;
-	goto yy27;
-yy27:
-#line 121 "implicit.re"
-{   return "merge"; }
-#line 279 "<stdout>"
-yy28:	++YYCURSOR;
-	goto yy29;
-yy29:
-#line 119 "implicit.re"
-{   return "default"; }
-#line 285 "<stdout>"
-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 >= 0x01)	goto yy25;
-	goto yy37;
-yy37:	++YYCURSOR;
-	goto yy38;
-yy38:
-#line 105 "implicit.re"
-{   return "float#inf"; }
-#line 326 "<stdout>"
-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 >= 0x01)	goto yy25;
-	goto yy43;
-yy43:	++YYCURSOR;
-	goto yy44;
-yy44:
-#line 109 "implicit.re"
-{   return "float#nan"; }
-#line 350 "<stdout>"
-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 yy74;
-	default:	goto yy48;
-	}
-yy47:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy48;
-yy48:	switch(yych){
-	case 0x00:	goto yy52;
-	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 yy50;
-	case ':':	goto yy49;
-	default:	goto yy25;
-	}
-yy49:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':	goto yy66;
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	default:	goto yy25;
-	}
-yy50:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	goto yy51;
-yy51:	switch(yych){
-	case 0x00:	goto yy56;
-	case ',':	goto yy54;
-	case '.':	goto yy58;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy50;
-	case 'E':	case 'e':	goto yy60;
-	default:	goto yy25;
-	}
-yy52:	++YYCURSOR;
-	goto yy53;
-yy53:
-#line 97 "implicit.re"
-{   return "int"; }
-#line 432 "<stdout>"
-yy54:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy55;
-yy55:	switch(yych){
-	case 0x00:	goto yy56;
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy54;
-	default:	goto yy25;
-	}
-yy56:	++YYCURSOR;
-	goto yy57;
-yy57:
-#line 99 "implicit.re"
-{   return "float#fix"; }
-#line 456 "<stdout>"
-yy58:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	goto yy59;
-yy59:	switch(yych){
-	case '.':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy58;
-	case 'E':	case 'e':	goto yy60;
-	default:	goto yy25;
-	}
-yy60:	yych = *++YYCURSOR;
-	switch(yych){
-	case '+':	case '-':	goto yy61;
-	default:	goto yy25;
-	}
-yy61:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy25;
-	goto yy63;
-yy62:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy63;
-yy63:	switch(yych){
-	case 0x00:	goto yy64;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy62;
-	default:	goto yy25;
-	}
-yy64:	++YYCURSOR;
-	goto yy65;
-yy65:
-#line 101 "implicit.re"
-{   return "float#exp"; }
-#line 506 "<stdout>"
-yy66:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy70;
-	case '.':	goto yy68;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	case ':':	goto yy49;
-	default:	goto yy25;
-	}
-yy67:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy70;
-	case '.':	goto yy68;
-	case ':':	goto yy49;
-	default:	goto yy25;
-	}
-yy68:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy69;
-yy69:	switch(yych){
-	case 0x00:	goto yy72;
-	case ',':	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;
-	}
-yy70:	++YYCURSOR;
-	goto yy71;
-yy71:
-#line 95 "implicit.re"
-{   return "int#base60"; }
-#line 558 "<stdout>"
-yy72:	++YYCURSOR;
-	goto yy73;
-yy73:
-#line 103 "implicit.re"
-{   return "float#base60"; }
-#line 564 "<stdout>"
-yy74:	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 yy75;
-	default:	goto yy48;
-	}
-yy75:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy76;
-	default:	goto yy48;
-	}
-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 yy77;
-	default:	goto yy25;
-	}
-yy77:	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 yy78;
-	default:	goto yy25;
-	}
-yy78:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	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 '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy81;
-	default:	goto yy25;
-	}
-yy81:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy82;
-	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 yy84;
-	case 't':	goto yy85;
-	default:	goto yy87;
-	}
-yy82:	++YYCURSOR;
-	goto yy83;
-yy83:
-#line 111 "implicit.re"
-{   return "timestamp#ymd"; }
-#line 667 "<stdout>"
-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 yy126;
-	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 yy108;
-	default:	goto yy25;
-	}
-yy86:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
-	yych = *YYCURSOR;
-	goto yy87;
-yy87:	switch(yych){
-	case 0x09:	case ' ':	goto yy86;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy88;
-	default:	goto yy25;
-	}
-yy88:	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 yy89;
-	default:	goto yy25;
-	}
-yy89:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy90;
-	default:	goto yy25;
-	}
-yy90:	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;
-	}
-yy91:	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 yy92;
-	default:	goto yy25;
-	}
-yy92:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	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 '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy95;
-	default:	goto yy25;
-	}
-yy95:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x09:	case ' ':	goto yy98;
-	case '.':	goto yy96;
-	default:	goto yy25;
-	}
-yy96:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy97;
-yy97:	switch(yych){
-	case 0x09:	case ' ':	goto yy98;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy96;
-	default:	goto yy25;
-	}
-yy98:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-	goto yy99;
-yy99:	switch(yych){
-	case 0x09:	case ' ':	goto yy98;
-	case '+':	case '-':	goto yy101;
-	case 'Z':	goto yy100;
-	default:	goto yy25;
-	}
-yy100:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy105;
-	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 0x00:	goto yy105;
-	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 yy107;
-	default:	goto yy25;
-	}
-yy105:	++YYCURSOR;
-	goto yy106;
-yy106:
-#line 115 "implicit.re"
-{   return "timestamp#spaced"; }
-#line 884 "<stdout>"
-yy107:	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;
-	}
-yy108:	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;
-	}
-yy109:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy110;
-	default:	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 ':':	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 yy114;
-	default:	goto yy25;
-	}
-yy114:	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 yy115;
-	default:	goto yy25;
-	}
-yy115:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':	goto yy116;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy25;
-	default:	goto yy117;
-	}
-yy116:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-	goto yy117;
-yy117:	switch(yych){
-	case '+':	case '-':	goto yy119;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy116;
-	case 'Z':	goto yy118;
-	default:	goto yy25;
-	}
-yy118:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy123;
-	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 0x00:	goto yy123;
-	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 yy125;
-	default:	goto yy25;
-	}
-yy123:	++YYCURSOR;
-	goto yy124;
-yy124:
-#line 113 "implicit.re"
-{   return "timestamp#iso8601"; }
-#line 1069 "<stdout>"
-yy125:	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;
-	}
-yy126:	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 yy127;
-	default:	goto yy25;
-	}
-yy127:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy128;
-	default:	goto yy25;
-	}
-yy128:	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 yy129;
-	default:	goto yy25;
-	}
-yy129:	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 yy130;
-	default:	goto yy25;
-	}
-yy130:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy131;
-	default:	goto yy25;
-	}
-yy131:	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 yy132;
-	default:	goto yy25;
-	}
-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 yy133;
-	default:	goto yy25;
-	}
-yy133:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':	goto yy134;
-	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 yy136;
-	default:	goto yy135;
-	}
-yy134:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-	goto yy135;
-yy135:	switch(yych){
-	case '+':	case '-':	goto yy119;
-	case '0':	goto yy134;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy138;
-	case 'Z':	goto yy118;
-	default:	goto yy25;
-	}
-yy136:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy137;
-yy137:	yych = *++YYCURSOR;
-	goto yy124;
-yy138:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-	goto yy139;
-yy139:	switch(yych){
-	case '+':	case '-':	goto yy119;
-	case '0':	goto yy134;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy138;
-	case 'Z':	goto yy136;
-	default:	goto yy25;
-	}
-yy140:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy155;
-	case '8':
-	case '9':	goto yy153;
-	default:	goto yy143;
-	}
-yy141:	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 yy153;
-	default:	goto yy152;
-	}
-yy142:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy143;
-yy143:	switch(yych){
-	case 0x00:	goto yy149;
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy142;
-	case '.':	goto yy50;
-	case '8':
-	case '9':	goto yy151;
-	case ':':	goto yy49;
-	default:	goto yy25;
-	}
-yy144:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy25;
-	goto yy146;
-yy145:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy146;
-yy146:	switch(yych){
-	case 0x00:	goto yy147;
-	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 yy145;
-	default:	goto yy25;
-	}
-yy147:	++YYCURSOR;
-	goto yy148;
-yy148:
-#line 91 "implicit.re"
-{   return "int#hex"; }
-#line 1307 "<stdout>"
-yy149:	++YYCURSOR;
-	goto yy150;
-yy150:
-#line 93 "implicit.re"
-{   return "int#oct"; }
-#line 1313 "<stdout>"
-yy151:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy152;
-yy152:	switch(yych){
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy151;
-	case '.':	goto yy50;
-	case ':':	goto yy49;
-	default:	goto yy25;
-	}
-yy153:	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 yy154;
-	default:	goto yy152;
-	}
-yy154:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy76;
-	default:	goto yy152;
-	}
-yy155:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy156;
-	case '8':
-	case '9':	goto yy154;
-	default:	goto yy143;
-	}
-yy156:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy76;
-	default:	goto yy143;
-	}
-yy157:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'I':	goto yy160;
-	case 'i':	goto yy159;
-	default:	goto yy25;
-	}
-yy158:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy52;
-	case 'x':	goto yy144;
-	default:	goto yy143;
-	}
-yy159:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'n':	goto yy166;
-	default:	goto yy25;
-	}
-yy160:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'N':	goto yy161;
-	case 'n':	goto yy162;
-	default:	goto yy25;
-	}
-yy161:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'F':	goto yy163;
-	default:	goto yy25;
-	}
-yy162:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy163;
-	default:	goto yy25;
-	}
-yy163:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy164;
-yy164:	++YYCURSOR;
-	goto yy165;
-yy165:
-#line 107 "implicit.re"
-{   return "float#neginf"; }
-#line 1412 "<stdout>"
-yy166:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy163;
-	default:	goto yy25;
-	}
-yy167:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'I':	goto yy33;
-	case 'i':	goto yy32;
-	default:	goto yy25;
-	}
-yy168:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'L':	goto yy175;
-	default:	goto yy25;
-	}
-yy169:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy170;
-	default:	goto yy25;
-	}
-yy170:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy171;
-	default:	goto yy25;
-	}
-yy171:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy172;
-	default:	goto yy25;
-	}
-yy172:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy173;
-yy173:	++YYCURSOR;
-	goto yy174;
-yy174:
-#line 89 "implicit.re"
-{   return "bool#no"; }
-#line 1452 "<stdout>"
-yy175:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'S':	goto yy176;
-	default:	goto yy25;
-	}
-yy176:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'E':	goto yy172;
-	default:	goto yy25;
-	}
-yy177:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy178;
-	default:	goto yy25;
-	}
-yy178:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy179;
-	default:	goto yy25;
-	}
-yy179:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy172;
-	default:	goto yy25;
-	}
-yy180:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'F':	goto yy172;
-	default:	goto yy25;
-	}
-yy181:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy172;
-	default:	goto yy25;
-	}
-yy182:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy183;
-yy183:	++YYCURSOR;
-	goto yy184;
-yy184:
-#line 87 "implicit.re"
-{   return "bool#yes"; }
-#line 1496 "<stdout>"
-yy185:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy172;
-	default:	goto yy25;
-	}
-yy186:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'U':	goto yy189;
-	default:	goto yy25;
-	}
-yy187:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'u':	goto yy188;
-	default:	goto yy25;
-	}
-yy188:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy182;
-	default:	goto yy25;
-	}
-yy189:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'E':	goto yy182;
-	default:	goto yy25;
-	}
-yy190:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'u':	goto yy191;
-	default:	goto yy25;
-	}
-yy191:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy182;
-	default:	goto yy25;
-	}
-yy192:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'S':	goto yy182;
-	default:	goto yy25;
-	}
-yy193:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy182;
-	default:	goto yy25;
-	}
-yy194:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy182;
-	default:	goto yy25;
-	}
-yy195:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'L':	goto yy199;
-	default:	goto yy25;
-	}
-yy196:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy197;
-	default:	goto yy25;
-	}
-yy197:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy198;
-	default:	goto yy25;
-	}
-yy198:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy6;
-	goto yy25;
-yy199:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'L':	goto yy198;
-	default:	goto yy25;
-	}
-yy200:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy201;
-	default:	goto yy25;
-	}
-yy201:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 'l':	goto yy198;
-	default:	goto yy25;
-	}
-}
-#line 125 "implicit.re"
-
-
-}
-
-/* Remove ending fragment and compare types */
-int
-syck_tagcmp( char *tag1, char *tag2 )
-{
-    if ( tag1 == tag2 ) return 1;
-    if ( tag1 == NULL || tag2 == NULL ) return 0;
-    else {
-        int i;
-        char *othorpe;
-        char *tmp1 = syck_strndup( tag1, strlen( tag1 ) );
-        char *tmp2 = syck_strndup( tag2, strlen( tag2 ) );
-        othorpe = strstr( tmp1, "#" );
-		if ( othorpe != NULL ) {
-            othorpe[0] = '\0';
-        }
-        othorpe = strstr( tmp2, "#" );
-		if ( othorpe != NULL ) {
-            othorpe[0] = '\0';
-        }
-        i = strcmp( tmp1, tmp2 );
-        S_FREE( tmp1 ); S_FREE( tmp2 );
-        return i;
-    }
-}
-
-char *
-syck_type_id_to_uri( char *type_id )
-{
-    char *cursor, *limit, *marker;
-
-    cursor = type_id;
-    limit = type_id + strlen( type_id );
-
-
-#line 1620 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy202;
-	++YYCURSOR;
-yy202:
-	if((YYLIMIT - YYCURSOR) < 11) YYFILL(11);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy204;
-	case '!':	goto yy208;
-	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 yy210;
-	case 't':	goto yy205;
-	case 'x':	goto yy207;
-	default:	goto yy211;
-	}
-yy204:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy206;
-	}
-yy205:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy212;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	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 yy214;
-	case 'a':	goto yy246;
-	default:	goto yy206;
-	}
-yy206:
-#line 202 "implicit.re"
-{   return syck_taguri( YAML_DOMAIN, type_id, strlen( type_id ) ); }
-#line 1768 "<stdout>"
-yy207:	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 yy215;
-	case '-':	goto yy236;
-	default:	goto yy206;
-	}
-yy208:	++YYCURSOR;
-	goto yy209;
-yy209:
-#line 176 "implicit.re"
-{   return syck_xprivate( type_id + 1, strlen( type_id ) - 1 ); }
-#line 1842 "<stdout>"
-yy210:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy212;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	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 yy214;
-	default:	goto yy206;
-	}
-yy211:	yych = *++YYCURSOR;
-	goto yy206;
-yy212:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy213;
-yy213:	switch(yych){
-	case '-':	goto yy212;
-	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 yy214;
-	default:	goto yy204;
-	}
-yy214:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy215;
-yy215:	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy212;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	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 yy214;
-	default:	goto yy204;
-	}
-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 yy224;
-	default:	goto yy204;
-	}
-yy217:	++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 yy220;
-	default:	goto yy204;
-	}
-yy218:	++YYCURSOR;
-	goto yy219;
-yy219:
-#line 178 "implicit.re"
-{   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;
-                }
-#line 2149 "<stdout>"
-yy220:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
-	yych = *YYCURSOR;
-	goto yy221;
-yy221:	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy222;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	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 yy220;
-	default:	goto yy204;
-	}
-yy222:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy223;
-yy223:	switch(yych){
-	case '-':	goto yy222;
-	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 yy220;
-	default:	goto yy204;
-	}
-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 yy204;
-	}
-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 yy204;
-	}
-yy226:	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 yy227;
-	default:	goto yy204;
-	}
-yy227:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy228;
-	case '/':	goto yy229;
-	default:	goto yy204;
-	}
-yy228:	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 yy231;
-	default:	goto yy204;
-	}
-yy229:	++YYCURSOR;
-	goto yy230;
-yy230:
-#line 191 "implicit.re"
-{   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;
-                            }
-#line 2365 "<stdout>"
-yy231:	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 yy232;
-	default:	goto yy204;
-	}
-yy232:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy233;
-	case '/':	goto yy229;
-	default:	goto yy204;
-	}
-yy233:	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 yy234;
-	default:	goto yy204;
-	}
-yy234:	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 yy235;
-	default:	goto yy204;
-	}
-yy235:	yych = *++YYCURSOR;
-	switch(yych){
-	case '/':	goto yy229;
-	default:	goto yy204;
-	}
-yy236:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'p':	goto yy237;
-	default:	goto yy213;
-	}
-yy237:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'r':	goto yy238;
-	default:	goto yy213;
-	}
-yy238:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'i':	goto yy239;
-	default:	goto yy213;
-	}
-yy239:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'v':	goto yy240;
-	default:	goto yy213;
-	}
-yy240:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'a':	goto yy241;
-	default:	goto yy213;
-	}
-yy241:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 't':	goto yy242;
-	default:	goto yy213;
-	}
-yy242:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'e':	goto yy243;
-	default:	goto yy213;
-	}
-yy243:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case ':':	goto yy244;
-	default:	goto yy213;
-	}
-yy244:	++YYCURSOR;
-	goto yy245;
-yy245:
-#line 174 "implicit.re"
-{   return syck_strndup( type_id, strlen( type_id ) ); }
-#line 2485 "<stdout>"
-yy246:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'g':	goto yy247;
-	default:	goto yy213;
-	}
-yy247:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case ':':	goto yy248;
-	default:	goto yy213;
-	}
-yy248:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':
-	case '-':
-	case '.':	goto yy204;
-	default:	goto yy250;
-	}
-yy249:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy250;
-yy250:	switch(yych){
-	case ',':	goto yy253;
-	case '-':	goto yy251;
-	case '.':	goto yy254;
-	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 yy249;
-	default:	goto yy204;
-	}
-yy251:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy252;
-yy252:	switch(yych){
-	case '-':	goto yy251;
-	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 yy249;
-	default:	goto yy204;
-	}
-yy253:	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 yy259;
-	default:	goto yy204;
-	}
-yy254:	++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 yy255;
-	default:	goto yy204;
-	}
-yy255:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
-	yych = *YYCURSOR;
-	goto yy256;
-yy256:	switch(yych){
-	case ',':	goto yy253;
-	case '-':	goto yy257;
-	case '.':	goto yy254;
-	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 yy255;
-	default:	goto yy204;
-	}
-yy257:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy258;
-yy258:	switch(yych){
-	case '-':	goto yy257;
-	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 yy255;
-	default:	goto yy204;
-	}
-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 yy204;
-	}
-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 yy204;
-	}
-yy261:	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 yy262;
-	default:	goto yy204;
-	}
-yy262:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy263;
-	case ':':	goto yy264;
-	default:	goto yy204;
-	}
-yy263:	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 yy266;
-	default:	goto yy204;
-	}
-yy264:	++YYCURSOR;
-	goto yy265;
-yy265:
-#line 172 "implicit.re"
-{   return syck_strndup( type_id, strlen( type_id ) ); }
-#line 2932 "<stdout>"
-yy266:	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 yy267;
-	default:	goto yy204;
-	}
-yy267:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy268;
-	case ':':	goto yy264;
-	default:	goto yy204;
-	}
-yy268:	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 yy269;
-	default:	goto yy204;
-	}
-yy269:	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 yy270;
-	default:	goto yy204;
-	}
-yy270:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case ':':	goto yy264;
-	default:	goto yy204;
-	}
-}
-#line 204 "implicit.re"
-
-
-}
diff --git a/ext/syck/node.c b/ext/syck/node.c
deleted file mode 100644
index 724f747e99..0000000000
--- a/ext/syck/node.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * node.c
- *
- * $Author: matz $
- * $Date: 2005/09/16 09:35:23 $
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#include "ruby.h"
-#include "syck.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 );
-        n->type_id = NULL;
-    }
-    if ( n->anchor != NULL )
-    {
-        S_FREE( n->anchor );
-        n->anchor = NULL;
-    }
-    S_FREE( n );
-}
-
-SyckNode *
-syck_alloc_map()
-{
-    SyckNode *n;
-    struct SyckMap *m;
-
-    m = S_ALLOC( struct SyckMap );
-    m->style = map_none;
-    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->style = seq_none;
-    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;
-    s->style = scalar_none;
-
-    n = syck_alloc_node( syck_str_kind );
-    n->data.str = s;
-    
-    return n;
-}
-
-SyckNode *
-syck_new_str( char *str, enum scalar_style style )
-{
-    return syck_new_str2( str, strlen( str ), style );
-}
-
-SyckNode *
-syck_new_str2( char *str, long len, enum scalar_style style )
-{
-    SyckNode *n;
-
-    n = syck_alloc_str();
-    n->data.str->ptr = S_ALLOC_N( char, len + 1 );
-    n->data.str->len = len;
-    n->data.str->style = style;
-    memcpy( n->data.str->ptr, str, len );
-    n->data.str->ptr[len] = '\0';
-
-    return n;
-}
-
-void
-syck_replace_str( SyckNode *n, char *str, enum scalar_style style )
-{
-    syck_replace_str2( n, str, strlen( str ), style );
-}
-
-void
-syck_replace_str2( SyckNode *n, char *str, long len, enum scalar_style style )
-{
-    if ( n->data.str != NULL ) 
-    {
-        S_FREE( n->data.str->ptr );
-        n->data.str->ptr = NULL;
-        n->data.str->len = 0;
-    }
-    n->data.str->ptr = S_ALLOC_N( char, len + 1 );
-    n->data.str->len = len;
-    n->data.str->style = style;
-    memcpy( n->data.str->ptr, str, len );
-    n->data.str->ptr[len] = '\0';
-}
-
-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_empty( SyckNode *n )
-{
-    struct SyckMap *m;
-    ASSERT( n != NULL );
-    ASSERT( n->data.list != NULL );
-
-    S_FREE( n->data.pairs->keys );
-    S_FREE( n->data.pairs->values );
-    m = n->data.pairs;
-    m->idx = 0;
-    m->capa = ALLOC_CT;
-    m->keys = S_ALLOC_N( SYMID, m->capa );
-    m->values = S_ALLOC_N( SYMID, m->capa );
-}
-
-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_empty( SyckNode *n )
-{
-    struct SyckSeq *s;
-    ASSERT( n != NULL );
-    ASSERT( n->data.list != NULL );
-
-    S_FREE( n->data.list->items );
-    s = n->data.list;
-    s->idx = 0;
-    s->capa = ALLOC_CT;
-    s->items = S_ALLOC_N( SYMID, s->capa );
-}
-
-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;
-}
-
-void
-syck_seq_assign( SyckNode *seq, long idx, SYMID id )
-{
-    struct SyckSeq *s;
-
-    ASSERT( map != NULL );
-    s = seq->data.list;
-    ASSERT( m != NULL );
-    s->items[idx] = id;
-}
-
-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 )
-{
-    if ( n == NULL ) return;
-
-    switch ( n->kind  )
-    {
-        case syck_str_kind:
-            if ( n->data.str != NULL ) 
-            {
-                S_FREE( n->data.str->ptr );
-                n->data.str->ptr = NULL;
-                n->data.str->len = 0;
-                S_FREE( n->data.str );
-                n->data.str = NULL;
-            }
-        break;
-
-        case syck_seq_kind:
-            if ( n->data.list != NULL )
-            {
-                S_FREE( n->data.list->items );
-                S_FREE( n->data.list );
-                n->data.list = NULL;
-            }
-        break;
-
-        case syck_map_kind:
-            if ( n->data.pairs != NULL )
-            {
-                S_FREE( n->data.pairs->keys );
-                S_FREE( n->data.pairs->values );
-                S_FREE( n->data.pairs );
-                n->data.pairs = NULL;
-            }
-        break;
-    }
-}
-
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
deleted file mode 100644
index e2de4bbfd0..0000000000
--- a/ext/syck/rubyext.c
+++ /dev/null
@@ -1,2367 +0,0 @@
-/* -*- indent-tabs-mode: nil -*- */
-/*
- * rubyext.c
- *
- * $Author: ocean $
- * $Date: 2006/01/30 15:11:57 $
- *
- * Copyright (C) 2003-2005 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"
-
-/*
- * symbols and constants
- */
-static ID s_new, s_utc, s_at, s_to_f, s_to_i, s_read, s_binmode, s_call, s_cmp, s_transfer, s_update, s_dup, s_haskey, s_match, s_keys, s_unpack, s_tr_bang, s_default_set, s_tag_read_class, s_tag_subclasses, s_resolver, s_push, s_emitter, s_level, s_detect_implicit, s_node_import, s_out, s_input, s_intern, s_transform, s_yaml_new, s_yaml_initialize, s_node_export, s_to_yaml, s_write, s_set_resolver;
-static ID s_tags, s_domain, s_kind, s_name, s_options, s_type_id, s_type_id_set, s_style, s_style_set, s_value, s_value_set;
-static VALUE sym_model, sym_generic, sym_input, sym_bytecode;
-static VALUE sym_scalar, sym_seq, sym_map;
-static VALUE sym_1quote, sym_2quote, sym_fold, sym_literal, sym_plain, sym_inline;
-static VALUE cDate, cNode, cMap, cSeq, cScalar, cOut, cParser, cResolver, cPrivateType, cDomainType, cYObject, cBadAlias, cDefaultKey, cMergeKey, cEmitter;
-static VALUE oDefaultResolver, oGenericResolver;
-
-/*
- * 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_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));
-void rb_syck_emitter_handler _((SyckEmitter *, st_data_t));
-int syck_parser_assign_io _((SyckParser *, VALUE *));
-VALUE syck_scalar_alloc _((VALUE class));
-VALUE syck_seq_alloc _((VALUE class));
-VALUE syck_map_alloc _((VALUE class));
-
-struct parser_xtra {
-    VALUE data;  /* Borrowed this idea from marshal.c to fix [ruby-core:8067] problem */
-    VALUE proc;
-    VALUE resolver;
-    int taint;
-};
-
-struct emitter_xtra {
-    VALUE oid;
-    VALUE data;
-    VALUE port;
-};
-
-/*
- * 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_ALLOCA_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;
-    else
-    {
-        /*
-         * call io#read.
-         */
-        VALUE src = (VALUE)str->ptr;
-        VALUE n = LONG2NUM(max_size);
-        VALUE str2 = rb_funcall2(src, s_read, 1, &n);
-        if (!NIL_P(str2))
-        {
-            StringValue(str2);
-            len = RSTRING(str2)->len;
-            memcpy( buf + skip, RSTRING(str2)->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, pport)
-    SyckParser *parser;
-    VALUE *pport;
-{
-    int taint = Qtrue;
-    VALUE tmp, port = *pport;
-    if (!NIL_P(tmp = rb_check_string_type(port))) {
-        taint = OBJ_TAINTED(port); /* original taintedness */
-        port = tmp;
-        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");
-    }
-    *pport = port;
-    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, len)
-    char *str;
-    long len;
-{
-    VALUE time;
-    char *ptr = str;
-    VALUE year = INT2FIX(0);
-    VALUE mon = INT2FIX(0);
-    VALUE day = INT2FIX(0);
-    VALUE hour = INT2FIX(0);
-    VALUE min = INT2FIX(0);
-    VALUE sec = INT2FIX(0);
-    long usec;
-
-    /* Year*/
-    if ( ptr[0] != '\0' && len > 0 ) {
-        year = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Month*/
-    ptr += 4;
-    if ( ptr[0] != '\0' && len > ptr - str ) {
-        while ( !ISDIGIT( *ptr ) ) ptr++;
-        mon = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Day*/
-    ptr += 2;
-    if ( ptr[0] != '\0' && len > ptr - str ) {
-        while ( !ISDIGIT( *ptr ) ) ptr++;
-        day = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Hour*/
-    ptr += 2;
-    if ( ptr[0] != '\0' && len > ptr - str ) {
-        while ( !ISDIGIT( *ptr ) ) ptr++;
-        hour = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Minute */
-    ptr += 2;
-    if ( ptr[0] != '\0' && len > ptr - str ) {
-        while ( !ISDIGIT( *ptr ) ) ptr++;
-        min = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Second */
-    ptr += 2;
-    if ( ptr[0] != '\0' && len > ptr - str ) {
-        while ( !ISDIGIT( *ptr ) ) ptr++;
-        sec = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Millisecond */
-    ptr += 2;
-    if ( len > ptr - str && *ptr == '.' )
-    {
-        char padded[] = "000000";
-        char *end = ptr + 1;
-        while ( isdigit( *end ) ) end++;
-        MEMCPY(padded, ptr + 1, char, end - (ptr + 1));
-        usec = strtol(padded, NULL, 10);
-    }
-    else
-    {
-        usec = 0;
-    }
-
-    /* Time Zone*/
-    while ( len > ptr - str && *ptr != 'Z' && *ptr != '+' && *ptr != '-' && *ptr != '\0' ) ptr++;
-    if ( len > ptr - str && ( *ptr == '-' || *ptr == '+' ) )
-    {
-        time_t tz_offset = strtol(ptr, NULL, 10) * 3600;
-        time_t tmp;
-
-        while ( *ptr != ':' && *ptr != '\0' ) ptr++;
-        if ( *ptr == ':' )
-        {
-            ptr += 1;
-            if ( tz_offset < 0 )
-            {
-                tz_offset -= strtol(ptr, NULL, 10) * 60;
-            }
-            else
-            {
-                tz_offset += strtol(ptr, NULL, 10) * 60;
-            }
-        }
-
-        /* Make TZ time*/
-        time = rb_funcall(rb_cTime, s_utc, 6, year, mon, day, hour, min, sec);
-        tmp = NUM2LONG(rb_funcall(time, s_to_i, 0)) - tz_offset;
-        return rb_funcall(rb_cTime, s_at, 2, LONG2NUM(tmp), LONG2NUM(usec));
-    }
-    else
-    {
-        /* Make UTC time*/
-        return rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, LONG2NUM(usec));
-    }
-}
-
-/*
- * handles merging of an array of hashes
- * (see http://www.yaml.org/type/merge/)
- */
-VALUE
-syck_merge_i( entry, hsh )
-    VALUE entry, hsh;
-{
-    VALUE tmp;
-    if ( !NIL_P(tmp = rb_check_convert_type(entry, T_HASH, "Hash", "to_hash")) )
-    {
-        entry = tmp;
-        rb_funcall( hsh, s_update, 1, entry );
-    }
-    return Qnil;
-}
-
-/*
- * 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;
-
-    if ( type_id != NULL && strncmp( type_id, "tag:yaml.org,2002:", 18 ) == 0 )
-    {
-        type_id += 18;
-    }
-
-    switch (n->kind)
-    {
-        case syck_str_kind:
-            transferred = 1;
-            if ( type_id == NULL )
-            {
-                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 )
-            {
-                syck_str_blow_away_commas( n );
-                obj = rb_cstr2inum( n->data.str->ptr, 16 );
-            }
-            else if ( strcmp( type_id, "int#oct" ) == 0 )
-            {
-                syck_str_blow_away_commas( n );
-                obj = rb_cstr2inum( n->data.str->ptr, 8 );
-            }
-            else if ( strcmp( type_id, "int#base60" ) == 0 )
-            {
-                char *ptr, *end;
-                long sixty = 1;
-                long total = 0;
-                syck_str_blow_away_commas( n );
-                ptr = n->data.str->ptr;
-                end = n->data.str->ptr + n->data.str->len;
-                while ( end > ptr )
-                {
-                    long bnum = 0;
-                    char *colon = end - 1;
-                    while ( colon >= ptr && *colon != ':' )
-                    {
-                        colon--;
-                    }
-                    if ( colon >= ptr && *colon == ':' ) *colon = '\0';
-
-                    bnum = strtol( colon + 1, NULL, 10 );
-                    total += bnum * sixty;
-                    sixty *= 60;
-                    end = colon;
-                }
-                obj = INT2FIX(total);
-            }
-            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#base60" ) == 0 )
-            {
-                char *ptr, *end;
-                long sixty = 1;
-                double total = 0.0;
-                syck_str_blow_away_commas( n );
-                ptr = n->data.str->ptr;
-                end = n->data.str->ptr + n->data.str->len;
-                while ( end > ptr )
-                {
-                    double bnum = 0;
-                    char *colon = end - 1;
-                    while ( colon >= ptr && *colon != ':' )
-                    {
-                        colon--;
-                    }
-                    if ( colon >= ptr && *colon == ':' ) *colon = '\0';
-
-                    bnum = strtod( colon + 1, NULL );
-                    total += bnum * sixty;
-                    sixty *= 60;
-                    end = colon;
-                }
-                obj = rb_float_new( total );
-            }
-            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, n->data.str->len );
-            }
-            else if ( strcmp( type_id, "timestamp#spaced" ) == 0 )
-            {
-                obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
-            }
-            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));
-
-                if ( !cDate ) {
-                    /*
-                     * Load Date module
-                     */
-                    rb_require( "date" );
-                    cDate = rb_const_get( rb_cObject, rb_intern("Date") );
-                }
-
-                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, n->data.str->len );
-            }
-            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 if ( n->data.str->style == scalar_plain &&
-                      n->data.str->len > 1 && 
-                      strncmp( n->data.str->ptr, ":", 1 ) == 0 )
-            {
-                obj = rb_funcall( oDefaultResolver, s_transfer, 2, 
-                                  rb_str_new2( "tag:ruby.yaml.org,2002:sym" ), 
-                                  rb_str_new( n->data.str->ptr + 1, n->data.str->len - 1 ) );
-            }
-            else if ( strcmp( type_id, "str" ) == 0 )
-            {
-                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-            }
-            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 ) )
-                {
-                    VALUE tmp;
-                    if ( !NIL_P(tmp = rb_check_convert_type(v, T_HASH, "Hash", "to_hash")) )
-                    {
-                        VALUE dup = rb_funcall( tmp, s_dup, 0 );
-                        rb_funcall( dup, s_update, 1, obj );
-                        obj = dup;
-                        skip_aset = 1;
-                    }
-                    else if ( !NIL_P(tmp = rb_check_array_type(v)) )
-                    {
-                        VALUE end = rb_ary_pop( tmp );
-                        VALUE tmph = rb_check_convert_type(end, T_HASH, "Hash", "to_hash");
-                        if ( !NIL_P(tmph) )
-                        {
-                            VALUE dup = rb_funcall( tmph, s_dup, 0 );
-                            tmp = rb_ary_reverse( tmp );
-                            rb_ary_push( tmp, obj );
-                            rb_iterate( rb_each, tmp, 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;
-}
-
-static void syck_node_mark( SyckNode *n );
-
-/*
- * {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 = (struct parser_xtra *)p->bonus;
-    VALUE resolver = bonus->resolver;
-    if ( NIL_P( resolver ) )
-    {
-        resolver = oDefaultResolver;
-    }
-
-    /*
-     * Create node, 
-     */
-    obj = rb_funcall( resolver, s_node_import, 1, Data_Wrap_Struct( cNode, NULL, NULL, n ) );
-
-    /*
-     * ID already set, let's alter the symbol table to accept the new object
-     */
-    if (n->id > 0 && !NIL_P(obj))
-    {
-        MEMCPY((void *)n->id, (void *)obj, RVALUE, 1);
-        MEMZERO((void *)obj, RVALUE, 1);
-        obj = n->id;
-    }
-
-    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;
-{
-    VALUE anchor_name = rb_str_new2( a );
-    SyckNode *badanc = syck_new_map( rb_str_new2( "name" ), anchor_name );
-    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( p, input, model )
-    VALUE p, input, model;
-{
-    SyckParser *parser;
-    Data_Get_Struct(p, SyckParser, parser);
-    syck_parser_handler( parser, rb_syck_load_handler );
-    /* WARN: gonna be obsoleted soon!! */
-    if ( model == sym_generic )
-    {
-        rb_funcall( p, s_set_resolver, 1, oGenericResolver );
-    }
-    syck_parser_implicit_typing( parser, 1 );
-    syck_parser_taguri_expansion( parser, 1 );
-
-    if ( NIL_P( input ) )
-    {
-        input = rb_ivar_get( p, s_input ); 
-    }
-    if ( input == sym_bytecode )
-    {
-        syck_parser_set_input_type( parser, syck_bytecode_utf8 );
-    }
-    else
-    {
-        syck_parser_set_input_type( parser, syck_yaml_utf8 );
-    }
-    syck_parser_error_handler( parser, rb_syck_err_handler );
-    syck_parser_bad_anchor_handler( parser, rb_syck_bad_anchor_handler );
-}
-
-static int
-syck_st_mark_nodes( char *key, SyckNode *n, char *arg )
-{
-    if ( n != (void *)1 ) syck_node_mark( n );
-    return ST_CONTINUE;
-}
-
-/*
- * mark parser nodes
- */
-static void
-syck_mark_parser(parser)
-    SyckParser *parser;
-{
-    struct parser_xtra *bonus = (struct parser_xtra *)parser->bonus;
-    rb_gc_mark_maybe(parser->root);
-    rb_gc_mark_maybe(parser->root_on_error);
-    rb_gc_mark( bonus->data );
-    rb_gc_mark( bonus->proc );
-    rb_gc_mark( bonus->resolver );
-
-    if ( parser->anchors != NULL )
-    {
-        st_foreach( parser->anchors, syck_st_mark_nodes, 0 );
-    }
-    if ( parser->bad_anchors != NULL )
-    {
-        st_foreach( parser->bad_anchors, syck_st_mark_nodes, 0 );
-    }
-}
-
-/*
- * Free the parser and any bonus attachment.
- */
-void
-rb_syck_free_parser(p)
-    SyckParser *p;
-{
-    S_FREE( p->bonus );
-    syck_free_parser(p);
-}
-
-/*
- * YAML::Syck::Parser.allocate
- */
-VALUE syck_parser_s_alloc _((VALUE));
-VALUE 
-syck_parser_s_alloc(class)
-    VALUE class;
-{
-    VALUE pobj;
-    SyckParser *parser = syck_new_parser();
-
-    parser->bonus = S_ALLOC( struct parser_xtra );
-    S_MEMZERO( parser->bonus, struct parser_xtra, 1 );
-
-    pobj = Data_Wrap_Struct( class, syck_mark_parser, rb_syck_free_parser, parser );
-
-    syck_parser_set_root_on_error( parser, Qnil );
-
-    return pobj;
-}
-
-/*
- * YAML::Syck::Parser.initialize( resolver, options )
- */
-static VALUE
-syck_parser_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE options;
-    if (rb_scan_args(argc, argv, "01", &options) == 0)
-    {
-        options = rb_hash_new();
-    }
-    else
-    {
-        Check_Type(options, T_HASH);
-    }
-    rb_ivar_set(self, s_options, options);
-    rb_ivar_set(self, s_input, Qnil);
-    return self;
-}
-
-/*
- * YAML::Syck::Parser.bufsize = Integer
- */
-static VALUE
-syck_parser_bufsize_set( self, size )
-    VALUE self, size;
-{
-    SyckParser *parser;
-
-    if ( rb_respond_to( size, s_to_i ) ) {
-        int n = NUM2INT(rb_funcall(size, s_to_i, 0));
-        Data_Get_Struct(self, SyckParser, parser);
-        parser->bufsize = n;
-    }
-    return self;
-}
-
-/*
- * YAML::Syck::Parser.bufsize => Integer
- */
-static VALUE
-syck_parser_bufsize_get( self )
-    VALUE self;
-{
-    SyckParser *parser;
-
-    Data_Get_Struct(self, SyckParser, parser);
-    return INT2FIX( parser->bufsize );
-}
-
-/*
- * 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;
-
-    rb_scan_args(argc, argv, "11", &port, &proc);
-
-    input = rb_hash_aref( rb_attr_get( self, s_options ), sym_input );
-    model = rb_hash_aref( rb_attr_get( self, s_options ), sym_model );
-    Data_Get_Struct(self, SyckParser, parser);
-    syck_set_model( self, input, model );
-
-    bonus = (struct parser_xtra *)parser->bonus;
-    bonus->taint = syck_parser_assign_io(parser, &port);
-    bonus->data = rb_hash_new();
-    bonus->resolver = rb_attr_get( self, s_resolver );
-    if ( NIL_P( proc ) ) bonus->proc = 0;
-    else                 bonus->proc = proc;
-
-    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;
-
-    rb_scan_args(argc, argv, "1&", &port, &proc);
-
-    input = rb_hash_aref( rb_attr_get( self, s_options ), sym_input );
-    model = rb_hash_aref( rb_attr_get( self, s_options ), sym_model );
-    Data_Get_Struct(self, SyckParser, parser);
-    syck_set_model( self, input, model );
-    
-    bonus = (struct parser_xtra *)parser->bonus;
-    bonus->taint = syck_parser_assign_io(parser, &port);
-    bonus->resolver = rb_attr_get( self, s_resolver );
-    bonus->proc = 0;
-
-    while ( 1 )
-    {
-        /* Reset hash for tracking nodes */
-        bonus->data = rb_hash_new();
-
-        /* 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::Parser#set_resolver
- */
-VALUE
-syck_parser_set_resolver( self, resolver )
-    VALUE self, resolver;
-{
-    rb_ivar_set( self, s_resolver, resolver );
-    return self;
-}
-
-/*
- * YAML::Syck::Resolver.initialize
- */
-static VALUE
-syck_resolver_initialize( self )
-    VALUE self;
-{
-    VALUE tags = rb_hash_new();
-    rb_ivar_set(self, s_tags, rb_hash_new());
-    return self;
-}
-
-/*
- * YAML::Syck::Resolver#add_type
- */
-VALUE
-syck_resolver_add_type( self, taguri, cls )
-    VALUE self, taguri, cls;
-{
-    VALUE tags = rb_attr_get(self, s_tags);
-    rb_hash_aset( tags, taguri, cls );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Resolver#use_types_at
- */
-VALUE
-syck_resolver_use_types_at( self, hsh )
-    VALUE self, hsh;
-{
-    rb_ivar_set( self, s_tags, hsh );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Resolver#detect_implicit 
- */
-VALUE
-syck_resolver_detect_implicit( self, val )
-    VALUE self, val;
-{
-    char *type_id;
-    return rb_str_new2( "" );
-}
-
-/*
- * YAML::Syck::Resolver#node_import
- */
-VALUE
-syck_resolver_node_import( self, node )
-    VALUE self, node;
-{
-    SyckNode *n;
-    VALUE obj;
-    int i = 0;
-    Data_Get_Struct(node, SyckNode, n);
-
-    switch (n->kind)
-    {
-        case syck_str_kind:
-            obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-        break;
-
-        case syck_seq_kind:
-            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:
-            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;
-    }
-
-    if ( n->type_id != NULL )
-    {
-        obj = rb_funcall( self, s_transfer, 2, rb_str_new2( n->type_id ), obj );
-    }
-    return obj;
-}
-
-/*
- * Set instance variables
- */
-VALUE
-syck_set_ivars( vars, obj )
-        VALUE vars, obj;
-{
-    VALUE ivname = rb_ary_entry( vars, 0 );
-    char *ivn;
-    StringValue( ivname );
-    ivn = S_ALLOCA_N( char, RSTRING(ivname)->len + 2 );
-    ivn[0] = '@';
-    ivn[1] = '\0';
-    strncat( ivn, RSTRING(ivname)->ptr, RSTRING(ivname)->len );
-    rb_iv_set( obj, ivn, rb_ary_entry( vars, 1 ) );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Resolver#const_find
- */
-VALUE
-syck_const_find( const_name )
-    VALUE const_name;
-{
-    VALUE tclass = rb_cObject;
-    VALUE tparts = rb_str_split( const_name, "::" );
-    int i = 0;
-    for ( i = 0; i < RARRAY(tparts)->len; i++ ) {
-        VALUE tpart = rb_to_id( rb_ary_entry( tparts, i ) );
-        if ( !rb_const_defined( tclass, tpart ) ) return Qnil;
-        tclass = rb_const_get( tclass, tpart );
-    }
-    return tclass;
-}
-
-/*
- * YAML::Syck::Resolver#transfer
- */
-VALUE
-syck_resolver_transfer( self, type, val )
-    VALUE self, type, val;
-{
-    if (NIL_P(type) || RSTRING(StringValue(type))->len == 0) 
-    {
-        type = rb_funcall( self, s_detect_implicit, 1, val );
-    }
-
-    if ( ! (NIL_P(type) || RSTRING(StringValue(type))->len == 0) )
-    {
-        VALUE str_xprivate = rb_str_new2( "x-private" );
-        VALUE colon = rb_str_new2( ":" );
-        VALUE tags = rb_attr_get(self, s_tags);
-        VALUE target_class = rb_hash_aref( tags, type );
-        VALUE subclass = target_class;
-        VALUE obj = Qnil;
-
-        /*
-         * Should no tag match exactly, check for subclass format
-         */
-        if ( NIL_P( target_class ) )
-        {
-            VALUE subclass_parts = rb_ary_new();
-            VALUE parts = rb_str_split( type, ":" );
-
-            while ( RARRAY(parts)->len > 1 )
-            {
-                VALUE partial;
-                rb_ary_unshift( subclass_parts, rb_ary_pop( parts ) );
-                partial = rb_ary_join( parts, colon );
-                target_class = rb_hash_aref( tags, partial );
-                if ( NIL_P( target_class ) )
-                {
-                    rb_str_append( partial, colon );
-                    target_class = rb_hash_aref( tags, partial );
-                }
-
-                /*
-                 * Possible subclass found, see if it supports subclassing
-                 */
-                if ( ! NIL_P( target_class ) )
-                {
-                    subclass = target_class;
-                    if ( RARRAY(subclass_parts)->len > 0 && rb_respond_to( target_class, s_tag_subclasses ) &&
-                         RTEST( rb_funcall( target_class, s_tag_subclasses, 0 ) ) )
-                    {
-                        VALUE subclass_v;
-                        subclass = rb_ary_join( subclass_parts, colon );
-                        subclass = rb_funcall( target_class, s_tag_read_class, 1, subclass );
-                        subclass_v = syck_const_find( subclass );
-
-                        if ( subclass_v != Qnil ) 
-                        {
-                            subclass = subclass_v;
-                        }
-                        else if ( rb_cObject == target_class && subclass_v == Qnil )
-                        {
-                            target_class = cYObject;
-                            type = subclass;
-                            subclass = cYObject;
-                        }
-                        else /* workaround for SEGV. real fix please */
-                        {
-                            rb_raise( rb_eTypeError, "invalid subclass" );
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-
-        /* rb_raise(rb_eTypeError, "invalid typing scheme: %s given",
-         *         scheme);
-         */
-
-        if ( rb_respond_to( target_class, s_call ) )
-        {
-            obj = rb_funcall( target_class, s_call, 2, type, val );
-        }
-        else
-        {
-            if ( rb_respond_to( target_class, s_yaml_new ) )
-            {
-                obj = rb_funcall( target_class, s_yaml_new, 3, subclass, type, val );
-            }
-            else if ( !NIL_P( target_class ) )
-            {
-                if ( subclass == rb_cBignum )
-                {
-                    obj = rb_str2inum( val, 10 ); /* for yaml dumped by 1.8.3 [ruby-core:6159] */
-                }
-                else
-                {
-                    obj = rb_obj_alloc( subclass );
-                }
-
-                if ( rb_respond_to( obj, s_yaml_initialize ) )
-                {
-                    rb_funcall( obj, s_yaml_initialize, 2, type, val );
-                }
-                else if ( !NIL_P( obj ) && rb_obj_is_instance_of( val, rb_cHash ) )
-                {
-                    rb_iterate( rb_each, val, syck_set_ivars, obj );
-                }
-            }
-            else 
-            {
-                VALUE parts = rb_str_split( type, ":" );
-                VALUE scheme = rb_ary_shift( parts );
-                if ( rb_str_cmp( scheme, str_xprivate ) == 0 )
-                {
-                    VALUE name = rb_ary_join( parts, colon );
-                    obj = rb_funcall( cPrivateType, s_new, 2, name, val );
-                }
-                else
-                {
-                    VALUE domain = rb_ary_shift( parts );
-                    VALUE name = rb_ary_join( parts, colon );
-                    obj = rb_funcall( cDomainType, s_new, 3, domain, name, val );
-                }
-            }
-        }
-        val = obj;
-    }
-
-    return val;
-}
-
-/*
- * YAML::Syck::Resolver#tagurize
- */
-VALUE
-syck_resolver_tagurize( self, val )
-    VALUE self, val;
-{
-    VALUE tmp = rb_check_string_type(val);
-
-    if ( !NIL_P(tmp) )
-    {
-        char *taguri = syck_type_id_to_uri( RSTRING(tmp)->ptr );
-        val = rb_str_new2( taguri );
-        S_FREE( taguri );
-    }
-
-    return val;
-}
-
-/*
- * YAML::Syck::DefaultResolver#detect_implicit 
- */
-VALUE
-syck_defaultresolver_detect_implicit( self, val )
-    VALUE self, val;
-{
-    char *type_id;
-    VALUE tmp = rb_check_string_type(val);
-
-    if ( !NIL_P(tmp) )
-    {
-        val = tmp;
-        type_id = syck_match_implicit( RSTRING(val)->ptr, RSTRING(val)->len );
-        return rb_str_new2( type_id );
-    }
-
-    return rb_str_new2( "" );
-}
-
-/*
- * YAML::Syck::DefaultResolver#node_import
- */
-VALUE
-syck_defaultresolver_node_import( self, node )
-    VALUE self, node;
-{
-    SyckNode *n;
-    VALUE obj;
-    Data_Get_Struct( node, SyckNode, n );
-    if ( !yaml_org_handler( n, &obj ) )
-    {
-        obj = rb_funcall( self, s_transfer, 2, rb_str_new2( n->type_id ), obj );
-    }
-    return obj;
-}
-
-/*
- * YAML::Syck::GenericResolver#node_import
- */
-VALUE
-syck_genericresolver_node_import( self, node )
-    VALUE self, node;
-{
-    SyckNode *n;
-    int i = 0;
-    VALUE t = Qnil, obj = Qnil, v = Qnil, style = Qnil;
-    Data_Get_Struct(node, SyckNode, n);
-
-    if ( n->type_id != NULL )
-    {
-        t = rb_str_new2(n->type_id);
-    }
-
-    switch (n->kind)
-    {
-        case syck_str_kind:
-        {
-            v = rb_str_new( n->data.str->ptr, n->data.str->len );
-            if ( n->data.str->style == scalar_1quote )
-            {
-                style = sym_1quote;
-            } 
-            else if ( n->data.str->style == scalar_2quote )
-            {
-                style = sym_2quote;
-            } 
-            else if ( n->data.str->style == scalar_fold )
-            {
-                style = sym_fold;
-            } 
-            else if ( n->data.str->style == scalar_literal )
-            {
-                style = sym_literal;
-            } 
-            else if ( n->data.str->style == scalar_plain )
-            {
-                style = sym_plain;
-            }
-            obj = rb_funcall( cScalar, s_new, 3, t, v, style );
-        }
-        break;
-
-        case syck_seq_kind:
-            rb_iv_set(obj, "@kind", sym_seq);
-            v = rb_ary_new2( syck_seq_count( n ) );
-            for ( i = 0; i < syck_seq_count( n ); i++ )
-            {
-                rb_ary_store( v, i, syck_seq_read( n, i ) );
-            }
-            if ( n->data.list->style == seq_inline )
-            {
-                style = sym_inline;
-            } 
-            obj = rb_funcall( cSeq, s_new, 3, t, v, style );
-        break;
-
-        case syck_map_kind:
-            rb_iv_set(obj, "@kind", sym_map);
-            v = rb_hash_new();
-            for ( i = 0; i < syck_map_count( n ); i++ )
-            {
-                rb_hash_aset( v, syck_map_read( n, map_key, i ), syck_map_read( n, map_value, i ) );
-            }
-            if ( n->data.pairs->style == map_inline )
-            {
-                style = sym_inline;
-            } 
-            obj = rb_funcall( cMap, s_new, 3, t, v, style );
-        break;
-    }
-
-    return obj;
-}
-
-/*
- * YAML::Syck::BadAlias.initialize
- */
-VALUE
-syck_badalias_initialize( self, val )
-    VALUE self, val;
-{
-    rb_iv_set( self, "@name", val );
-    return self;
-}
-
-/*
- * YAML::Syck::BadAlias.<=>
- */
-VALUE
-syck_badalias_cmp( alias1, alias2 )
-    VALUE alias1, alias2;
-{
-    VALUE str1 = rb_ivar_get( alias1, s_name ); 
-    VALUE str2 = rb_ivar_get( alias2, s_name ); 
-    VALUE val = rb_funcall( str1, s_cmp, 1, str2 );
-    return val;
-}
-
-/*
- * YAML::DomainType.initialize
- */
-VALUE
-syck_domaintype_initialize( self, domain, type_id, val )
-    VALUE self, domain, 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::Object.initialize
- */
-VALUE
-syck_yobject_initialize( self, klass, ivars )
-    VALUE self, klass, ivars;
-{
-    rb_iv_set( self, "@class", klass );
-    rb_iv_set( self, "@ivars", ivars );
-    return self;
-}
-
-/*
- * YAML::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;
-}
-
-/*
- * Mark node contents.
- */
-static void
-syck_node_mark( n )
-    SyckNode *n;
-{
-    int i;
-    rb_gc_mark_maybe( n->id );
-    switch ( n->kind )
-    {
-        case syck_seq_kind:
-            for ( i = 0; i < n->data.list->idx; i++ )
-            {
-                rb_gc_mark( syck_seq_read( n, i ) );
-            }
-        break;
-
-        case syck_map_kind:
-            for ( i = 0; i < n->data.pairs->idx; i++ )
-            {
-                rb_gc_mark( syck_map_read( n, map_key, i ) );
-                rb_gc_mark( syck_map_read( n, map_value, i ) );
-            }
-        break;
-    }
-#if 0 /* maybe needed */
-    if ( n->shortcut ) syck_node_mark( n->shortcut ); /* caution: maybe cyclic */
-#endif
-}
-
-/*
- * YAML::Syck::Scalar.allocate
- */
-VALUE
-syck_scalar_alloc( class )
-    VALUE class;
-{
-    SyckNode *node = syck_alloc_str();
-    VALUE obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
-    node->id = obj;
-    return obj;
-}
-
-/*
- * YAML::Syck::Scalar.initialize
- */
-VALUE
-syck_scalar_initialize( self, type_id, val, style )
-    VALUE self, type_id, val, style;
-{
-    rb_iv_set( self, "@kind", sym_scalar );
-    rb_funcall( self, s_type_id_set, 1, type_id );
-    rb_funcall( self, s_value_set, 1, val );
-    rb_funcall( self, s_style_set, 1, style );
-    return self;
-}
-
-/*
- * YAML::Syck::Scalar.style=
- */
-VALUE
-syck_scalar_style_set( self, style )
-    VALUE self, style;
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( NIL_P( style ) )
-    {
-        node->data.str->style = scalar_none;
-    } 
-    else if ( style == sym_1quote )
-    {
-        node->data.str->style = scalar_1quote;
-    } 
-    else if ( style == sym_2quote )
-    {
-        node->data.str->style = scalar_2quote;
-    } 
-    else if ( style == sym_fold )
-    {
-        node->data.str->style = scalar_fold;
-    } 
-    else if ( style == sym_literal )
-    {
-        node->data.str->style = scalar_literal;
-    } 
-    else if ( style == sym_plain )
-    {
-        node->data.str->style = scalar_plain;
-    }
-
-    rb_iv_set( self, "@style", style );
-    return self;
-}
-
-/*
- * YAML::Syck::Scalar.value=
- */
-VALUE
-syck_scalar_value_set( self, val )
-    VALUE self, val;
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    StringValue( val );
-    node->data.str->ptr = syck_strndup( RSTRING(val)->ptr, RSTRING(val)->len );
-    node->data.str->len = RSTRING(val)->len;
-    node->data.str->style = scalar_none;
-
-    rb_iv_set( self, "@value", val );
-    return val;
-}
-
-/*
- * YAML::Syck::Seq.allocate
- */
-VALUE
-syck_seq_alloc( class )
-    VALUE class;
-{
-    SyckNode *node;
-    VALUE obj;
-    node = syck_alloc_seq();
-    obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
-    node->id = obj;
-    return obj;
-}
-
-/*
- * YAML::Syck::Seq.initialize
- */
-VALUE
-syck_seq_initialize( self, type_id, val, style )
-    VALUE self, type_id, val, style;
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    rb_iv_set( self, "@kind", sym_seq );
-    rb_funcall( self, s_type_id_set, 1, type_id );
-    rb_funcall( self, s_value_set, 1, val );
-    rb_funcall( self, s_style_set, 1, style );
-    return self;
-}
-
-/*
- * YAML::Syck::Seq.value=
- */
-VALUE
-syck_seq_value_set( self, val )
-    VALUE self, val;
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    val = rb_check_array_type( val );
-    if ( !NIL_P( val ) ) {
-        int i;
-        syck_seq_empty( node );
-        for ( i = 0; i < RARRAY( val )->len; i++ )
-        {
-            syck_seq_add( node, rb_ary_entry(val, i) );
-        }
-    }
-
-    rb_iv_set( self, "@value", val );
-    return val;
-}
-
-/*
- * YAML::Syck::Seq.add
- */
-VALUE
-syck_seq_add_m( self, val )
-    VALUE self, val;
-{
-    SyckNode *node;
-    VALUE emitter = rb_ivar_get( self, s_emitter );
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( rb_respond_to( emitter, s_node_export ) ) {
-        val = rb_funcall( emitter, s_node_export, 1, val );
-    }
-    syck_seq_add( node, val );
-    rb_ary_push( rb_ivar_get( self, s_value ), val );
-
-    return self;
-}
-
-/*
- * YAML::Syck::Seq.style=
- */
-VALUE
-syck_seq_style_set( self, style )
-    VALUE self, style;
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( style == sym_inline )
-    {
-        node->data.list->style = seq_inline;
-    } 
-    else
-    {
-        node->data.list->style = seq_none;
-    }
-
-    rb_iv_set( self, "@style", style );
-    return self;
-}
-
-/*
- * YAML::Syck::Map.allocate
- */
-VALUE
-syck_map_alloc( class )
-    VALUE class;
-{
-    SyckNode *node;
-    VALUE obj;
-    node = syck_alloc_map();
-    obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
-    node->id = obj;
-    return obj;
-}
-
-/*
- * YAML::Syck::Map.initialize
- */
-VALUE
-syck_map_initialize( self, type_id, val, style )
-    VALUE self, type_id, val, style;
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( !NIL_P( val ) )
-    {
-        VALUE hsh = rb_check_convert_type(val, T_HASH, "Hash", "to_hash");
-        VALUE keys;
-        int i;
-        if ( NIL_P(hsh) )
-        {
-            rb_raise( rb_eTypeError, "wrong argument type" );
-        }
-
-        keys = rb_funcall( hsh, s_keys, 0 );
-        for ( i = 0; i < RARRAY(keys)->len; i++ )
-        {
-            VALUE key = rb_ary_entry(keys, i);
-            syck_map_add( node, key, rb_hash_aref(hsh, key) );
-        }
-    }
-
-    rb_iv_set( self, "@kind", sym_seq );
-    rb_funcall( self, s_type_id_set, 1, type_id );
-    rb_funcall( self, s_value_set, 1, val );
-    rb_funcall( self, s_style_set, 1, style );
-    return self;
-}
-
-/*
- * YAML::Syck::Map.value=
- */
-VALUE
-syck_map_value_set( self, val )
-    VALUE self, val;
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( !NIL_P( val ) )
-    {
-        VALUE hsh = rb_check_convert_type(val, T_HASH, "Hash", "to_hash");
-        VALUE keys;
-        int i;
-        if ( NIL_P(hsh) )
-        {
-            rb_raise( rb_eTypeError, "wrong argument type" );
-        }
-
-        syck_map_empty( node );
-        keys = rb_funcall( hsh, s_keys, 0 );
-        for ( i = 0; i < RARRAY(keys)->len; i++ )
-        {
-            VALUE key = rb_ary_entry(keys, i);
-            syck_map_add( node, key, rb_hash_aref(hsh, key) );
-        }
-    }
-
-    rb_iv_set( self, "@value", val );
-    return val;
-}
-
-/*
- * YAML::Syck::Map.add
- */
-VALUE
-syck_map_add_m( self, key, val )
-    VALUE self, key, val;
-{
-    SyckNode *node;
-    VALUE emitter = rb_ivar_get( self, s_emitter );
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( rb_respond_to( emitter, s_node_export ) ) {
-        key = rb_funcall( emitter, s_node_export, 1, key );
-        val = rb_funcall( emitter, s_node_export, 1, val );
-    }
-    syck_map_add( node, key, val );
-    rb_hash_aset( rb_ivar_get( self, s_value ), key, val );
-
-    return self;
-}
-
-/*
- * YAML::Syck::Map.style=
- */
-VALUE
-syck_map_style_set( self, style )
-    VALUE self, style;
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( style == sym_inline )
-    {
-        node->data.pairs->style = map_inline;
-    } 
-    else
-    {
-        node->data.pairs->style = map_none;
-    }
-
-    rb_iv_set( self, "@style", style );
-    return self;
-}
-
-/*
- * Cloning method for all node types
- */
-VALUE
-syck_node_init_copy( copy, orig )
-    VALUE copy, orig;
-{
-    SyckNode *copy_n;
-    SyckNode *orig_n;
-
-    if ( copy == orig )
-        return copy;
-
-    if ( TYPE( orig ) != T_DATA )
-    {
-        rb_raise( rb_eTypeError, "wrong argument type" );
-    }
-
-    Data_Get_Struct( orig, SyckNode, orig_n );
-    Data_Get_Struct( copy, SyckNode, copy_n );
-    MEMCPY( copy_n, orig_n, SyckNode, 1 );
-    return copy;
-}
-
-/*
- * YAML::Syck::Node#type_id=
- */
-VALUE
-syck_node_type_id_set( self, type_id )
-    VALUE self, type_id;
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    S_FREE( node->type_id );
-
-    if ( !NIL_P( type_id ) ) {
-        StringValue( type_id );
-        node->type_id = syck_strndup( RSTRING(type_id)->ptr, RSTRING(type_id)->len );
-    }
-
-    rb_iv_set( self, "@type_id", type_id );
-    return type_id;
-}
-
-/*
- * YAML::Syck::Node.transform
- */
-VALUE
-syck_node_transform( self )
-    VALUE self;
-{
-    VALUE t;
-    SyckNode *n;
-    SyckNode *orig_n;
-    Data_Get_Struct(self, SyckNode, orig_n);
-    t = Data_Wrap_Struct( cNode, syck_node_mark, syck_free_node, 0 );
-
-    switch (orig_n->kind)
-    {
-        case syck_map_kind:
-            {
-                int i;
-                DATA_PTR(t) = n = syck_alloc_map();
-                for ( i = 0; i < orig_n->data.pairs->idx; i++ )
-                {
-                    syck_map_add( n, rb_funcall( syck_map_read( orig_n, map_key, i ), s_transform, 0 ),
-                                     rb_funcall( syck_map_read( orig_n, map_value, i ), s_transform, 0 ) );
-                }
-            }
-        break;
-
-        case syck_seq_kind:
-            {
-                int i;
-                DATA_PTR(t) = n = syck_alloc_seq();
-                for ( i = 0; i < orig_n->data.list->idx; i++ )
-                {
-                    syck_seq_add( n, rb_funcall( syck_seq_read( orig_n, i ), s_transform, 0 ) );
-                }
-            }
-        break;
-
-        case syck_str_kind:
-            DATA_PTR(t) = n = syck_new_str2( orig_n->data.str->ptr, orig_n->data.str->len, orig_n->data.str->style );
-        break;
-    }
-
-    if ( orig_n->type_id != NULL )
-    {
-        n->type_id = syck_strndup( orig_n->type_id, strlen( orig_n->type_id ) );
-    }
-    if ( orig_n->anchor != NULL )
-    {
-        n->anchor = syck_strndup( orig_n->anchor, strlen( orig_n->anchor ) );
-    }
-    n->id = t;
-    return rb_funcall( oDefaultResolver, s_node_import, 1, t );
-}
-
-/*
- * Emitter callback: assembles YAML document events from
- * Ruby symbols.  This is a brilliant way to do it.
- * No one could possibly object.
- */
-void
-rb_syck_emitter_handler(e, data)
-    SyckEmitter *e;
-    st_data_t data;
-{
-    SyckNode *n;
-    Data_Get_Struct((VALUE)data, SyckNode, n);
-
-    switch (n->kind)
-    {
-        case syck_map_kind:
-            {
-                int i;
-                syck_emit_map( e, n->type_id, n->data.pairs->style );
-                for ( i = 0; i < n->data.pairs->idx; i++ )
-                {
-                    syck_emit_item( e, syck_map_read( n, map_key, i ) );
-                    syck_emit_item( e, syck_map_read( n, map_value, i ) );
-                }
-                syck_emit_end( e );
-            }
-        break;
-
-        case syck_seq_kind:
-            {
-                int i;
-                syck_emit_seq( e, n->type_id, n->data.list->style );
-                for ( i = 0; i < n->data.list->idx; i++ )
-                {
-                    syck_emit_item( e, syck_seq_read( n, i ) );
-                }
-                syck_emit_end( e );
-            }
-        break;
-
-        case syck_str_kind:
-            {
-                syck_emit_scalar( e, n->type_id, n->data.str->style, 0, 0, 0, n->data.str->ptr, n->data.str->len );
-            }
-        break;
-    }
-}
-
-/*
- * Handle output from the emitter
- */
-void 
-rb_syck_output_handler( emitter, str, len )
-    SyckEmitter *emitter;
-    char *str;
-    long len;
-{
-    struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
-    VALUE dest = bonus->port;
-    if (TYPE(dest) == T_STRING) {
-        rb_str_cat( dest, str, len );
-    } else {
-        rb_io_write( dest, rb_str_new( str, len ) );
-    }
-}
-
-/*
- * Helper function for marking nodes in the anchor
- * symbol table.
- */
-void
-syck_out_mark( emitter, node )
-    VALUE emitter, node;
-{
-    SyckEmitter *emitterPtr;
-    struct emitter_xtra *bonus;
-    Data_Get_Struct(emitter, SyckEmitter, emitterPtr);
-    bonus = (struct emitter_xtra *)emitterPtr->bonus;
-    rb_ivar_set( node, s_emitter, emitter );
-    /* syck_emitter_mark_node( emitterPtr, (st_data_t)node ); */
-    if ( !NIL_P( bonus->oid ) ) {
-        rb_hash_aset( bonus->data, bonus->oid, node );
-    }
-}
-
-/*
- * Mark emitter values.
- */
-static void
-syck_mark_emitter(emitter)
-    SyckEmitter *emitter;
-{
-    struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
-    rb_gc_mark( bonus->oid  );
-    rb_gc_mark( bonus->data );
-    rb_gc_mark( bonus->port );
-}
-
-/*
- * Free the emitter and any bonus attachment.
- */
-void
-rb_syck_free_emitter(e)
-    SyckEmitter *e;
-{
-    S_FREE( e->bonus );
-    syck_free_emitter(e);
-}
-
-/*
- * YAML::Syck::Emitter.allocate
- */
-VALUE syck_emitter_s_alloc _((VALUE));
-VALUE 
-syck_emitter_s_alloc(class)
-    VALUE class;
-{
-    VALUE pobj;
-    SyckEmitter *emitter = syck_new_emitter();
-
-    emitter->bonus = S_ALLOC( struct emitter_xtra );
-    S_MEMZERO( emitter->bonus, struct emitter_xtra, 1 );
-
-    pobj = Data_Wrap_Struct( class, syck_mark_emitter, rb_syck_free_emitter, emitter );
-    syck_emitter_handler( emitter, rb_syck_emitter_handler );
-    syck_output_handler( emitter, rb_syck_output_handler );
-
-    rb_ivar_set( pobj, s_out, rb_funcall( cOut, s_new, 1, pobj ) );
-    return pobj;
-}
-
-/*
- * YAML::Syck::Emitter.reset( options )
- */
-VALUE
-syck_emitter_reset( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE options, tmp;
-    SyckEmitter *emitter;
-    struct emitter_xtra *bonus;
-
-    Data_Get_Struct(self, SyckEmitter, emitter);
-    bonus = (struct emitter_xtra *)emitter->bonus;
-
-    bonus->oid = Qnil;
-    bonus->port = rb_str_new2( "" );
-    bonus->data = rb_hash_new();
-
-    if (rb_scan_args(argc, argv, "01", &options) == 0)
-    {
-        options = rb_hash_new();
-        rb_ivar_set(self, s_options, options);
-    }
-    else if ( !NIL_P(tmp = rb_check_string_type(options)) )
-    {
-        bonus->port = tmp;
-    }
-    else if ( rb_respond_to( options, s_write ) )
-    {
-        bonus->port = options;
-    }
-    else
-    {
-        Check_Type(options, T_HASH);
-        rb_ivar_set(self, s_options, options);
-    }
-    
-    emitter->headless = 0;
-    rb_ivar_set(self, s_level, INT2FIX(0));
-    rb_ivar_set(self, s_resolver, Qnil);
-    return self;
-}
-
-/*
- * YAML::Syck::Emitter.emit( object_id ) { |out| ... }
- */
-VALUE
-syck_emitter_emit( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE oid, proc;
-    char *anchor_name;
-    SyckEmitter *emitter;
-    struct emitter_xtra *bonus;
-    SYMID symple;
-    int level = FIX2INT(rb_ivar_get(self, s_level)) + 1;
-    rb_ivar_set(self, s_level, INT2FIX(level));
-
-    rb_scan_args(argc, argv, "1&", &oid, &proc);
-    Data_Get_Struct(self, SyckEmitter, emitter);
-    bonus = (struct emitter_xtra *)emitter->bonus;
-
-    /* Calculate anchors, normalize nodes, build a simpler symbol table */
-    bonus->oid = oid;
-    if ( !NIL_P( oid ) && RTEST( rb_funcall( bonus->data, s_haskey, 1, oid ) ) ) {
-        symple = rb_hash_aref( bonus->data, oid );
-    } else {
-        symple = rb_funcall( proc, s_call, 1, rb_ivar_get( self, s_out ) );
-    }
-    syck_emitter_mark_node( emitter, (st_data_t)symple );
-
-    /* Second pass, build emitted string */
-    level -= 1;
-    rb_ivar_set(self, s_level, INT2FIX(level));
-    if ( level == 0 ) 
-    {
-        syck_emit(emitter, (st_data_t)symple);
-        syck_emitter_flush(emitter, 0);
-
-        return bonus->port;
-    }
-    
-    return symple;
-}
-
-/*
- * YAML::Syck::Emitter#node_export
- */
-VALUE
-syck_emitter_node_export( self, node )
-    VALUE self, node;
-{
-    return rb_funcall( node, s_to_yaml, 1, self );
-}
-
-/*
- * YAML::Syck::Emitter#set_resolver
- */
-VALUE
-syck_emitter_set_resolver( self, resolver )
-    VALUE self, resolver;
-{
-    rb_ivar_set( self, s_resolver, resolver );
-    return self;
-}
-
-/*
- * YAML::Syck::Out::initialize
- */
-VALUE
-syck_out_initialize( self, emitter )
-    VALUE self, emitter;
-{
-    rb_ivar_set( self, s_emitter, emitter );
-    return self;
-}
-
-/*
- * YAML::Syck::Out::map
- */
-VALUE
-syck_out_map( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE type_id, style, map;
-    if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
-        style = Qnil;
-    }
-    map = rb_funcall( cMap, s_new, 3, type_id, rb_hash_new(), style );
-    syck_out_mark( rb_ivar_get( self, s_emitter ), map );
-    rb_yield( map );
-    return map;
-}
-
-/*
- * YAML::Syck::Out::seq
- */
-VALUE
-syck_out_seq( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE type_id, style, seq;
-    if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
-        style = Qnil;
-    }
-    seq = rb_funcall( cSeq, s_new, 3, type_id, rb_ary_new(), style );
-    syck_out_mark( rb_ivar_get( self, s_emitter ), seq );
-    rb_yield( seq );
-    return seq;
-}
-
-/*
- * YAML::Syck::Out::scalar
-syck_out_scalar( self, type_id, str, style )
-    VALUE self, type_id, str, style;
- */
-VALUE
-syck_out_scalar( argc, argv, self )
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE type_id, str, style, scalar;
-    if (rb_scan_args(argc, argv, "21", &type_id, &str, &style) == 2) {
-        style = Qnil;
-    }
-    scalar = rb_funcall( cScalar, s_new, 3, type_id, str, style );
-    syck_out_mark( rb_ivar_get( self, s_emitter ), scalar );
-    return scalar;
-}
-
-/*
- * 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_to_i = rb_intern("to_i");
-    s_read = rb_intern("read");
-    s_binmode = rb_intern("binmode");
-    s_transfer = rb_intern("transfer");
-    s_call = rb_intern("call");
-    s_cmp = rb_intern("<=>");
-    s_intern = rb_intern("intern");
-    s_update = rb_intern("update");
-    s_detect_implicit = rb_intern("detect_implicit");
-    s_dup = rb_intern("dup");
-    s_default_set = rb_intern("default=");
-    s_match = rb_intern("match");
-    s_push = rb_intern("push");
-    s_haskey = rb_intern("has_key?");
-    s_keys = rb_intern("keys");
-    s_node_import = rb_intern("node_import");
-    s_tr_bang = rb_intern("tr!");
-    s_unpack = rb_intern("unpack");
-    s_write = rb_intern("write");
-    s_tag_read_class = rb_intern( "yaml_tag_read_class" );
-    s_tag_subclasses = rb_intern( "yaml_tag_subclasses?" );
-    s_emitter = rb_intern( "emitter" );
-    s_set_resolver = rb_intern( "set_resolver" );
-    s_node_export = rb_intern( "node_export" );
-    s_to_yaml = rb_intern( "to_yaml" );
-    s_transform = rb_intern( "transform" );
-    s_yaml_new = rb_intern("yaml_new");
-    s_yaml_initialize = rb_intern("yaml_initialize");
-
-    s_tags = rb_intern("@tags");
-    s_name = rb_intern("@name");
-    s_options = rb_intern("@options");
-    s_kind = rb_intern("@kind");
-    s_type_id = rb_intern("@type_id");
-    s_type_id_set = rb_intern("type_id=");
-    s_resolver = rb_intern("@resolver");
-    s_level = rb_intern( "@level" );
-    s_style = rb_intern("@style");
-    s_style_set = rb_intern("style=");
-    s_value = rb_intern("@value");
-    s_value_set = rb_intern("value=");
-    s_out = rb_intern("@out");
-    s_input = rb_intern("@input");
-
-    sym_model = ID2SYM(rb_intern("Model"));
-    sym_generic = ID2SYM(rb_intern("Generic"));
-    sym_bytecode = ID2SYM(rb_intern("bytecode"));
-    sym_map = ID2SYM(rb_intern("map"));
-    sym_scalar = ID2SYM(rb_intern("scalar"));
-    sym_seq = ID2SYM(rb_intern("seq"));
-    sym_1quote = ID2SYM(rb_intern("quote1"));
-    sym_2quote = ID2SYM(rb_intern("quote2"));
-    sym_fold = ID2SYM(rb_intern("fold"));
-    sym_literal = ID2SYM(rb_intern("literal"));
-    sym_plain = ID2SYM(rb_intern("plain"));
-    sym_inline = ID2SYM(rb_intern("inline"));
-
-    /*
-     * Define YAML::Syck::Resolver class
-     */
-    cResolver = rb_define_class_under( rb_syck, "Resolver", rb_cObject );
-    rb_define_attr( cResolver, "tags", 1, 1 );
-    rb_define_method( cResolver, "initialize", syck_resolver_initialize, 0 );
-    rb_define_method( cResolver, "add_type", syck_resolver_add_type, 2 );
-    rb_define_method( cResolver, "use_types_at", syck_resolver_use_types_at, 1 );
-    rb_define_method( cResolver, "detect_implicit", syck_resolver_detect_implicit, 1 );
-    rb_define_method( cResolver, "transfer", syck_resolver_transfer, 2 );
-    rb_define_method( cResolver, "node_import", syck_resolver_node_import, 1 );
-    rb_define_method( cResolver, "tagurize", syck_resolver_tagurize, 1 );
-
-    rb_global_variable( &oDefaultResolver );
-    oDefaultResolver = rb_funcall( cResolver, rb_intern( "new" ), 0 );
-    rb_define_singleton_method( oDefaultResolver, "node_import", syck_defaultresolver_node_import, 1 );
-    rb_define_singleton_method( oDefaultResolver, "detect_implicit", syck_defaultresolver_detect_implicit, 1 );
-    rb_define_const( rb_syck, "DefaultResolver", oDefaultResolver );
-    rb_global_variable( &oGenericResolver );
-    oGenericResolver = rb_funcall( cResolver, rb_intern( "new" ), 0 );
-    rb_define_singleton_method( oGenericResolver, "node_import", syck_genericresolver_node_import, 1 );
-    rb_define_const( rb_syck, "GenericResolver", oGenericResolver );
-
-    /*
-     * Define YAML::Syck::Parser class
-     */
-    cParser = rb_define_class_under( rb_syck, "Parser", rb_cObject );
-    rb_define_attr( cParser, "options", 1, 1 );
-    rb_define_attr( cParser, "resolver", 1, 1 );
-    rb_define_attr( cParser, "input", 1, 1 );
-    rb_define_alloc_func( cParser, syck_parser_s_alloc );
-    rb_define_method(cParser, "initialize", syck_parser_initialize, -1 );
-    rb_define_method(cParser, "bufsize=", syck_parser_bufsize_set, 1 );
-    rb_define_method(cParser, "bufsize", syck_parser_bufsize_get, 0 );
-    rb_define_method(cParser, "load", syck_parser_load, -1);
-    rb_define_method(cParser, "load_documents", syck_parser_load_documents, -1);
-    rb_define_method(cParser, "set_resolver", syck_parser_set_resolver, 1);
-
-    /*
-     * Define YAML::Syck::Node class
-     */
-    cNode = rb_define_class_under( rb_syck, "Node", rb_cObject );
-    rb_define_method( cNode, "initialize_copy", syck_node_init_copy, 1 );
-    rb_define_attr( cNode, "emitter", 1, 1 );
-    rb_define_attr( cNode, "resolver", 1, 1 );
-    rb_define_attr( cNode, "kind", 1, 0 );
-    rb_define_attr( cNode, "type_id", 1, 0 );
-    rb_define_attr( cNode, "value", 1, 0 );
-    rb_define_method( cNode, "type_id=", syck_node_type_id_set, 1 );
-    rb_define_method( cNode, "transform", syck_node_transform, 0);
-
-    /*
-     * Define YAML::Syck::Scalar, YAML::Syck::Seq, YAML::Syck::Map --
-     *     all are the publicly usable variants of YAML::Syck::Node
-     */
-    cScalar = rb_define_class_under( rb_syck, "Scalar", cNode );
-    rb_define_alloc_func( cScalar, syck_scalar_alloc );
-    rb_define_attr( cNode, "value", 1, 0 );
-    rb_define_method( cScalar, "initialize", syck_scalar_initialize, 3 );
-    rb_define_method( cScalar, "value=", syck_scalar_value_set, 1 );
-    rb_define_method( cScalar, "style=", syck_scalar_style_set, 1 );
-    cSeq = rb_define_class_under( rb_syck, "Seq", cNode );
-    rb_define_alloc_func( cSeq, syck_seq_alloc );
-    rb_define_method( cSeq, "initialize", syck_seq_initialize, 3 );
-    rb_define_method( cSeq, "value=", syck_seq_value_set, 1 );
-    rb_define_method( cSeq, "add", syck_seq_add_m, 1 );
-    rb_define_method( cSeq, "style=", syck_seq_style_set, 1 );
-    cMap = rb_define_class_under( rb_syck, "Map", cNode );
-    rb_define_alloc_func( cMap, syck_map_alloc );
-    rb_define_method( cMap, "initialize", syck_map_initialize, 3 );
-    rb_define_method( cMap, "value=", syck_map_value_set, 1 );
-    rb_define_method( cMap, "add", syck_map_add_m, 2 );
-    rb_define_method( cMap, "style=", syck_map_style_set, 1 );
-
-    /*
-     * Define YAML::PrivateType class
-     */
-    cPrivateType = rb_define_class_under( rb_yaml, "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::DomainType class
-     */
-    cDomainType = rb_define_class_under( rb_yaml, "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::Object class
-     */
-    cYObject = rb_define_class_under( rb_yaml, "Object", rb_cObject );
-    rb_define_attr( cYObject, "class", 1, 1 );
-    rb_define_attr( cYObject, "ivars", 1, 1 );
-    rb_define_method( cYObject, "initialize", syck_yobject_initialize, 2);
-    rb_define_method( cYObject, "yaml_initialize", syck_yobject_initialize, 2);
-
-    /*
-     * 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);
-    rb_define_method( cBadAlias, "<=>", syck_badalias_cmp, 1);
-    rb_include_module( cBadAlias, rb_const_get( rb_cObject, rb_intern("Comparable") ) );
-
-    /*
-     * 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::Out classes
-     */
-    cOut = rb_define_class_under( rb_syck, "Out", rb_cObject );
-    rb_define_attr( cOut, "emitter", 1, 1 );
-    rb_define_method( cOut, "initialize", syck_out_initialize, 1 );
-    rb_define_method( cOut, "map", syck_out_map, -1 );
-    rb_define_method( cOut, "seq", syck_out_seq, -1 );
-    rb_define_method( cOut, "scalar", syck_out_scalar, -1 );
-
-    /*
-     * Define YAML::Syck::Emitter class
-     */
-    cEmitter = rb_define_class_under( rb_syck, "Emitter", rb_cObject );
-    rb_define_attr( cEmitter, "level", 1, 1 );
-    rb_define_alloc_func( cEmitter, syck_emitter_s_alloc );
-    rb_define_method( cEmitter, "initialize", syck_emitter_reset, -1 );
-    rb_define_method( cEmitter, "reset", syck_emitter_reset, -1 );
-    rb_define_method( cEmitter, "emit", syck_emitter_emit, -1 );
-    rb_define_method( cEmitter, "set_resolver", syck_emitter_set_resolver, 1);
-    rb_define_method( cEmitter, "node_export", syck_emitter_node_export, 1);
-}
-
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
deleted file mode 100644
index ac5427bc1b..0000000000
--- a/ext/syck/syck.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- * syck.c
- *
- * $Author: matz $
- * $Date: 2006/08/07 08:09:34 $
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-#include "ruby.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "syck.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;
-        else                  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 );
-        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 );
-    S_MEMZERO( p, SyckParser, 1 );
-    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 )
-{
-    if ( n != (void *)1 ) syck_free_node( n );
-    n = NULL;
-    return ST_CONTINUE;
-}
-
-void
-syck_st_free( SyckParser *p )
-{
-    /*
-     * 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 the adhoc symbol table
-     */
-    if ( p->syms != NULL )
-    {
-        st_free_table( p->syms );
-        p->syms = NULL;
-    }
-
-    /*
-     * 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 ( ( count = p->token - p->buffer ) )
-    {
-	if (skip > 0)
-	    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 bc383ff2de..0000000000
--- a/ext/syck/syck.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * syck.h
- *
- * $Author: ocean $
- * $Date: 2005/12/20 04:13:26 $
- *
- * 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.60"
-#define YAML_DOMAIN     "yaml.org,2002"
-
-#include <stdio.h>
-#include <stdlib.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 4096
-#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) if (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    40
-#define NL_KEEP     50
-
-/*
- * Node definitions
- */
-#ifndef ST_DATA_T_DEFINED
-typedef long st_data_t;
-#endif
-
-#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
-};
-
-enum map_style {
-    map_none,
-    map_inline
-};
-
-enum seq_style {
-    seq_none,
-    seq_inline
-};
-
-enum scalar_style {
-    scalar_none,
-    scalar_1quote,
-    scalar_2quote,
-    scalar_fold,
-    scalar_literal,
-    scalar_plain
-};
-
-/*
- * 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 {
-            enum map_style style;
-            SYMID *keys;
-            SYMID *values;
-            long capa;
-            long idx;
-        } *pairs;
-        /* Storage for sequence data */
-        struct SyckSeq {
-            enum seq_style style;
-            SYMID *items;
-            long capa;
-            long idx;
-        } *list;
-        /* Storage for string data */
-        struct SyckStr {
-            enum scalar_style style;
-            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_iseq,
-    syck_lvl_imap,
-    syck_lvl_end,
-    syck_lvl_pause,
-    syck_lvl_anctag,
-    syck_lvl_mapx,
-    syck_lvl_seqx
-};
-
-/*
- * 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 {
-    /* Indent */
-    int spaces;
-    /* Counts nodes emitted at this level, useful for parsing 
-     * keys and pairs in bytecode */
-    int ncount;
-    /* Does node have anchors or tags? */
-    int anctag;
-    /* Domain prefixing at the given level */
-    char *domain;
-    /* Keeps a node status */
-    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;
-    /* Pointer for extension's use */
-    void *bonus;
-};
-
-/*
- * Emitter definitions
- */
-typedef struct _syck_emitter SyckEmitter;
-typedef struct _syck_emitter_node SyckEmitterNode;
-
-typedef void (*SyckOutputHandler)(SyckEmitter *, char *, long); 
-typedef void (*SyckEmitterHandler)(SyckEmitter *, st_data_t); 
-
-enum doc_stage {
-    doc_open,
-    doc_processing
-};
-
-/*
- * Emitter struct
- */
-struct _syck_emitter {
-    /* Headerless doc flag */
-    int headless;
-    /* 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 scalar_style 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, *anchored;
-    /* Custom buffer size */
-    size_t bufsize;
-    /* Buffer */
-    char *buffer, *marker;
-    /* Absolute position of the buffer */
-    long bufpos;
-    /* Handler for emitter nodes */
-    SyckEmitterHandler emitter_handler;
-    /* Handler for output */
-    SyckOutputHandler output_handler;
-    /* Levels of indentation */
-    SyckLevel *levels;
-    int lvl_idx;
-    int lvl_capa;
-    /* 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_tagcmp( char *, char * );
-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();
-SYMID syck_emitter_mark_node( SyckEmitter *, st_data_t );
-void syck_emitter_ignore_id( SyckEmitter *, SYMID );
-void syck_output_handler( SyckEmitter *, SyckOutputHandler );
-void syck_emitter_handler( SyckEmitter *, SyckEmitterHandler );
-void syck_free_emitter( SyckEmitter * );
-void syck_emitter_clear( SyckEmitter * );
-void syck_emitter_write( SyckEmitter *, char *, long );
-void syck_emitter_escape( SyckEmitter *, char *, long );
-void syck_emitter_flush( SyckEmitter *, long );
-void syck_emit( SyckEmitter *, st_data_t );
-void syck_emit_scalar( SyckEmitter *, char *, enum scalar_style, int, int, char, char *, long );
-void syck_emit_1quoted( SyckEmitter *, int, char *, long );
-void syck_emit_2quoted( SyckEmitter *, int, char *, long );
-void syck_emit_folded( SyckEmitter *, int, char, char *, long );
-void syck_emit_literal( SyckEmitter *, char, char *, long );
-void syck_emit_seq( SyckEmitter *, char *, enum seq_style );
-void syck_emit_item( SyckEmitter *, st_data_t );
-void syck_emit_map( SyckEmitter *, char *, enum map_style );
-void syck_emit_end( SyckEmitter * );
-void syck_emit_tag( SyckEmitter *, char *, char * );
-void syck_emit_indent( SyckEmitter * );
-SyckLevel *syck_emitter_current_level( SyckEmitter * );
-SyckLevel *syck_emitter_parent_level( SyckEmitter * );
-void syck_emitter_pop_level( SyckEmitter * );
-void syck_emitter_add_level( SyckEmitter *, int, enum syck_level_status );
-void syck_emitter_reset_levels( 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 );
-int syck_scan_scalar( int, char *, long );
-void syck_parser_handler( SyckParser *, SyckNodeHandler );
-void syck_parser_error_handler( SyckParser *, SyckErrorHandler );
-void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler );
-void syck_parser_set_input_type( SyckParser *, enum syck_parser_input );
-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 );
-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 *, enum scalar_style );
-SyckNode *syck_new_str2( char *, long, enum scalar_style );
-void syck_replace_str( SyckNode *, char *, enum scalar_style );
-void syck_replace_str2( SyckNode *, char *, long, enum scalar_style );
-void syck_str_blow_away_commas( SyckNode * );
-char *syck_str_read( SyckNode * );
-SyckNode *syck_new_map( SYMID, SYMID );
-void syck_map_empty( SyckNode * );
-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_empty( SyckNode * );
-void syck_seq_add( SyckNode *, SYMID );
-void syck_seq_assign( SyckNode *, long, SYMID );
-SYMID syck_seq_read( SyckNode *, long );
-long syck_seq_count( SyckNode * );
-
-/*
- * Lexer prototypes
- */
-void syckerror( char * );
-int syckparse( void * );
-union YYSTYPE;
-int sycklex( union YYSTYPE *, SyckParser * );
-
-#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 e7b0414f74..0000000000
--- a/ext/syck/token.c
+++ /dev/null
@@ -1,2725 +0,0 @@
-/* Generated by re2c 0.9.10 on Tue Sep 20 17:46:17 2005 */
-#line 1 "token.re"
-/*
- * token.re
- *
- * $Author: why $
- * $Date: 2005/09/20 23:56:24 $
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-#include "ruby.h"
-#include "syck.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 + newline_len(ptr); 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_iseq || last_lvl->status == syck_lvl_imap ) \
-            { \
-                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 = YYTOKEN; \
-        n->data.str->ptr = qstr; \
-        n->data.str->len = qidx; \
-        n->data.str->style = scalar_plain; \
-        sycklval->nodeData = n; \
-        if ( parser->implicit_typing == 1 ) \
-        { \
-            try_tag_implicit( sycklval->nodeData, parser->taguri_expansion ); \
-        } \
-        return YAML_PLAIN; \
-    }
-
-/* concat the inline characters to the plain scalar */
-#define PLAIN_NOT_INL() \
-    if ( *(YYCURSOR - 1) == ' ' || is_newline( YYCURSOR - 1 ) ) \
-    { \
-        YYCURSOR--; \
-    } \
-    QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN); \
-    goto Plain2;
-
-/* trim spaces off the end in case of indent */
-#define PLAIN_IS_INL() \
-    char *walker = qstr + qidx - 1; \
-    while ( walker > qstr && ( *walker == '\n' || *walker == ' ' || *walker == '\t' ) ) \
-    { \
-        qidx--; \
-        walker[0] = '\0'; \
-        walker--; \
-    }
-
-/*
- * Keep or chomp block?
- * * Use only in "ScalarBlock" section *
- */
-#define RETURN_YAML_BLOCK() \
-    { \
-        SyckNode *n = syck_alloc_str(); \
-        if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
-        { \
-            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 ); \
-        } \
-        else \
-        { \
-            n->type_id = syck_strndup( "str", 3 ); \
-        } \
-        n->data.str->ptr = qstr; \
-        n->data.str->len = qidx; \
-        if ( blockType == BLOCK_LIT ) { \
-            n->data.str->style = scalar_literal; \
-        } else { \
-            n->data.str->style = scalar_fold; \
-        } \
-        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 < n->data.str->ptr + n->data.str->len - 1 ) \
-                    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 ( lvl_deep->status == syck_lvl_seq || ( indt_len == YYCURSOR - YYLINEPTR && lvl_deep->status != syck_lvl_map )  ) \
-        { \
-            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 * );
-char escape_seq( char );
-int is_newline( char *ptr );
-int newline_len( 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 );
-    }
-    return YAML_DOCSEP;
-}
-
-/*
- * 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 315 "token.re"
-
-
-    if ( YYLINEPTR != YYCURSOR )
-    {
-        goto Document;
-    }
-
-Header:
-
-    YYTOKEN = YYCURSOR;
-
-
-#line 307 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy0;
-	++YYCURSOR;
-yy0:
-	if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy7;
-	case 0x09:	case ' ':	goto yy12;
-	case 0x0A:	goto yy9;
-	case 0x0D:	goto yy11;
-	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 374 "token.re"
-{   YYPOS(0);
-                        goto Document; 
-                    }
-#line 337 "<stdout>"
-yy4:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':	goto yy21;
-	default:	goto yy3;
-	}
-yy5:	++YYCURSOR;
-	goto yy6;
-yy6:
-#line 356 "token.re"
-{   eat_comments( parser ); 
-                        goto Header;
-                    }
-#line 351 "<stdout>"
-yy7:	++YYCURSOR;
-	goto yy8;
-yy8:
-#line 360 "token.re"
-{   SyckLevel *lvl = CURRENT_LEVEL();
-                        ENSURE_YAML_IEND(lvl, -1);
-                        YYPOS(0);
-                        return 0; 
-                    }
-#line 361 "<stdout>"
-yy9:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy18;
-yy10:
-#line 366 "token.re"
-{   GOBBLE_UP_YAML_INDENT( doc_level, YYTOKEN );
-                        goto Header; 
-                    }
-#line 370 "<stdout>"
-yy11:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy17;
-	default:	goto yy3;
-	}
-yy12:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy16;
-yy13:
-#line 370 "token.re"
-{   doc_level = YYCURSOR - YYLINEPTR;
-                        goto Header;
-                    }
-#line 384 "<stdout>"
-yy14:	yych = *++YYCURSOR;
-	goto yy3;
-yy15:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy16;
-yy16:	switch(yych){
-	case 0x09:	case ' ':	goto yy15;
-	default:	goto yy13;
-	}
-yy17:	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy18;
-yy18:	switch(yych){
-	case 0x0A:	case ' ':	goto yy17;
-	case 0x0D:	goto yy19;
-	default:	goto yy10;
-	}
-yy19:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	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 0x0A:	goto yy23;
-	case 0x0D:	goto yy27;
-	case ' ':	goto yy25;
-	default:	goto yy20;
-	}
-yy23:	++YYCURSOR;
-	goto yy24;
-yy24:
-#line 342 "token.re"
-{   SyckLevel *lvl = CURRENT_LEVEL();
-                        if ( lvl->status == syck_lvl_header )
-                        {
-                            goto Header; 
-                        }
-                        else
-                        {
-                            ENSURE_YAML_IEND(lvl, -1);
-                            YYPOS(0);
-                            return 0; 
-                        }
-                        return 0; 
-                    }
-#line 446 "<stdout>"
-yy25:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy26;
-yy26:	switch(yych){
-	case ' ':	goto yy25;
-	default:	goto yy24;
-	}
-yy27:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy23;
-	default:	goto yy20;
-	}
-yy28:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy29;
-	default:	goto yy20;
-	}
-yy29:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy30;
-	case 0x0D:	goto yy34;
-	case ' ':	goto yy32;
-	default:	goto yy20;
-	}
-yy30:	++YYCURSOR;
-	goto yy31;
-yy31:
-#line 328 "token.re"
-{   SyckLevel *lvl = CURRENT_LEVEL();
-                        if ( lvl->status == syck_lvl_header )
-                        {
-                            YYPOS(3);
-                            goto Directive; 
-                        }
-                        else
-                        {
-                            ENSURE_YAML_IEND(lvl, -1);
-                            YYPOS(0);
-                            return 0; 
-                        }
-                    }
-#line 489 "<stdout>"
-yy32:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy33;
-yy33:	switch(yych){
-	case ' ':	goto yy32;
-	default:	goto yy31;
-	}
-yy34:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy30;
-	default:	goto yy20;
-	}
-}
-#line 378 "token.re"
-
-
-Document:
-    {
-        SyckLevel *lvl = CURRENT_LEVEL();
-        if ( lvl->status == syck_lvl_header )
-        {
-            lvl->status = syck_lvl_doc;
-        }
-
-        YYTOKEN = YYCURSOR;
-
-
-#line 518 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy35;
-	++YYCURSOR;
-yy35:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy62;
-	case 0x09:	case ' ':	goto yy60;
-	case 0x0A:	goto yy37;
-	case 0x0D:	goto yy39;
-	case '!':	goto yy51;
-	case '"':	goto yy55;
-	case '#':	goto yy58;
-	case '&':	goto yy49;
-	case '\'':	goto yy53;
-	case '*':	goto yy50;
-	case ',':	case ':':	goto yy47;
-	case '-':	case '?':	goto yy48;
-	case '>':	case '|':	goto yy57;
-	case '[':	goto yy41;
-	case ']':	case '}':	goto yy45;
-	case '{':	goto yy43;
-	default:	goto yy64;
-	}
-yy37:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy92;
-yy38:
-#line 392 "token.re"
-{   /* 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;
-                        }
-
-                        /* Ignore indentation inside inlines */
-                        if ( lvl->status == syck_lvl_iseq || lvl->status == syck_lvl_imap )
-                        {
-                            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;
-                    }
-#line 578 "<stdout>"
-yy39:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy91;
-	default:	goto yy40;
-	}
-yy40:
-#line 497 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto Plain; 
-                    }
-#line 589 "<stdout>"
-yy41:	++YYCURSOR;
-	goto yy42;
-yy42:
-#line 420 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        lvl = CURRENT_LEVEL();
-                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_iseq);
-                        return YYTOKEN[0]; 
-                    }
-#line 599 "<stdout>"
-yy43:	++YYCURSOR;
-	goto yy44;
-yy44:
-#line 426 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        lvl = CURRENT_LEVEL();
-                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_imap);
-                        return YYTOKEN[0]; 
-                    }
-#line 609 "<stdout>"
-yy45:	++YYCURSOR;
-	goto yy46;
-yy46:
-#line 432 "token.re"
-{   POP_LEVEL();
-                        return YYTOKEN[0]; 
-                    }
-#line 617 "<stdout>"
-yy47:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy86;
-	case 0x0D:	goto yy90;
-	case ' ':	goto yy88;
-	default:	goto yy40;
-	}
-yy48:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy81;
-	case 0x0D:	goto yy85;
-	case ' ':	goto yy83;
-	default:	goto yy40;
-	}
-yy49:	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 yy78;
-	default:	goto yy40;
-	}
-yy50:	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 yy75;
-	default:	goto yy40;
-	}
-yy51:	++YYCURSOR;
-	goto yy52;
-yy52:
-#line 471 "token.re"
-{   goto TransferMethod; }
-#line 767 "<stdout>"
-yy53:	++YYCURSOR;
-	goto yy54;
-yy54:
-#line 473 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto SingleQuote; }
-#line 774 "<stdout>"
-yy55:	++YYCURSOR;
-	goto yy56;
-yy56:
-#line 476 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto DoubleQuote; }
-#line 781 "<stdout>"
-yy57:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy70;
-	case 0x0D:	goto yy74;
-	case ' ':	goto yy72;
-	case '+':	case '-':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	default:	goto yy40;
-	}
-yy58:	++YYCURSOR;
-	goto yy59;
-yy59:
-#line 486 "token.re"
-{   eat_comments( parser ); 
-                        goto Document;
-                    }
-#line 807 "<stdout>"
-yy60:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy66;
-yy61:
-#line 490 "token.re"
-{   goto Document; }
-#line 814 "<stdout>"
-yy62:	++YYCURSOR;
-	goto yy63;
-yy63:
-#line 492 "token.re"
-{   ENSURE_YAML_IEND(lvl, -1);
-                        YYPOS(0);
-                        return 0; 
-                    }
-#line 823 "<stdout>"
-yy64:	yych = *++YYCURSOR;
-	goto yy40;
-yy65:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy66;
-yy66:	switch(yych){
-	case 0x09:	case ' ':	goto yy65;
-	default:	goto yy61;
-	}
-yy67:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy68;
-yy68:	switch(yych){
-	case 0x0A:	goto yy70;
-	case 0x0D:	goto yy74;
-	case ' ':	goto yy72;
-	case '+':	case '-':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	default:	goto yy69;
-	}
-yy69:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy38;
-	case 1:	goto yy40;
-	}
-yy70:	++YYCURSOR;
-	goto yy71;
-yy71:
-#line 479 "token.re"
-{   if ( is_newline( YYCURSOR - 1 ) ) 
-                        {
-                            YYCURSOR--;
-                        }
-                        goto ScalarBlock; 
-                    }
-#line 869 "<stdout>"
-yy72:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy73;
-yy73:	switch(yych){
-	case ' ':	goto yy72;
-	default:	goto yy71;
-	}
-yy74:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy70;
-	default:	goto yy69;
-	}
-yy75:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy76;
-yy76:	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 yy75;
-	default:	goto yy77;
-	}
-yy77:
-#line 466 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
-                        return YAML_ALIAS;
-                    }
-#line 956 "<stdout>"
-yy78:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy79;
-yy79:	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 yy78;
-	default:	goto yy80;
-	}
-yy80:
-#line 455 "token.re"
-{   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;
-                    }
-#line 1036 "<stdout>"
-yy81:	++YYCURSOR;
-	goto yy82;
-yy82:
-#line 441 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1);
-                        FORCE_NEXT_TOKEN(YAML_IOPEN);
-                        if ( *YYCURSOR == '#' || is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) )
-                        {
-                            YYCURSOR--; 
-                            ADD_LEVEL((YYTOKEN + 1) - YYLINEPTR, syck_lvl_seq);
-                        }
-                        else /* spaces followed by content uses the space as indentation */
-                        {
-                            ADD_LEVEL(YYCURSOR - YYLINEPTR, syck_lvl_seq);
-                        }
-                        return YYTOKEN[0]; 
-                    }
-#line 1054 "<stdout>"
-yy83:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy84;
-yy84:	switch(yych){
-	case ' ':	goto yy83;
-	default:	goto yy82;
-	}
-yy85:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy81;
-	default:	goto yy69;
-	}
-yy86:	++YYCURSOR;
-	goto yy87;
-yy87:
-#line 436 "token.re"
-{   if ( *YYTOKEN == ':' && lvl->status != syck_lvl_imap ) lvl->status = syck_lvl_map;
-                        YYPOS(1); 
-                        return YYTOKEN[0]; 
-                    }
-#line 1076 "<stdout>"
-yy88:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy89;
-yy89:	switch(yych){
-	case ' ':	goto yy88;
-	default:	goto yy87;
-	}
-yy90:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy86;
-	default:	goto yy69;
-	}
-yy91:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy92;
-yy92:	switch(yych){
-	case 0x0A:	case ' ':	goto yy91;
-	case 0x0D:	goto yy93;
-	default:	goto yy38;
-	}
-yy93:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy91;
-	default:	goto yy69;
-	}
-}
-#line 501 "token.re"
-
-    }
-
-Directive:
-    {
-        YYTOKTMP = YYCURSOR;
-
-
-#line 1117 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy94;
-	++YYCURSOR;
-yy94:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy96;
-	case 0x09:	case ' ':	goto yy99;
-	case '%':	goto yy97;
-	default:	goto yy101;
-	}
-yy96:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy98;
-	}
-yy97:	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 yy104;
-	default:	goto yy98;
-	}
-yy98:
-#line 514 "token.re"
-{   YYCURSOR = YYTOKTMP;
-                        return YAML_DOCSEP;
-                    }
-#line 1221 "<stdout>"
-yy99:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy103;
-yy100:
-#line 512 "token.re"
-{   goto Directive; }
-#line 1228 "<stdout>"
-yy101:	yych = *++YYCURSOR;
-	goto yy98;
-yy102:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy103;
-yy103:	switch(yych){
-	case 0x09:	case ' ':	goto yy102;
-	default:	goto yy100;
-	}
-yy104:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy105;
-yy105:	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 yy104;
-	case ':':	goto yy106;
-	default:	goto yy96;
-	}
-yy106:	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 yy107;
-	default:	goto yy96;
-	}
-yy107:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy108;
-yy108:	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 yy107;
-	default:	goto yy109;
-	}
-yy109:
-#line 510 "token.re"
-{   goto Directive; }
-#line 1484 "<stdout>"
-}
-#line 517 "token.re"
-
-
-    }
-
-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: 
-        YYTOKEN = YYCURSOR;
-
-Plain3:
-
-
-#line 1509 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy110;
-	++YYCURSOR;
-yy110:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy124;
-	case 0x09:	goto yy126;
-	case 0x0A:	goto yy112;
-	case 0x0D:	goto yy114;
-	case ' ':	goto yy122;
-	case ',':	goto yy117;
-	case ':':	goto yy116;
-	case ']':	goto yy120;
-	case '}':	goto yy118;
-	default:	goto yy127;
-	}
-yy112:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy142;
-yy113:
-#line 540 "token.re"
-{   int indt_len, nl_count = 0;
-                        SyckLevel *lvl;
-                        char *tok = YYTOKEN;
-                        GOBBLE_UP_YAML_INDENT( indt_len, tok );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( indt_len <= parentIndent )
-                        {
-                            RETURN_IMPLICIT();
-                        }
-
-                        while ( YYTOKEN < YYCURSOR )
-                        {
-                            int nl_len = newline_len( YYTOKEN++ );
-                            if ( nl_len )
-                            {
-                                nl_count++;
-                                YYTOKEN += nl_len - 1;
-                            }
-                        }
-                        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; 
-                    }
-#line 1570 "<stdout>"
-yy114:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy141;
-	default:	goto yy115;
-	}
-yy115:
-#line 627 "token.re"
-{   QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN);
-                        goto Plain2;
-                    }
-#line 1581 "<stdout>"
-yy116:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy136;
-	case 0x0D:	goto yy140;
-	case ' ':	goto yy138;
-	default:	goto yy115;
-	}
-yy117:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy130;
-	case 0x0D:	goto yy134;
-	case ' ':	goto yy132;
-	default:	goto yy115;
-	}
-yy118:	++YYCURSOR;
-	goto yy119;
-yy119:
-#line 589 "token.re"
-{   if ( plvl->status != syck_lvl_imap )
-                        {
-                            PLAIN_NOT_INL();
-                        }
-                        else
-                        {
-                            PLAIN_IS_INL();
-                        }
-                        RETURN_IMPLICIT();
-                    }
-#line 1612 "<stdout>"
-yy120:	++YYCURSOR;
-	goto yy121;
-yy121:
-#line 600 "token.re"
-{   if ( plvl->status != syck_lvl_iseq )
-                        {
-                            PLAIN_NOT_INL();
-                        }
-                        else
-                        {
-                            PLAIN_IS_INL();
-                        }
-                        RETURN_IMPLICIT();
-                    }
-#line 1627 "<stdout>"
-yy122:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case '#':	goto yy128;
-	default:	goto yy123;
-	}
-yy123:
-#line 617 "token.re"
-{   if ( qidx == 0 ) 
-                        {
-                            goto Plain2;
-                        }
-                        else
-                        {
-                            goto Plain3; 
-                        }
-                    }
-#line 1644 "<stdout>"
-yy124:	++YYCURSOR;
-	goto yy125;
-yy125:
-#line 615 "token.re"
-{   RETURN_IMPLICIT(); }
-#line 1650 "<stdout>"
-yy126:	yych = *++YYCURSOR;
-	goto yy123;
-yy127:	yych = *++YYCURSOR;
-	goto yy115;
-yy128:	++YYCURSOR;
-	goto yy129;
-yy129:
-#line 611 "token.re"
-{   eat_comments( parser ); 
-                        RETURN_IMPLICIT();
-                    }
-#line 1662 "<stdout>"
-yy130:	++YYCURSOR;
-	goto yy131;
-yy131:
-#line 578 "token.re"
-{   if ( plvl->status != syck_lvl_iseq && plvl->status != syck_lvl_imap )
-                        {
-                            PLAIN_NOT_INL();
-                        }
-                        else
-                        {
-                            PLAIN_IS_INL();
-                        }
-                        RETURN_IMPLICIT();
-                    }
-#line 1677 "<stdout>"
-yy132:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy133;
-yy133:	switch(yych){
-	case ' ':	goto yy132;
-	default:	goto yy131;
-	}
-yy134:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy130;
-	default:	goto yy135;
-	}
-yy135:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy113;
-	case 1:	goto yy115;
-	}
-yy136:	++YYCURSOR;
-	goto yy137;
-yy137:
-#line 576 "token.re"
-{   RETURN_IMPLICIT(); }
-#line 1701 "<stdout>"
-yy138:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy139;
-yy139:	switch(yych){
-	case ' ':	goto yy138;
-	default:	goto yy137;
-	}
-yy140:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy136;
-	default:	goto yy135;
-	}
-yy141:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy142;
-yy142:	switch(yych){
-	case 0x0A:	case ' ':	goto yy141;
-	case 0x0D:	goto yy143;
-	default:	goto yy113;
-	}
-yy143:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy141;
-	default:	goto yy135;
-	}
-}
-#line 631 "token.re"
-
-    }
-
-SingleQuote:
-    {
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-
-SingleQuote2:
-        YYTOKEN = YYCURSOR;
-
-
-#line 1747 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy144;
-	++YYCURSOR;
-yy144:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy152;
-	case 0x0A:	goto yy146;
-	case 0x0D:	goto yy148;
-	case '\'':	goto yy150;
-	default:	goto yy153;
-	}
-yy146:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy157;
-yy147:
-#line 645 "token.re"
-{   int indt_len;
-                        int nl_count = 0;
-                        SyckLevel *lvl;
-                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status != syck_lvl_str )
-                        {
-                            ADD_LEVEL( indt_len, syck_lvl_str );
-                        }
-                        else if ( indt_len < lvl->spaces )
-                        {
-                            /* Error! */
-                        }
-
-                        while ( YYTOKEN < YYCURSOR )
-                        {
-                            int nl_len = newline_len( YYTOKEN++ );
-                            if ( nl_len )
-                            {
-                                nl_count++;
-                                YYTOKEN += nl_len - 1;
-                            }
-                        }
-                        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; 
-                    }
-#line 1807 "<stdout>"
-yy148:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy156;
-	default:	goto yy149;
-	}
-yy149:
-#line 712 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
-                        goto SingleQuote2; 
-                    }
-#line 1818 "<stdout>"
-yy150:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case '\'':	goto yy154;
-	default:	goto yy151;
-	}
-yy151:
-#line 689 "token.re"
-{   SyckLevel *lvl;
-                        SyckNode *n = syck_alloc_str();
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status == syck_lvl_str )
-                        {
-                            POP_LEVEL();
-                        }
-                        if ( ((SyckParser *)parser)->taguri_expansion == 1 )
-                        {
-                            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
-                        }
-                        else
-                        {
-                            n->type_id = syck_strndup( "str", 3 );
-                        }
-                        n->data.str->ptr = qstr;
-                        n->data.str->len = qidx;
-                        n->data.str->style = scalar_1quote;
-                        sycklval->nodeData = n;
-                        return YAML_PLAIN; 
-                    }
-#line 1848 "<stdout>"
-yy152:	yych = *++YYCURSOR;
-	goto yy151;
-yy153:	yych = *++YYCURSOR;
-	goto yy149;
-yy154:	++YYCURSOR;
-	goto yy155;
-yy155:
-#line 685 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, '\'');
-                        goto SingleQuote2; 
-                    }
-#line 1860 "<stdout>"
-yy156:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy157;
-yy157:	switch(yych){
-	case 0x0A:	case ' ':	goto yy156;
-	case 0x0D:	goto yy158;
-	default:	goto yy147;
-	}
-yy158:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy156;
-	default:	goto yy159;
-	}
-yy159:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy147;
-	}
-}
-#line 716 "token.re"
-
-
-    }
-
-
-DoubleQuote:
-    {
-        int keep_nl = 1;
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-
-DoubleQuote2:
-        YYTOKEN = YYCURSOR;
-
-
-
-#line 1901 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy160;
-	++YYCURSOR;
-yy160:
-	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy167;
-	case 0x0A:	goto yy162;
-	case 0x0D:	goto yy164;
-	case '"':	goto yy169;
-	case '\\':	goto yy166;
-	default:	goto yy170;
-	}
-yy162:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy184;
-yy163:
-#line 734 "token.re"
-{   int indt_len;
-                        int nl_count = 0;
-                        SyckLevel *lvl;
-                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
-                        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 ( YYTOKEN < YYCURSOR )
-                            {
-                                int nl_len = newline_len( YYTOKEN++ );
-                                if ( nl_len )
-                                {
-                                    nl_count++;
-                                    YYTOKEN += nl_len - 1;
-                                }
-                            }
-                            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; 
-                    }
-#line 1966 "<stdout>"
-yy164:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy183;
-	default:	goto yy165;
-	}
-yy165:
-#line 820 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
-                        goto DoubleQuote2; 
-                    }
-#line 1977 "<stdout>"
-yy166:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy174;
-	case 0x0D:	goto yy176;
-	case ' ':	goto yy171;
-	case '"':	case '0':	case '\\':	case 'a':
-	case 'b':	case 'e':
-	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy178;
-	case 'x':	goto yy177;
-	default:	goto yy165;
-	}
-yy167:	++YYCURSOR;
-	goto yy168;
-yy168:
-#line 797 "token.re"
-{   SyckLevel *lvl;
-                        SyckNode *n = syck_alloc_str();
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status == syck_lvl_str )
-                        {
-                            POP_LEVEL();
-                        }
-                        if ( ((SyckParser *)parser)->taguri_expansion == 1 )
-                        {
-                            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
-                        }
-                        else
-                        {
-                            n->type_id = syck_strndup( "str", 3 );
-                        }
-                        n->data.str->ptr = qstr;
-                        n->data.str->len = qidx;
-                        n->data.str->style = scalar_2quote;
-                        sycklval->nodeData = n;
-                        return YAML_PLAIN; 
-                    }
-#line 2016 "<stdout>"
-yy169:	yych = *++YYCURSOR;
-	goto yy168;
-yy170:	yych = *++YYCURSOR;
-	goto yy165;
-yy171:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy172;
-yy172:	switch(yych){
-	case 0x0A:	goto yy174;
-	case 0x0D:	goto yy176;
-	case ' ':	goto yy171;
-	default:	goto yy173;
-	}
-yy173:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy163;
-	case 1:	goto yy165;
-	}
-yy174:	++YYCURSOR;
-	goto yy175;
-yy175:
-#line 792 "token.re"
-{   keep_nl = 0;
-                        YYCURSOR--;
-                        goto DoubleQuote2; 
-                    }
-#line 2044 "<stdout>"
-yy176:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy174;
-	default:	goto yy173;
-	}
-yy177:	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 yy180;
-	default:	goto yy173;
-	}
-yy178:	++YYCURSOR;
-	goto yy179;
-yy179:
-#line 778 "token.re"
-{   char ch = *( YYCURSOR - 1 );
-                        QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
-                        goto DoubleQuote2; 
-                    }
-#line 2082 "<stdout>"
-yy180:	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 yy181;
-	default:	goto yy173;
-	}
-yy181:	++YYCURSOR;
-	goto yy182;
-yy182:
-#line 783 "token.re"
-{   long ch;
-                        char *chr_text = syck_strndup( YYTOKEN, 4 );
-                        chr_text[0] = '0';
-                        ch = strtol( chr_text, NULL, 16 );
-                        free( chr_text );
-                        QUOTECAT(qstr, qcapa, qidx, ch);
-                        goto DoubleQuote2; 
-                    }
-#line 2119 "<stdout>"
-yy183:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy184;
-yy184:	switch(yych){
-	case 0x0A:	case ' ':	goto yy183;
-	case 0x0D:	goto yy185;
-	default:	goto yy163;
-	}
-yy185:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy183;
-	default:	goto yy173;
-	}
-}
-#line 824 "token.re"
-
-    }
-
-TransferMethod:
-    {
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-
-TransferMethod2:
-        YYTOKTMP = YYCURSOR;
-
-
-#line 2152 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy186;
-	++YYCURSOR;
-yy186:
-	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy188;
-	case 0x0A:	goto yy190;
-	case 0x0D:	goto yy192;
-	case ' ':	goto yy191;
-	case '\\':	goto yy194;
-	default:	goto yy195;
-	}
-yy188:	++YYCURSOR;
-	goto yy189;
-yy189:
-#line 838 "token.re"
-{   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; 
-                    }
-#line 2222 "<stdout>"
-yy190:	yych = *++YYCURSOR;
-	goto yy189;
-yy191:	yych = *++YYCURSOR;
-	goto yy204;
-yy192:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy188;
-	default:	goto yy193;
-	}
-yy193:
-#line 905 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
-                        goto TransferMethod2;
-                    }
-#line 2237 "<stdout>"
-yy194:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '"':	case '0':	case '\\':	case 'a':
-	case 'b':	case 'e':
-	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy198;
-	case 'x':	goto yy196;
-	default:	goto yy193;
-	}
-yy195:	yych = *++YYCURSOR;
-	goto yy193;
-yy196:	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 yy200;
-	default:	goto yy197;
-	}
-yy197:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy193;
-	}
-yy198:	++YYCURSOR;
-	goto yy199;
-yy199:
-#line 891 "token.re"
-{  char ch = *( YYCURSOR - 1 );
-                        QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
-                        goto TransferMethod2;
-                    }
-#line 2285 "<stdout>"
-yy200:	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 yy201;
-	default:	goto yy197;
-	}
-yy201:	++YYCURSOR;
-	goto yy202;
-yy202:
-#line 896 "token.re"
-{   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;
-                    }
-#line 2322 "<stdout>"
-yy203:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy204;
-yy204:	switch(yych){
-	case ' ':	goto yy203;
-	default:	goto yy189;
-	}
-}
-#line 910 "token.re"
-
-    }
-
-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 = -1;
-
-        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 );
-            }
-        }
-
-        qstr[0] = '\0';
-        YYTOKEN = YYCURSOR;
-
-ScalarBlock2:
-        YYTOKEN = YYCURSOR;
-
-
-#line 2378 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy205;
-	++YYCURSOR;
-yy205:
-	if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy213;
-	case 0x0A:	goto yy207;
-	case 0x0D:	goto yy209;
-	case '#':	goto yy211;
-	case '-':	goto yy215;
-	default:	goto yy216;
-	}
-yy207:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy226;
-yy208:
-#line 956 "token.re"
-{   char *pacer;
-                        char *tok = YYTOKEN;
-                        int indt_len = 0, nl_count = 0, fold_nl = 0, nl_begin = 0;
-                        GOBBLE_UP_YAML_INDENT( indt_len, tok );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status != syck_lvl_block )
-                        {
-                            GET_TRUE_YAML_INDENT(parentIndent);
-                            if ( forceIndent > 0 ) forceIndent += parentIndent;
-                            if ( indt_len > parentIndent )
-                            {
-                                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
-                            {
-                                YYCURSOR = YYTOKEN;
-                                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 = YYTOKEN;
-                        while ( pacer < YYCURSOR )
-                        {
-                            int nl_len = newline_len( pacer++ );
-                            if ( nl_len )
-                            {
-                                nl_count++;
-                                pacer += nl_len - 1;
-                            }
-                        }
-
-                        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 = YYTOKEN;
-                            RETURN_YAML_BLOCK();
-                        }
-                        goto ScalarBlock2;
-                    }
-#line 2474 "<stdout>"
-yy209:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy225;
-	default:	goto yy210;
-	}
-yy210:
-#line 1070 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
-                        goto ScalarBlock2;
-                    }
-#line 2485 "<stdout>"
-yy211:	++YYCURSOR;
-	goto yy212;
-yy212:
-#line 1032 "token.re"
-{   lvl = CURRENT_LEVEL();
-                        if ( lvl->status != syck_lvl_block )
-                        {
-                            eat_comments( parser );
-                            YYTOKEN = YYCURSOR;
-                        }
-                        else
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
-                        }
-                        goto ScalarBlock2;
-                    }
-#line 2502 "<stdout>"
-yy213:	++YYCURSOR;
-	goto yy214;
-yy214:
-#line 1046 "token.re"
-{   YYCURSOR--;
-                        POP_LEVEL();
-                        RETURN_YAML_BLOCK(); 
-                    }
-#line 2511 "<stdout>"
-yy215:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '-':	goto yy217;
-	default:	goto yy210;
-	}
-yy216:	yych = *++YYCURSOR;
-	goto yy210;
-yy217:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy219;
-	default:	goto yy218;
-	}
-yy218:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy208;
-	case 1:	goto yy210;
-	}
-yy219:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy220;
-	case 0x0D:	goto yy224;
-	case ' ':	goto yy222;
-	default:	goto yy218;
-	}
-yy220:	++YYCURSOR;
-	goto yy221;
-yy221:
-#line 1051 "token.re"
-{   if ( YYTOKEN == YYLINEPTR )
-                        {
-                            if ( blockType == BLOCK_FOLD && qidx > 0 )
-                            {
-                                qidx -= 1;
-                            }
-                            QUOTECAT(qstr, qcapa, qidx, '\n');
-                            POP_LEVEL();
-                            YYCURSOR = YYTOKEN;
-                            RETURN_YAML_BLOCK();
-                        }
-                        else
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
-                            YYCURSOR = YYTOKEN + 1;
-                            goto ScalarBlock2;
-                        }
-                    }
-#line 2559 "<stdout>"
-yy222:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy223;
-yy223:	switch(yych){
-	case ' ':	goto yy222;
-	default:	goto yy221;
-	}
-yy224:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy220;
-	default:	goto yy218;
-	}
-yy225:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy226;
-yy226:	switch(yych){
-	case 0x0A:	case ' ':	goto yy225;
-	case 0x0D:	goto yy227;
-	default:	goto yy208;
-	}
-yy227:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy225;
-	default:	goto yy218;
-	}
-}
-#line 1075 "token.re"
-
-    }
-
-    return 0;
-
-}
-
-void
-eat_comments( SyckParser *parser )
-{
-Comment:
-    {
-        YYTOKEN = YYCURSOR;
-
-
-#line 2607 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy228;
-	++YYCURSOR;
-yy228:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy230;
-	case 0x0A:	goto yy232;
-	case 0x0D:	goto yy233;
-	default:	goto yy235;
-	}
-yy230:	++YYCURSOR;
-	goto yy231;
-yy231:
-#line 1091 "token.re"
-{   YYCURSOR = YYTOKEN;
-                        return;
-                    }
-#line 2629 "<stdout>"
-yy232:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy237;
-yy233:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy236;
-	default:	goto yy234;
-	}
-yy234:
-#line 1095 "token.re"
-{   goto Comment; 
-                    }
-#line 2642 "<stdout>"
-yy235:	yych = *++YYCURSOR;
-	goto yy234;
-yy236:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy237;
-yy237:	switch(yych){
-	case 0x0A:	goto yy236;
-	case 0x0D:	goto yy238;
-	default:	goto yy231;
-	}
-yy238:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy236;
-	default:	goto yy239;
-	}
-yy239:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy231;
-	}
-}
-#line 1098 "token.re"
-
-
-    }
-
-}
-
-char
-escape_seq( char ch )
-{
-    switch ( ch )
-    {
-        case '0': return '\0';
-        case 'a': return 7;
-        case 'b': return '\010';
-        case 'e': return '\033';
-        case 'f': return '\014';
-        case 'n': return '\n';
-        case 'r': return '\015';
-        case 't': return '\t';
-        case 'v': return '\013';
-        default: return ch;
-    }
-}
-
-int
-is_newline( char *ptr )
-{
-    return newline_len( ptr );
-}
-
-int
-newline_len( char *ptr )
-{
-    if ( *ptr == '\n' )
-        return 1;
-    
-    if ( *ptr == '\r' && *( ptr + 1 ) == '\n' )
-        return 2;
-
-    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 01a3aaf652..0000000000
--- a/ext/syck/yaml2byte.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * yaml2byte.c
- *
- * $Author: matz $
- * $Date: 2006/05/03 17:41:10 $
- *
- * 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 "ruby.h"
-#include <syck.h>
-#include <assert.h>
-#define YAMLBYTE_UTF8
-#include "yamlbyte.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);
-	    S_FREE(type_tag);
-        }
-    }
-    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 );
-
-    if ( syck_lookup_sym( parser, oid, (char **)&sav ) == 1 ) {
-        ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
-        ret[0] = '\0';
-        strcat( ret, "D\n" );
-        strcat( ret, sav->buffer );
-    }
-    else
-    {
-        ret = NULL;
-    }
-
-    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/MANIFEST b/ext/syslog/MANIFEST
new file mode 100644
index 0000000000..b5306034b7
--- /dev/null
+++ b/ext/syslog/MANIFEST
@@ -0,0 +1,6 @@
+MANIFEST
+extconf.rb
+syslog.c
+syslog.txt
+test.rb
+depend
diff --git a/ext/syslog/extconf.rb b/ext/syslog/extconf.rb
index d47ed8fd61..0fa0bc339b 100644
--- a/ext/syslog/extconf.rb
+++ b/ext/syslog/extconf.rb
@@ -1,5 +1,5 @@
 # $RoughId: extconf.rb,v 1.3 2001/11/24 17:49:26 knu Exp $
-# $Id: extconf.rb,v 1.1 2001/11/26 12:00:40 knu Exp $
+# $Id$
 
 require 'mkmf'
 
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index 99e4215a95..5ee2c6b89a 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -4,11 +4,10 @@
  * <amos+ruby@utdallas.edu>
  *
  * $RoughId: syslog.c,v 1.21 2002/02/25 12:21:17 knu Exp $
- * $Id: syslog.c,v 1.8.2.1 2004/04/05 07:45:24 matz Exp $
+ * $Id$
  */
 
 #include "ruby.h"
-#include "util.h"
 #include <syslog.h>
 
 /* Syslog class */
@@ -146,7 +145,7 @@ static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
     VALUE pri;
 
     if (argc < 2) {
-        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2+)", argc);
+        rb_raise(rb_eArgError, "wrong # of arguments(%d for 2+)", argc);
     }
 
     argc--;
diff --git a/ext/syslog/syslog.txt b/ext/syslog/syslog.txt
index b134ed2a40..9aed35133d 100644
--- a/ext/syslog/syslog.txt
+++ b/ext/syslog/syslog.txt
@@ -1,6 +1,6 @@
 .\" syslog.txt -  -*- Indented-Text -*-
 $RoughId: syslog.txt,v 1.18 2002/02/25 08:20:14 knu Exp $
-$Id: syslog.txt,v 1.2 2002/02/25 12:13:30 knu Exp $
+$Id$
 
 UNIX Syslog extension for Ruby
 Amos Gouaux, University of Texas at Dallas
diff --git a/ext/syslog/test.rb b/ext/syslog/test.rb
index 907602c21d..cfa33eff8f 100644
--- a/ext/syslog/test.rb
+++ b/ext/syslog/test.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # $RoughId: test.rb,v 1.9 2002/02/25 08:20:14 knu Exp $
-# $Id: test.rb,v 1.4 2002/11/27 08:36:22 knu Exp $
+# $Id$
 
 # Please only run this test on machines reasonable for testing.
 # If in doubt, ask your admin.
diff --git a/ext/tk/tkutil/.cvsignore b/ext/tcltklib/.cvsignore
index 90c83ed9b1..90c83ed9b1 100644
--- a/ext/tk/tkutil/.cvsignore
+++ b/ext/tcltklib/.cvsignore
diff --git a/ext/tcltklib/MANIFEST b/ext/tcltklib/MANIFEST
new file mode 100644
index 0000000000..4e37fb900f
--- /dev/null
+++ b/ext/tcltklib/MANIFEST
@@ -0,0 +1,16 @@
+MANIFEST
+README.euc
+MANUAL.euc
+tcltklib.c
+stubs.c
+depend
+extconf.rb
+lib/tcltk.rb
+demo/lines1.rb
+demo/lines0.tcl
+demo/lines2.rb
+sample/sample1.rb
+sample/sample2.rb
+sample/maru.gif
+sample/batsu.gif
+sample/sample0.rb
diff --git a/ext/tcltklib/MANUAL.euc b/ext/tcltklib/MANUAL.euc
new file mode 100644
index 0000000000..789e85a9de
--- /dev/null
+++ b/ext/tcltklib/MANUAL.euc
@@ -0,0 +1,124 @@
+(tof)
+	MANUAL.euc
+		Sep. 19, 1997	Y. Shigehiro
+
+�ʲ�, ��tcl/tk�פȤ���ɽ����, tclsh �� wish ��¸����Ƥ���, ���̤Ǥ���
+�Ȥ����� tcl/tk ��ؤ��ޤ�. ��tcltk �饤�֥���, ��tcltklib �饤�֥�
+��פȤ���ɽ����, �ܥѥå������˴ޤޤ�� ruby �ѤΥ饤�֥���ؤ��ޤ�.
+
+<< tcltk �饤�֥�� >>
+
+tcl/tk �� C �饤�֥������Ѥ��뤿��ι�(��?)��।�󥿡��ե���������
+�����ޤ�.
+
+���Υ饤�֥��� ruby ���� tcl/tk �饤�֥������Ѥ��뤿��Τ�Τ�, ��
+���� tcltklib �饤�֥������Ѥ��Ƥ��ޤ�.
+
+[����]
+
+tcl/tk ���󥿥ץ꥿�Ǥ�, ���������åȤ˲����ؼ�������ˤ�, ����������
+��̾��³���ƥѥ�᡼����񤭤ޤ�. �������ä�, ���������åȤ����֥�����
+�ȤǤ���, ������Ф��ƥ᥽�åɤ����äƤ���, �Ȥߤʤ����Ȥ��Ǥ��ޤ�. ��
+��, tcl/tk ���󥿥ץ꥿�Ǥ�, �Ȥ߹��ߥ��ޥ�ɤ�, ���ҤΥ��������åȤ�
+Ʊ���褦�ʽ񼰤�̿��Ǽ¹Ԥ���ޤ�. ���ʤ��, ���ޥ�ɤ⥪�֥������Ȥ�
+����ȹͤ��뤳�Ȥ��Ǥ��ޤ�.
+
+���Τ褦�ʹͤ��˴�Ť�, tcltk �饤�֥��Ǥ�, tcl/tk �Υ��ޥ�ɤ䥦��
+�����åȤ��б����륪�֥������Ȥ��������ޤ�. ���֥������Ȥ��Ф���᥽��
+�ɸƤӽФ���, e() �᥽�åɤˤ��¹Ԥ���ޤ�. �㤨��, tcl/tk �� info 
+���ޥ�ɤ��б����� ruby �Υ��֥������Ȥ� info �Ȥ���̾���Ǥ���Ȥ����,
+tcl/tk ��
+	info commands
+�Ȥ���̿��� tcltk �饤�֥��Ǥ�
+	info.e("commands")
+�ȵ��Ҥ���ޤ�. �ޤ�, ��.�פȤ������������å� (wish �¹Ի��˼�ưŪ����
+�������롼�ȥ��������å�) ���б����� ruby �Υ��֥������Ȥ� root �Ȥ�
+��̾���Ǥ���Ȥ����,
+	. configure -height 300 -width 300
+�Ȥ��� tcl/tk ��̿���
+	root.e("configure -height 300 -width 300")
+�ȵ��Ҥ���ޤ�. ���Τ褦�ʵ��Ҥ�, ������ˤ�����������ޤ���, ������, 
+������ץȤ��ɤ�ͤˤϸ��Ť餤�����Τ�ޤ���, �ºݤ˥�����ץȤ��
+�Ƥߤ��ͽ�۳��˼�ڤǤ�.
+
+[����ˡ]
+
+1. �饤�֥����ɤ߹���.
+     require "tcltk"
+
+2. tcl/tk ���󥿥ץ꥿����������.
+     ip = TclTkInterpreter.new()
+
+3. tcl/tk �Υ��ޥ�ɤ��б����륪�֥������Ȥ��ѿ����������Ƥ���.
+     # ���ޥ�ɤ��б����륪�֥������Ȥ����ä� Hash ����Ф�.
+     c = ip.commands()
+     # �Ȥ��������ޥ�ɤ��б����륪�֥������Ȥ���̤��ѿ�����������.
+     bind, button, info, wm = c.indexes("bind", "button", "info", "wm")
+
+4. ɬ�פʽ�����Ԥ�.
+     �ܤ�����, ����ץ�򻲾ȤΤ���.
+
+5. �������Ǥ�����, ���٥�ȥ롼�פ�����.
+     TclTk.mainloop()
+
+(( �ʲ�, �⥸�塼��, ���饹�����������ͽ��.))
+
+
+
+<< tcltklib �饤�֥�� >>
+
+tcl/tk �� C �饤�֥������Ѥ��뤿������।�󥿡��ե��������󶡤���
+��.
+
+����ѥ���/�¹Ԥˤ�, tcl/tk �� C �饤�֥�꤬ɬ�פǤ�.
+
+[����]
+
+���Υ饤�֥����Ѥ����, ruby ���� tcl/tk �� C �饤�֥������ѤǤ���
+��. ����Ū�ˤ�, ruby ���󥿥ץ꥿���� tcl/tk ���󥿥ץ꥿��ƤӽФ���
+�Ȥ��Ǥ��ޤ�. �����, ����(ruby ���󥿥ץ꥿����ƤӽФ���) tcl/tk ��
+�󥿥ץ꥿����, �դ� ruby ���󥿥ץ꥿��ƤӽФ����Ȥ�Ǥ��ޤ�.
+
+[����ˡ]
+
+require "tcltklib" �����, �ʲ��Υ⥸�塼��, ���饹�����Ѳ�ǽ�Ǥ�.
+
+�⥸�塼�� TclTkLib
+    tcl/tk �饤�֥���ƤӽФ��᥽�åɤ򽸤᤿�⥸�塼��Ǥ�. ������,
+    tcl/tk ���󥿥ץ꥿�ط��Υ᥽�åɤϥ��饹 TclTkIp �ˤ���ޤ�.
+
+  �⥸�塼��᥽�å� mainloop()
+      Tk_MainLoop ��¹Ԥ��ޤ�. ���Ƥ� tk �Υ�����ɥ���̵���ʤ�Ƚ�λ
+      ���ޤ�(�㤨��, tcl/tk �ǽ񤯤Ȥ����� "destroy ." �򤷤������).
+    ����: ̵��
+    �����: nil
+
+���饹 TclTkIp
+    ���󥹥��󥹤� tcl/tk �Υ��󥿥ץ꥿���б����ޤ�. tcl/tk �Υ饤��
+    ���λ����̤�, ���󥹥��󥹤�ʣ�����������Ƥ�������ư��ޤ�(��
+    ��ʤ��Ȥ򤹤�ɬ�פϤ��ޤ�̵���Ϥ��Ǥ���). ���󥿥ץ꥿�� wish ��
+    tcl/tk ���ޥ�ɤ�¹ԤǤ��ޤ�. �����, �ʲ��Υ��ޥ�ɤ�¹ԤǤ���
+    ��.
+      ���ޥ�� ruby
+	������ ruby �Ǽ¹Ԥ��ޤ�(ruby_eval_string ��¹Ԥ��ޤ�). ����
+	�� 1 �ĤǤʤ���Фʤ�ޤ���. ����ͤ� ruby �μ¹Է�̤Ǥ�.
+	ruby �μ¹Է�̤� nil �� String �Ǥʤ���Фʤ�ޤ���.
+
+  ���饹�᥽�å� new()
+      TclTkIp ���饹�Υ��󥹥��󥹤��������ޤ�
+    ����: ̵��
+    ����� (TclTkIp): �������줿���󥹥���
+
+  �᥽�å� _eval(script)
+      ���󥿥ץ꥿�� script ��ɾ�����ޤ�(Tcl_Eval ��¹Ԥ��ޤ�). ����
+      �Τ褦��, ruby ���ޥ�ɤˤ�� script �⤫�� ruby ������ץȤ��
+      �ԤǤ��ޤ�.
+    ����: script (String) - ���󥿥ץ꥿��ɾ�����륹����ץ�ʸ����
+    ����� (String): ɾ����� ((Tcl_Interp *)->result)
+
+  �᥽�å� _return_value()
+      ľ���� Tcl_Eval ������ͤ��֤��ޤ�. 0(TCL_OK) �����ｪλ�Ǥ�.
+    ����: ̵��
+    ����� (Fixnum): ľ���� Tcl_Eval() ���֤�����.
+
+(eof)
diff --git a/ext/tk/old-README.tcltklib.eucj b/ext/tcltklib/README.euc
index fd75202c18..290ffb0b60 100644
--- a/ext/tk/old-README.tcltklib.eucj
+++ 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/tk/sample/tcltklib/lines0.tcl b/ext/tcltklib/demo/lines0.tcl
index 8ed3c5e1c1..8ed3c5e1c1 100644
--- a/ext/tk/sample/tcltklib/lines0.tcl
+++ b/ext/tcltklib/demo/lines0.tcl
diff --git a/ext/tk/sample/tcltklib/lines2.rb b/ext/tcltklib/demo/lines1.rb
index e459589f50..e459589f50 100644
--- a/ext/tk/sample/tcltklib/lines2.rb
+++ b/ext/tcltklib/demo/lines1.rb
diff --git a/ext/tk/sample/tcltklib/lines1.rb b/ext/tcltklib/demo/lines2.rb
index 9f21ae6377..9f21ae6377 100644
--- a/ext/tk/sample/tcltklib/lines1.rb
+++ b/ext/tcltklib/demo/lines2.rb
diff --git a/ext/tcltklib/depend b/ext/tcltklib/depend
new file mode 100644
index 0000000000..2cd9c400f7
--- /dev/null
+++ b/ext/tcltklib/depend
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000000..b4ecfad8fe
--- /dev/null
+++ b/ext/tcltklib/extconf.rb
@@ -0,0 +1,58 @@
+# extconf.rb for tcltklib
+
+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
+
+dir_config("tk")
+dir_config("tcl")
+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"
+  if tcllib
+    find_library(tcllib, func, *paths)
+  elsif find_library("tcl", func, *paths)
+    # ok
+  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)
+    }
+  end
+end
+
+def find_tk(tklib, stubs)
+  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+  func = stubs ? "Tk_InitStubs" : "Tk_Init"
+  if tklib
+    find_library(tklib, func, *paths)
+  elsif find_library("tk", func, *paths)
+    # ok
+  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)
+    }
+  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/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
+  create_makefile("tcltklib")
+end
diff --git a/ext/tk/lib/tcltk.rb b/ext/tcltklib/lib/tcltk.rb
index 1a6694dbff..54a00e8f3c 100644
--- a/ext/tk/lib/tcltk.rb
+++ b/ext/tcltklib/lib/tcltk.rb
@@ -1,7 +1,7 @@
 # tof
 
 #### tcltk library, more direct manipulation of tcl/tk
-####    Sep. 5, 1997    Y. Shigehiro
+####	Sep. 5, 1997	Y. Shigehiro
 
 require "tcltklib"
 
@@ -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
@@ -103,14 +103,14 @@ class TclTkInterpreter
     def @ip._get_eval_string(*args)
       argstr = ""
       args.each{|arg|
-        argstr += " " if argstr != ""
-        # call to_eval if it is defined
-        if (arg.respond_to?(:to_eval))
-          argstr += arg.to_eval()
-        else
-          # call to_s unless defined
-          argstr += arg.to_s()
-        end
+	argstr += " " if argstr != ""
+	# call to_eval if it is defined
+	if (arg.respond_to?(:to_eval))
+	  argstr += arg.to_eval()
+	else
+	  # call to_s unless defined
+	  argstr += arg.to_s()
+	end
       }
       return argstr
     end
@@ -126,9 +126,9 @@ class TclTkInterpreter
       print("_eval: \"", argstr, "\"") if $DEBUG
       res = _eval(argstr)
       if $DEBUG
-        print(" -> \"", res, "\"\n")
+	print(" -> \"", res, "\"\n")
       elsif  _return_value() != 0
-        print(res, "\n")
+	print(res, "\n")
       end
       fail(%Q/can't eval "#{argstr}"/) if _return_value() != 0 #'
       return res
@@ -139,12 +139,12 @@ class TclTkInterpreter
     # for all commands registered in tcl/tk interpreter:
     @ip._eval("info command").split(/ /).each{|comname|
       if comname =~ /^[.]/
-        # if command is a widget (path), generate TclTkWidget,
-        # and register it in the hash
-        @commands[comname] = TclTkWidget.new(@ip, comname)
+	# if command is a widget (path), generate TclTkWidget,
+	# and register it in the hash
+	@commands[comname] = TclTkWidget.new(@ip, comname)
       else
-        # otherwise, generate TclTkCommand
-        @commands[comname] = TclTkCommand.new(@ip, comname)
+	# otherwise, generate TclTkCommand
+	@commands[comname] = TclTkCommand.new(@ip, comname)
       end
     }
   end
diff --git a/ext/tk/sample/tcltklib/batsu.gif b/ext/tcltklib/sample/batsu.gif
index 880cc73e09..880cc73e09 100644
--- a/ext/tk/sample/tcltklib/batsu.gif
+++ b/ext/tcltklib/sample/batsu.gif
diff --git a/ext/tk/sample/tcltklib/maru.gif b/ext/tcltklib/sample/maru.gif
index 2c0202892e..2c0202892e 100644
--- a/ext/tk/sample/tcltklib/maru.gif
+++ b/ext/tcltklib/sample/maru.gif
diff --git a/ext/tk/sample/tcltklib/sample0.rb b/ext/tcltklib/sample/sample0.rb
index cd4c8069b4..cd4c8069b4 100644
--- a/ext/tk/sample/tcltklib/sample0.rb
+++ b/ext/tcltklib/sample/sample0.rb
diff --git a/ext/tk/sample/tcltklib/sample1.rb b/ext/tcltklib/sample/sample1.rb
index 13df440751..21ee0f29d5 100644
--- a/ext/tk/sample/tcltklib/sample1.rb
+++ b/ext/tcltklib/sample/sample1.rb
@@ -24,7 +24,7 @@ class Test1
     c = ip.commands()
     # ���Ѥ��륳�ޥ�ɤ��б����륪�֥������Ȥ��ѿ�������Ƥ���.
     append, bind, button, destroy, incr, info, label, place, set, wm =
-      c.values_at(
+      c.indexes(
       "append", "bind", "button", "destroy", "incr", "info", "label", "place",
       "set", "wm")
 
@@ -136,7 +136,7 @@ class Test1
 
   # ����ץ�Τ���Υ��������åȤ���������.
   def sample(ip, parent)
-    bind, button, destroy, grid, toplevel, wm = ip.commands().values_at(
+    bind, button, destroy, grid, toplevel, wm = ip.commands().indexes(
       "bind", "button", "destroy", "grid", "toplevel", "wm")
 
     ## toplevel
@@ -189,8 +189,8 @@ class Test1
       grid.e(w, "-row", ro, "-column", co, "-sticky news")
       ro += 1
       if ro == 7
-        ro = 0
-        co += 1
+	ro = 0
+	co += 1
       end
     }
   end
@@ -207,7 +207,7 @@ class Test1
   #   parent: �ƥ��������å�
   #   title: toplevel ���������åȤΥ�����ɥ��Υ����ȥ�
   def inittoplevel(ip, parent, title)
-    bind, button, destroy, toplevel, wm = ip.commands().values_at(
+    bind, button, destroy, toplevel, wm = ip.commands().indexes(
       "bind", "button", "destroy", "toplevel", "wm")
 
     # ������������ɥ��򳫤��ˤ�, toplevel ��Ȥ�.
@@ -229,7 +229,7 @@ class Test1
 
   # label �Υ���ץ�.
   def test_label(ip, parent)
-    button, global, label, pack = ip.commands().values_at(
+    button, global, label, pack = ip.commands().indexes(
       "button", "global", "label", "pack")
     t1, b1, cb = inittoplevel(ip, parent, "label")
 
@@ -272,7 +272,7 @@ class Test1
 
   # button �Υ���ץ�.
   def test_button(ip, parent)
-    button, pack = ip.commands().values_at("button", "pack")
+    button, pack = ip.commands().indexes("button", "pack")
     t1, b1, cb = inittoplevel(ip, parent, "button")
 
     ## button
@@ -290,7 +290,7 @@ class Test1
 
   # checkbutton �Υ���ץ�.
   def test_checkbutton(ip, parent)
-    checkbutton, global, pack = ip.commands().values_at(
+    checkbutton, global, pack = ip.commands().indexes(
       "checkbutton", "global", "pack")
     t1, b1, cb = inittoplevel(ip, parent, "checkbutton")
 
@@ -306,7 +306,7 @@ class Test1
 
   # radiobutton �Υ���ץ�.
   def test_radiobutton(ip, parent)
-    global, label, pack, radiobutton = ip.commands().values_at(
+    global, label, pack, radiobutton = ip.commands().indexes(
       "global", "label", "pack", "radiobutton")
     t1, b1, cb = inittoplevel(ip, parent, "radiobutton")
 
@@ -330,7 +330,7 @@ class Test1
 
   # scale �Υ���ץ�.
   def test_scale(ip, parent)
-    global, pack, scale = ip.commands().values_at(
+    global, pack, scale = ip.commands().indexes(
       "global", "pack", "scale")
     t1, b1, cb = inittoplevel(ip, parent, "scale")
 
@@ -350,7 +350,7 @@ class Test1
 
   # entry �Υ���ץ�.
   def test_entry(ip, parent)
-    button, entry, global, pack = ip.commands().values_at(
+    button, entry, global, pack = ip.commands().indexes(
       "button", "entry", "global", "pack")
     t1, b1, cb = inittoplevel(ip, parent, "entry")
 
@@ -369,7 +369,7 @@ class Test1
 
   # text �Υ���ץ�.
   def test_text(ip, parent)
-    button, pack, text = ip.commands().values_at(
+    button, pack, text = ip.commands().indexes(
       "button", "pack", "text")
     t1, b1, cb = inittoplevel(ip, parent, "text")
 
@@ -385,7 +385,7 @@ class Test1
 
   # raise/lower �Υ���ץ�.
   def test_raise(ip, parent)
-    button, frame, lower, pack, raise = ip.commands().values_at(
+    button, frame, lower, pack, raise = ip.commands().indexes(
       "button", "frame", "lower", "pack", "raise")
     t1, b1, cb = inittoplevel(ip, parent, "raise/lower")
 
@@ -408,7 +408,7 @@ class Test1
   # modal �ʥ��������åȤΥ���ץ�.
   def test_modal(ip, parent)
     button, frame, message, pack, tk_chooseColor, tk_getOpenFile,
-      tk_messageBox = ip.commands().values_at(
+      tk_messageBox = ip.commands().indexes(
       "button", "frame", "message", "pack", "tk_chooseColor",
       "tk_getOpenFile", "tk_messageBox")
     # �ǽ�� load ����Ƥ��ʤ��饤�֥��� ip.commands() ��¸�ߤ��ʤ��Τ�,
@@ -451,7 +451,7 @@ class Test1
 
   # menu �Υ���ץ�.
   def test_menu(ip, parent)
-    global, menu, menubutton, pack = ip.commands().values_at(
+    global, menu, menubutton, pack = ip.commands().indexes(
       "global", "menu", "menubutton", "pack")
     tk_optionMenu = TclTkLibCommand.new(ip, "tk_optionMenu")
     t1, b1, cb = inittoplevel(ip, parent, "menu")
@@ -498,7 +498,7 @@ class Test1
   # listbox �Υ���ץ�.
   def test_listbox(ip, parent)
     clipboard, frame, grid, listbox, lower, menu, menubutton, pack, scrollbar,
-      selection = ip.commands().values_at(
+      selection = ip.commands().indexes(
       "clipboard", "frame", "grid", "listbox", "lower", "menu", "menubutton",
       "pack", "scrollbar", "selection")
     t1, b1, cb = inittoplevel(ip, parent, "listbox")
@@ -559,7 +559,7 @@ class Test1
 
   # canvas �Υ���ץ�.
   def test_canvas(ip, parent)
-    canvas, lower, pack = ip.commands().values_at("canvas", "lower", "pack")
+    canvas, lower, pack = ip.commands().indexes("canvas", "lower", "pack")
     t1, b1, cb = inittoplevel(ip, parent, "canvas")
 
     ## canvas
diff --git a/ext/tcltklib/sample/sample2.rb b/ext/tcltklib/sample/sample2.rb
new file mode 100644
index 0000000000..969d8de09a
--- /dev/null
+++ b/ext/tcltklib/sample/sample2.rb
@@ -0,0 +1,449 @@
+#!/usr/local/bin/ruby
+#----------------------> pretty simple othello game <-----------------------
+# othello.rb
+#
+# version 0.3
+# maeda shugo (shuto@po.aianet.ne.jp)
+#---------------------------------------------------------------------------
+
+#	Sep. 17, 1997	modified by Y. Shigehiro for tcltk library
+#	   maeda shugo (shugo@po.aianet.ne.jp) ��ˤ��
+#          (ruby/tk �ǽ񤫤�Ƥ���) ruby �Υ���ץ�ץ������
+#		http://www.aianet.or.jp/~shugo/ruby/othello.rb.gz
+#	   �� tcltk �饤�֥���Ȥ��褦��, ����Ū���ѹ����Ƥߤޤ���.
+#
+#	   �ʤ�٤����ꥸ�ʥ��Ʊ���ˤʤ�褦�ˤ��Ƥ���ޤ�.
+
+require "observer"
+require "tcltk"
+$ip = TclTkInterpreter.new()
+$root = $ip.rootwidget()
+$button, $canvas, $checkbutton, $frame, $label, $pack, $update, $wm =
+   $ip.commands().indexes(
+   "button", "canvas", "checkbutton", "frame", "label", "pack", "update", "wm")
+
+class Othello
+   
+   EMPTY = 0
+   BLACK = 1
+   WHITE = - BLACK
+   
+   attr :in_com_turn
+   attr :game_over
+   
+   class Board
+   
+      include Observable
+      
+      DIRECTIONS = [
+	 [-1, -1], [-1, 0], [-1, 1],
+	 [ 0, -1],          [ 0, 1],
+	 [ 1, -1], [ 1, 0], [ 1, 1]
+      ]
+      
+      attr :com_disk, TRUE
+   
+      def initialize(othello)
+	 @othello = othello
+	 reset
+      end
+   
+      def notify_observers(*arg)
+	 if @observer_peers != nil
+	    super(*arg)
+	 end
+      end
+      
+      def reset
+	 @data = [
+	    [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
+	    [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
+	    [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
+	    [EMPTY, EMPTY, EMPTY, WHITE, BLACK, EMPTY, EMPTY, EMPTY],
+	    [EMPTY, EMPTY, EMPTY, BLACK, WHITE, EMPTY, EMPTY, EMPTY],
+	    [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
+	    [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
+	    [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY]
+	 ]
+	 changed
+	 notify_observers
+      end
+      
+      def man_disk
+	 return - @com_disk
+      end
+      
+      def other_disk(disk)
+	 return - disk
+      end
+      
+      def get_disk(row, col)
+	 return @data[row][col]
+      end
+      
+      def reverse_to(row, col, my_disk, dir_y, dir_x)
+	 y = row
+	 x = col
+	 begin
+	    y += dir_y
+	    x += dir_x
+	    if y < 0 || x < 0 || y > 7 || x > 7 ||
+		  @data[y][x] == EMPTY
+	       return
+	    end
+	 end until @data[y][x] == my_disk
+	 begin
+	    @data[y][x] = my_disk
+	    changed
+	    notify_observers(y, x)
+	    y -= dir_y
+	    x -= dir_x
+	 end until y == row && x == col
+      end
+      
+      def put_disk(row, col, disk)
+	 @data[row][col] = disk
+	 changed
+	 notify_observers(row, col)
+	 DIRECTIONS.each do |dir|
+	    reverse_to(row, col, disk, *dir)
+	 end
+      end
+      
+      def count_disk(disk)
+	 num = 0
+	 @data.each do |rows|
+	    rows.each do |d|
+	       if d == disk
+		  num += 1
+	       end
+	    end
+	 end
+	 return num
+      end
+      
+      def count_point_to(row, col, my_disk, dir_y, dir_x)
+	 return 0 if @data[row][col] != EMPTY
+	 count = 0
+	 loop do
+	    row += dir_y
+	    col += dir_x
+	    break if row < 0 || col < 0 || row > 7 || col > 7
+	    case @data[row][col]
+	    when my_disk
+	       return count
+	    when other_disk(my_disk)
+	       count += 1
+	    when EMPTY
+	       break
+	    end
+	 end
+	 return 0
+      end
+      
+      def count_point(row, col, my_disk)
+	 count = 0
+	 DIRECTIONS.each do |dir|
+	    count += count_point_to(row, col, my_disk, *dir)
+	 end
+	 return count
+      end
+      
+      def corner?(row, col)
+	 return (row == 0 && col == 0) ||
+	    (row == 0 && col == 7) ||
+	    (row == 7 && col == 0) ||
+	    (row == 7 && col == 7)
+      end
+      
+      def search(my_disk)
+	 max = 0
+	 max_row = nil
+	 max_col = nil
+	 for row in 0 .. 7
+	    for col in 0 .. 7
+	       buf = count_point(row, col, my_disk)
+	       if (corner?(row, col) && buf > 0) || max < buf
+		  max = buf
+		  max_row = row
+		  max_col = col
+	       end
+	    end
+	 end
+	 return max_row, max_col
+      end
+   end #--------------------------> class Board ends here
+   
+   class BoardView < TclTkWidget
+      
+      BACK_GROUND_COLOR = "DarkGreen"
+      HILIT_BG_COLOR = "green"
+      BORDER_COLOR = "black"
+      BLACK_COLOR = "black"
+      WHITE_COLOR = "white"
+      STOP_COLOR = "red"
+      
+      attr :left
+      attr :top
+      attr :right
+      attr :bottom
+      
+      class Square
+	 
+	 attr :oval, TRUE
+	 attr :row
+	 attr :col
+	 
+	 def initialize(view, row, col)
+	    @view = view
+	    @id = @view.e("create rectangle", *view.tk_rect(view.left + col,
+				      view.top + row,
+				      view.left + col + 1,
+				      view.top + row + 1))
+	    @row = row
+	    @col = col
+	    @view.e("itemconfigure", @id,
+	      "-width 0.5m -outline #{BORDER_COLOR}")
+	    @view.e("bind", @id, "<Any-Enter>", TclTkCallback.new($ip, proc{
+	       if @oval == nil
+		  view.e("itemconfigure", @id, "-fill #{HILIT_BG_COLOR}")
+	       end
+	    }))
+	    @view.e("bind", @id, "<Any-Leave>", TclTkCallback.new($ip, proc{
+	       view.e("itemconfigure", @id, "-fill #{BACK_GROUND_COLOR}")
+	    }))
+	    @view.e("bind", @id, "<ButtonRelease-1>", TclTkCallback.new($ip,
+	       proc{
+	       view.click_square(self)
+	    }))
+	 end
+	 
+	 def blink(color)
+	    @view.e("itemconfigure", @id, "-fill #{color}")
+	    $update.e()
+	    sleep(0.1)
+	    @view.e("itemconfigure", @id, "-fill #{BACK_GROUND_COLOR}")
+	 end
+      end #-----------------------> class Square ends here
+   
+      def initialize(othello, board)
+	 super($ip, $root, $canvas)
+	 @othello = othello
+	 @board = board
+	 @board.add_observer(self)
+	 
+	 @squares = Array.new(8)
+	 for i in 0 .. 7
+	    @squares[i] = Array.new(8)
+	 end
+	 @left = 1
+	 @top = 0.5
+	 @right = @left + 8
+	 @bottom = @top + 8
+	 
+	 i = self.e("create rectangle", *tk_rect(@left, @top, @right, @bottom))
+	 self.e("itemconfigure", i,
+	    "-width 1m -outline #{BORDER_COLOR} -fill #{BACK_GROUND_COLOR}")
+
+	 for row in 0 .. 7
+	    for col in 0 .. 7
+	       @squares[row][col] = Square.new(self, row, col)
+	    end
+	 end
+	 
+	 update
+      end
+      
+      def tk_rect(left, top, right, bottom)
+	 return left.to_s + "c", top.to_s + "c",
+	    right.to_s + "c", bottom.to_s + "c"
+      end
+      
+      def clear
+	 each_square do |square|
+	    if square.oval != nil
+	       self.e("delete", square.oval)
+	       square.oval = nil
+	    end
+	 end
+      end
+      
+      def draw_disk(row, col, disk)
+	 if disk == EMPTY
+	    if @squares[row][col].oval != nil
+	       self.e("delete", @squares[row][col].oval)
+	       @squares[row][col].oval = nil
+	    end
+	    return
+	 end
+	    
+	 $update.e()
+	 sleep(0.05)
+	 oval = @squares[row][col].oval
+	 if oval == nil
+	    oval = self.e("create oval", *tk_rect(@left + col + 0.2,
+					   @top + row + 0.2,
+					   @left + col + 0.8,
+					   @top + row + 0.8))
+	    @squares[row][col].oval = oval
+	 end
+	 case disk
+	 when BLACK
+	    color = BLACK_COLOR
+	 when WHITE
+	    color = WHITE_COLOR
+	 else
+	    fail format("Unknown disk type: %d", disk)
+	 end
+	 self.e("itemconfigure", oval, "-outline #{color} -fill #{color}")
+      end
+      
+      def update(row = nil, col = nil)
+	 if row && col
+	    draw_disk(row, col, @board.get_disk(row, col))
+	 else
+	    each_square do |square|
+	       draw_disk(square.row, square.col,
+			 @board.get_disk(square.row, square.col))
+	    end
+	 end
+	 @othello.show_point
+      end
+      
+      def each_square
+	 @squares.each do |rows|
+	    rows.each do |square|
+	       yield(square)
+	    end
+	 end
+      end
+      
+      def click_square(square)
+	 if @othello.in_com_turn || @othello.game_over ||
+	       @board.count_point(square.row,
+				  square.col,
+				  @board.man_disk) == 0
+	    square.blink(STOP_COLOR)
+	    return
+	 end
+	 @board.put_disk(square.row, square.col, @board.man_disk)
+	 @othello.com_turn
+      end
+      
+      private :draw_disk
+      public :update
+   end #----------------------> class BoardView ends here
+   
+   def initialize
+      @msg_label = TclTkWidget.new($ip, $root, $label)
+      $pack.e(@msg_label)
+      
+      @board = Board.new(self)
+      @board_view = BoardView.new(self, @board)
+      #### added by Y. Shigehiro
+      ## board_view ���礭�������ꤹ��.
+      x1, y1, x2, y2 = @board_view.e("bbox all").split(/ /).collect{|i| i.to_f}
+      @board_view.e("configure -width", x2 - x1)
+      @board_view.e("configure -height", y2 - y1)
+      ## scrollregion �����ꤹ��.
+      @board_view.e("configure -scrollregion {", @board_view.e("bbox all"),
+	 "}")
+      #### �����ޤ�
+      $pack.e(@board_view, "-fill both -expand true")
+      
+      panel = TclTkWidget.new($ip, $root, $frame)
+      
+      @play_black = TclTkWidget.new($ip, panel, $checkbutton,
+        "-text {com is black} -command", TclTkCallback.new($ip, proc{
+	 switch_side
+      }))
+      $pack.e(@play_black, "-side left")
+            
+      quit = TclTkWidget.new($ip, panel, $button, "-text Quit -command",
+	 TclTkCallback.new($ip, proc{
+	 exit
+      }))
+      $pack.e(quit, "-side right -fill x")
+      
+      reset = TclTkWidget.new($ip, panel, $button, "-text Reset -command",
+	 TclTkCallback.new($ip, proc{
+	 reset_game
+      }))
+      $pack.e(reset, "-side right -fill x")
+      
+      $pack.e(panel, "-side bottom -fill x")
+      
+#      root = Tk.root
+      $wm.e("title", $root, "Othello")
+      $wm.e("iconname", $root, "Othello")
+      
+      @board.com_disk = WHITE
+      @game_over = FALSE
+      
+      TclTk.mainloop
+   end
+   
+   def switch_side
+      if @in_com_turn
+	 @play_black.e("toggle")
+      else
+	 @board.com_disk = @board.man_disk
+	 com_turn unless @game_over
+      end
+   end
+   
+   def reset_game
+      if @board.com_disk == BLACK
+	 @board.com_disk = WHITE
+	 @play_black.e("toggle")
+      end
+      @board_view.clear
+      @board.reset
+      $wm.e("title", $root, "Othello")
+      @game_over = FALSE
+   end
+      
+   def com_turn
+      @in_com_turn = TRUE
+      $update.e()
+      sleep(0.5)
+      begin
+	 com_disk = @board.count_disk(@board.com_disk)
+	 man_disk = @board.count_disk(@board.man_disk)
+	 if @board.count_disk(EMPTY) == 0
+	    if man_disk == com_disk
+	       $wm.e("title", $root, "{Othello - Draw!}")
+	    elsif man_disk > com_disk
+	       $wm.e("title", $root, "{Othello - You Win!}")
+	    else
+	       $wm.e("title", $root, "{Othello - You Loose!}")
+	    end
+	    @game_over = TRUE
+	    break
+	 elsif com_disk == 0
+	    $wm.e("title", $root, "{Othello - You Win!}")
+	    @game_over = TRUE
+	    break
+	 elsif man_disk == 0
+	    $wm.e("title", $root, "{Othello - You Loose!}")
+	    @game_over = TRUE
+	    break
+	 end
+	 row, col = @board.search(@board.com_disk)
+	 break if row == nil || col == nil
+	 @board.put_disk(row, col, @board.com_disk)
+      end while @board.search(@board.man_disk) == [nil, nil]
+      @in_com_turn = FALSE
+   end
+
+   def show_point
+      black = @board.count_disk(BLACK)
+      white = @board.count_disk(WHITE)
+      @msg_label.e("configure -text",
+	 %Q/{#{format("BLACK: %.2d    WHITE: %.2d", black, white)}}/)
+   end
+end #----------------------> class Othello ends here
+
+Othello.new
+
+#----------------------------------------------> othello.rb ends here
diff --git a/ext/tcltklib/stubs.c b/ext/tcltklib/stubs.c
new file mode 100644
index 0000000000..f394d6fc74
--- /dev/null
+++ b/ext/tcltklib/stubs.c
@@ -0,0 +1,94 @@
+#if defined USE_TCL_STUBS && defined USE_TK_STUBS
+#include <tcl.h>
+#include <tk.h>
+#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
+
+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
new file mode 100644
index 0000000000..95abb5a8c1
--- /dev/null
+++ b/ext/tcltklib/tcltklib.c
@@ -0,0 +1,903 @@
+/*
+ *	tcltklib.c
+ *		Aug. 27, 1997	Y. Shigehiro
+ *		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>
+#include <string.h>
+#include <tcl.h>
+#include <tk.h>
+
+#ifdef __MACOS__
+# include <tkMac.h>
+# include <Quickdraw.h>
+#endif
+
+/* for ruby_debug */
+
+#define DUMP1(ARG1) if (ruby_debug) { fprintf(stderr, "tcltklib: %s\n", ARG1);}
+#define DUMP2(ARG1, ARG2) if (ruby_debug) { fprintf(stderr, "tcltklib: ");\
+fprintf(stderr, ARG1, ARG2); fprintf(stderr, "\n"); }
+/*
+#define DUMP1(ARG1)
+#define DUMP2(ARG1, ARG2)
+*/
+
+/* for callback break & continue */
+static VALUE eTkCallbackBreak;
+static VALUE eTkCallbackContinue;
+
+static VALUE ip_invoke_real _((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.
+ */
+
+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 thread;
+};
+ 
+static VALUE main_thread;
+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.
+ */
+static int tick_counter;
+#define DEFAULT_EVENT_LOOP_MAX  800
+#define DEFAULT_NO_EVENT_TICK    10
+#define DEFAULT_TIMER_TICK        0
+static int event_loop_max = DEFAULT_EVENT_LOOP_MAX;
+static int no_event_tick  = DEFAULT_NO_EVENT_TICK;
+static int timer_tick     = DEFAULT_TIMER_TICK;
+
+#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
+
+/* Tk_ThreadTimer */
+static Tcl_TimerToken timer_token = (Tcl_TimerToken)NULL;
+
+/* timer callback */
+static void _timer_for_tcl _((ClientData));
+static void
+_timer_for_tcl(clientData)
+    ClientData clientData;
+{
+    struct invoke_queue *q, *tmp;
+    VALUE thread;
+
+    Tk_DeleteTimerHandler(timer_token);
+    if (timer_tick > 0) {
+      timer_token = Tk_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+					  (ClientData)0);
+    } else {
+      timer_token = (Tcl_TimerToken)NULL;
+    }
+
+    /* rb_thread_schedule(); */
+    timer_tick += event_loop_max;
+}
+
+static VALUE
+set_eventloop_tick(self, tick)
+    VALUE self;
+    VALUE tick;
+{
+    int ttick = NUM2INT(tick);
+
+    if (ttick < 0) {
+      rb_raise(rb_eArgError, "timer-tick parameter must be 0 or plus number");
+    }
+
+    /* delete old timer callback */
+    Tk_DeleteTimerHandler(timer_token);
+
+    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
+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);
+
+    if (lpmax <= 0 || no_ev <= 0) {
+      rb_raise(rb_eArgError, "weight parameters must be plus number");
+    }
+
+    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));
+}
+
+VALUE
+lib_mainloop_core(check_root_widget)
+    VALUE check_root_widget;
+{
+    VALUE current = eventloop_thread;
+    int check = (check_root_widget == Qtrue);
+
+    Tk_DeleteTimerHandler(timer_token);
+    if (timer_tick > 0) {
+      timer_token = Tk_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+					  (ClientData)0);
+    } else {
+      timer_token = (Tcl_TimerToken)NULL;
+    }
+
+    for(;;) {
+      tick_counter = 0;
+      while(tick_counter < event_loop_max) {
+        if (Tcl_DoOneEvent(TCL_ALL_EVENTS | TCL_DONT_WAIT)) {
+          tick_counter++;
+	} else {
+          tick_counter += no_event_tick;
+	}
+	if (watchdog_thread != 0 && eventloop_thread != current) {
+	  return Qnil;
+	}
+      }
+      if (check && Tk_GetNumMainWindows() == 0) {
+	break;
+      }
+      rb_thread_schedule();
+    }
+    return Qnil;
+}
+
+VALUE
+lib_mainloop_ensure(parent_evloop)
+    VALUE parent_evloop;
+{
+    Tk_DeleteTimerHandler(timer_token);
+    timer_token = (Tcl_TimerToken)NULL;
+    DUMP2("mainloop-ensure: current-thread : %lx\n", rb_thread_current());
+    DUMP2("mainloop-ensure: eventloop-thread : %lx\n", eventloop_thread);
+    if (eventloop_thread == rb_thread_current()) {
+      DUMP2("tcltklib: eventloop-thread -> %lx\n", parent_evloop);
+      eventloop_thread = parent_evloop;
+    }
+    return Qnil;
+}
+
+static VALUE
+lib_mainloop_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_mainloop_core, check_rootwidget, 
+		     lib_mainloop_ensure, parent_evloop);
+}
+
+/* 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_mainloop_launcher(check_rootwidget);
+}
+
+VALUE
+lib_watchdog_core(check_rootwidget)
+    VALUE check_rootwidget;
+{
+    VALUE current = eventloop_thread;
+    VALUE evloop;
+    int   check = (check_rootwidget == Qtrue);
+    ID    stop = rb_intern("stop?");
+
+    /* check other watchdog thread */
+    if (watchdog_thread != 0) {
+      if (rb_funcall(watchdog_thread, stop, 0) == Qtrue) {
+	rb_funcall(watchdog_thread, rb_intern("kill"), 0);
+      } else {
+	return Qnil;
+      }
+    }
+    watchdog_thread = rb_thread_current();
+
+    /* watchdog start */
+    do {
+      if (eventloop_thread == 0 
+	  || rb_funcall(eventloop_thread, stop, 0) == Qtrue) {
+	/* start new eventloop thread */
+	DUMP2("eventloop thread %lx is sleeping or dead", eventloop_thread);
+	evloop = rb_thread_create(lib_mainloop_launcher, 
+				  (void*)&check_rootwidget);
+	DUMP2("create new eventloop thread %lx", evloop);
+	rb_thread_run(evloop);
+      } else {
+	rb_thread_schedule();
+      }
+    } while(!check || Tk_GetNumMainWindows() != 0);
+
+    return Qnil;
+}
+
+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
+lib_do_one_event(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE obj, vflags;
+    int flags;
+
+    if (rb_scan_args(argc, argv, "01", &vflags) == 0) {
+      flags = 0;
+    } else {
+      Check_Type(vflags, T_FIXNUM);
+      flags = FIX2INT(vflags);
+    }
+    return INT2NUM(Tcl_DoOneEvent(flags));
+}
+
+/*---- 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;
+}
+
+/* Tcl command `ruby' */
+static VALUE
+ip_eval_rescue(failed, einfo)
+    VALUE *failed;
+    VALUE einfo;
+{
+    *failed = einfo;
+    return Qnil;
+}
+
+/* restart Tk */
+static VALUE
+lib_restart(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    /* 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 */
+    DUMP1("Tk_Init");
+    if (Tk_Init(ptr->ip) == TCL_ERROR) {
+	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
+    }
+
+    return Qnil;
+}
+
+static int
+#if TCL_MAJOR_VERSION >= 8
+ip_ruby(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int argc;
+    Tcl_Obj *CONST argv[];
+#else
+ip_ruby(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int argc;
+    char *argv[];
+#endif
+{
+    VALUE res;
+    int old_trapflg;
+    VALUE failed = 0;
+    char *arg;
+    int  dummy;
+
+    /* ruby command has 1 arg. */
+    if (argc != 2) {
+	rb_raise(rb_eArgError, "wrong # of arguments (%d for 1)", argc);
+    }
+
+    /* get C string from Tcl object */
+#if TCL_MAJOR_VERSION >= 8
+    arg = Tcl_GetStringFromObj(argv[1], &dummy);
+#else
+    arg = argv[1];
+#endif
+
+    /* evaluate the argument string by ruby */
+    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, 0);
+    rb_trap_immediate = old_trapflg;
+
+    Tcl_ResetResult(interp);
+    if (failed) {
+        VALUE eclass = CLASS_OF(failed);
+	Tcl_AppendResult(interp, StringValuePtr(failed), (char*)NULL);
+        if (eclass == eTkCallbackBreak) {
+	    return TCL_BREAK;
+	} else if (eclass == eTkCallbackContinue) {
+	    return TCL_CONTINUE;
+	} else {
+	    return TCL_ERROR;
+	}
+    }
+
+    /* result must be string or nil */
+    if (NIL_P(res)) {
+	DUMP1("(rb_eval_string result) nil");
+	return TCL_OK;
+    }
+
+    /* copy result to the tcl interpreter */
+    DUMP2("(rb_eval_string result) %s", StringValuePtr(res));
+    DUMP1("Tcl_AppendResult");
+    Tcl_AppendResult(interp, StringValuePtr(res), (char *)NULL);
+
+    return TCL_OK;
+}
+
+/* destroy interpreter */
+static void
+ip_free(ptr)
+    struct tcltkip *ptr;
+{
+    DUMP1("Tcl_DeleteInterp");
+    if (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(self)
+    VALUE self;
+{
+    struct tcltkip *ptr;	/* tcltkip data struct */
+
+    /* create object */
+    Data_Get_Struct(self, struct tcltkip, ptr);
+    ptr = ALLOC(struct tcltkip);
+    DATA_PTR(self) = ptr;
+    ptr->return_value = 0;
+
+    /* from Tk_Main() */
+    DUMP1("Tcl_CreateInterp");
+    ptr->ip = Tcl_CreateInterp();
+    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);
+    }
+    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_CmdDeleteProc *)NULL);
+#else
+    DUMP1("Tcl_CreateCommand(\"ruby\")");
+    Tcl_CreateCommand(ptr->ip, "ruby", ip_ruby, (ClientData)NULL,
+		      (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    return self;
+}
+
+/* eval string in tcl by Tcl_Eval() */
+static VALUE
+ip_eval(self, str)
+    VALUE self;
+    VALUE str;
+{
+    char *s;
+    char *buf;			/* Tcl_Eval requires re-writable string region */
+    struct tcltkip *ptr = get_ip(self);
+
+    /* call Tcl_Eval() */
+    s = StringValuePtr(str);
+    buf = ALLOCA_N(char, strlen(s)+1);
+    strcpy(buf, s);
+    DUMP2("Tcl_Eval(%s)", buf);
+    ptr->return_value = Tcl_Eval(ptr->ip, buf);
+    if (ptr->return_value == TCL_ERROR) {
+	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
+    }
+    DUMP2("(TCL_Eval result) %d", ptr->return_value);
+
+    /* pass back the result (as string) */
+    return(rb_str_new2(ptr->ip->result));
+}
+
+
+static VALUE
+ip_toUTF8(self, str, encodename)
+    VALUE self;
+    VALUE str;
+    VALUE encodename;
+{
+#ifdef TCL_UTF_MAX
+    Tcl_Interp *interp;
+    Tcl_Encoding encoding;
+    Tcl_DString dstr;
+    struct tcltkip *ptr;
+    char *buf;
+
+    ptr = get_ip(self);
+    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);
+
+    Tcl_DStringInit(&dstr);
+    Tcl_DStringFree(&dstr);
+    Tcl_ExternalToUtfDString(encoding,buf,strlen(buf),&dstr);
+    str = rb_str_new2(Tcl_DStringValue(&dstr));
+
+    Tcl_FreeEncoding(encoding);
+    Tcl_DStringFree(&dstr);
+#endif
+    return str;
+}
+
+static VALUE
+ip_fromUTF8(self, str, encodename)
+    VALUE self;
+    VALUE str;
+    VALUE encodename;
+{
+#ifdef TCL_UTF_MAX
+    Tcl_Interp *interp;
+    Tcl_Encoding encoding;
+    Tcl_DString dstr;
+    struct tcltkip *ptr;
+    char *buf;
+
+    ptr = get_ip(self);
+    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);
+
+    Tcl_DStringInit(&dstr);
+    Tcl_DStringFree(&dstr);
+    Tcl_UtfToExternalDString(encoding,buf,strlen(buf),&dstr);
+    str = rb_str_new2(Tcl_DStringValue(&dstr));
+
+    Tcl_FreeEncoding(encoding);
+    Tcl_DStringFree(&dstr);
+
+#endif
+    return str;
+}
+
+
+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 **av = (char **)NULL;
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_Obj **ov = (Tcl_Obj **)NULL;
+    Tcl_Obj *resultPtr;
+#endif
+
+    /* get the data struct */
+    ptr = get_ip(obj);
+
+    /* get the command name string */
+    v = argv[0];
+    cmd = StringValuePtr(v);
+
+    /* map from the command name to a C procedure */
+    if (!Tcl_GetCommandInfo(ptr->ip, cmd, &info)) {
+	rb_raise(rb_eNameError, "invalid command name `%s'", cmd);
+    }
+
+    /* memory allocation for arguments of this command */
+#if TCL_MAJOR_VERSION >= 8
+    if (info.isNativeObjectProc) {
+	/* 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);
+	    Tcl_IncrRefCount(ov[i]);
+	}
+	ov[argc] = (Tcl_Obj *)NULL;
+    } 
+    else
+#endif
+    {
+      /* string interface */
+	av = (char **)ALLOCA_N(char *, argc+1);
+	for (i = 0; i < argc; ++i) {
+	    v = argv[i];
+	    s = StringValuePtr(v);
+	    av[i] = ALLOCA_N(char, strlen(s)+1);
+	    strcpy(av[i], s);
+	}
+	av[argc] = (char *)NULL;
+    }
+
+    Tcl_ResetResult(ptr->ip);
+
+    /* Invoke the C procedure */
+#if TCL_MAJOR_VERSION >= 8
+    if (info.isNativeObjectProc) {
+	int dummy;
+	ptr->return_value = (*info.objProc)(info.objClientData,
+					    ptr->ip, argc, ov);
+
+	/* get the string value from the result object */
+	resultPtr = Tcl_GetObjResult(ptr->ip);
+	Tcl_SetResult(ptr->ip, Tcl_GetStringFromObj(resultPtr, &dummy),
+		      TCL_VOLATILE);
+
+	for (i=0; i<argc; i++) {
+	    Tcl_DecrRefCount(ov[i]);
+	}
+    }
+    else
+#endif
+    {
+	TRAP_BEG;
+	ptr->return_value = (*info.proc)(info.clientData, ptr->ip, argc, av);
+	TRAP_END;
+    }
+
+    if (ptr->return_value == TCL_ERROR) {
+	rb_raise(rb_eRuntimeError, "%s", ptr->ip->result);
+    }
+
+    /* pass back the result (as string) */
+    return rb_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 *tmp, *q = (struct invoke_queue *)evPtr;
+
+    DUMP1("do_invoke_queue_handler");
+    DUMP2("invoke queue_thread : %lx", rb_thread_current());
+    DUMP2("added by thread : %lx", q->thread);
+
+    if (q->done) {
+      /* processed by another event-loop */
+      return 0;
+    }
+
+    /* 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 {
+      *(q->result) = ip_invoke_real(q->argc, q->argv, q->obj);
+    }
+
+    /* back to caller */
+    rb_thread_run(q->thread);
+
+    /* end of handler : remove it */
+    return 1;
+}
+
+static VALUE
+ip_invoke(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct invoke_queue *tmp;
+    VALUE current = rb_thread_current();
+    VALUE result;
+    VALUE *alloc_argv, *alloc_result;
+    Tcl_QueuePosition position;
+
+    if (argc < 1) {
+	rb_raise(rb_eArgError, "command name missing");
+    }
+    if (eventloop_thread == 0 || current == eventloop_thread) {
+      DUMP2("invoke from current eventloop %lx", current);
+      return ip_invoke_real(argc, argv, obj);
+    }
+
+    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->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 */
+    Tcl_QueueEvent(&tmp->ev, position);
+
+    /* wait for the handler to be processed */
+    rb_thread_stop();
+
+    /* get result & free allocated memory */
+    result = *alloc_result;
+    free(alloc_argv);
+    free(alloc_result);
+
+    return result;
+}
+
+/* get return code from Tcl_Eval() */
+static VALUE
+ip_retval(self)
+    VALUE self;
+{
+    struct tcltkip *ptr;	/* tcltkip data struct */
+
+    /* get the data strcut */
+    ptr = get_ip(self);
+
+    return (INT2FIX(ptr->return_value));
+}
+
+#ifdef __MACOS__
+static void
+_macinit()
+{
+    tcl_macQdPtr = &qd; /* setup QuickDraw globals */
+    Tcl_MacSetEventProc(TkMacConvertEvent); /* setup event handler */
+}
+#endif
+
+/*---- initialization ----*/
+void
+Init_tcltklib()
+{
+    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
+
+    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));
+
+    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, "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_eventloop_weight", 
+			      set_eventloop_weight, 2);
+    rb_define_module_function(lib, "get_eventloop_weight", 
+			      get_eventloop_weight, 0);
+
+    rb_define_alloc_func(ip, ip_alloc);
+    rb_define_method(ip, "initialize", ip_init, 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, "_invoke", ip_invoke, -1);
+    rb_define_method(ip, "_return_value", ip_retval, 0);
+    rb_define_method(ip, "mainloop", lib_mainloop, -1);
+    rb_define_method(ip, "mainloop_watchdog", lib_mainloop_watchdog, -1);
+    rb_define_method(ip, "do_one_event", lib_do_one_event, -1);
+    rb_define_method(ip, "set_eventloop_tick", set_eventloop_tick, 1);
+    rb_define_method(ip, "get_eventloop_tick", get_eventloop_tick, 0);
+    rb_define_method(ip, "set_eventloop_weight", set_eventloop_weight, 2);
+    rb_define_method(ip, "get_eventloop_weight", get_eventloop_weight, 0);
+    rb_define_method(ip, "restart", lib_restart, 0);
+
+    main_thread = rb_thread_current();
+    eventloop_thread = 0;
+    watchdog_thread  = 0;
+
+#ifdef __MACOS__
+    _macinit();
+#endif
+
+    /*---- initialize tcl/tk libraries ----*/
+    /* from Tk_Main() */
+    DUMP1("Tcl_FindExecutable");
+    Tcl_FindExecutable(RSTRING(rb_argv0)->ptr);
+}
+
+/* eof */
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
deleted file mode 100644
index fa5524da01..0000000000
--- a/ext/tk/ChangeLog.tkextlib
+++ /dev/null
@@ -1,858 +0,0 @@
-2005-12-11  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPORT_STATUS: update to support libraries in
-          ActiveTcl8.4.12.0.
-
-	* lib/tkextlib/tile/tnotebook.rb: add Tk::Tile::TNotebook#insert.
-
-	* sample/tkextlib/tile/demo.rb: improve the look of a part of the demo.
-
-2005-11-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/tile/demo.rb: bug fix
-
-	* sample/tkextlib/tile/themes/*: add some themes (blue,
-	  keramik, and plastik; require Tile-0.5 or later).
-
-2005-11-22  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
-	  is not defined).
-
-2005-11-19  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/treectrl/demo.rb: remove dependency on Ruby's 
-	  version (1.8 or 1.9).
-
-2005-10-23  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/*: update to support ActiveTcl8.4.11.2
-
-	* lib/tkextlib/trofs/*: support Trofs 0.4.3
-
-	* lib/tkextlib/tile/*: support Tile 0.7.2
-
-	* lib/tkextlib/vu/*: support vu 2.3.0
-
-	* lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3 part only)
-
-	* lib/tkextlib/*: improve conversion of option values
-
-2005-10-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tktable/tktable.rb: border_* instance methods
-	  don't call 'border' subcommands.
-
-2005-08-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/component.rb: didn't check
-	  __item_ruby2val_optkeys().
-
-2005-08-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/barchart.rb: support to treat tkvariable-type
-	  configure options.
-
-	* lib/tkextlib/blt/component.rb: ditto.
-
-	* lib/tkextlib/blt/dragdrop.rb: ditto.
-
-	* lib/tkextlib/blt/treeview.rb: ditto.
-
-	* lib/tkextlib/bwidget/button.rb: ditto.
-
-	* lib/tkextlib/bwidget/entry.rb: ditto.
-
-	* lib/tkextlib/bwidget/label.rb: ditto.
-
-	* lib/tkextlib/bwidget/labelentry.rb: ditto.
-
-	* lib/tkextlib/bwidget/labelframe.rb: ditto.
-
-	* lib/tkextlib/bwidget/mainframe.rb: ditto.
-
-	* lib/tkextlib/bwidget/passwddlg.rb: ditto.
-
-	* lib/tkextlib/bwidget/spinbox.rb: ditto.
-
-	* lib/tkextlib/bwidget/tree.rb: ditto.
-
-	* lib/tkextlib/iwidgets/calendar.rb: ditto.
-
-	* lib/tkextlib/iwidgets/entryfield.rb: ditto.
-
-	* lib/tkextlib/iwidgets/hierarchy.rb: ditto.
-
-	* lib/tkextlib/iwidgets/labeledframe.rb: ditto.
-
-	* lib/tkextlib/iwidgets/labeledwidget.rb: ditto.
-
-	* lib/tkextlib/iwidgets/menubar.rb: ditto.
-
-	* lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
-
-	* lib/tkextlib/iwidgets/spinner.rb: ditto.
-
-	* lib/tkextlib/iwidgets/toolbar.rb: ditto.
-
-	* lib/tkextlib/tkimg/pixmap.rb: ditto.
-
-	* lib/tkextlib/tktable/tktable.rb: ditto.
-
-2005-08-06  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: use Tk::Tile::Scale#variable.
-
-2005-08-04  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: followed previous changes.
-
-2005-08-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile/t*.rb: aliased class names starting with 'T'
-	  to non 'T' ones. (ie. Tk::Tile::TButton -> Tk::Tile::Button)
-	  [ruby-dev:26724]
-
-	* lib/tkextlib/tile.rb: ditto. (autoload support)
-
-2005-08-04  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: fixed: Tk::Tile::TProgressbar is
-	  supported on tile 0.6 or later, not tile 0.5.
-
-	* sample/tkextlib/tile/demo.rb: updated scales demo to use
-	  Tk::Tile::TProgressbar for tile 0.6 or later.
-
-	* sample/tkextlib/tile/demo.rb: set some TkVariable default values.
-
-2005-08-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile/treeview.rb: Tk::Tile::Treeview#headingconfigure
-	  is now working and more. [ruby-dev:26716]
-
-	* sample/tkextlib/tile/demo.rb: use Tk::Tile::Treeview#headingconfigure 	  instead of direct Tk.tk_call.
-
-2005-08-02  ocean  <ocean@ruby-lang.org>
-
-	* lib/tkextlib/tile/tprogressbar.rb: Tk::Tile::TProgressbar#start
-	  takes optional argument `interval'.
-
-	* sample/tkextlib/tile/demo.rb: emulate Tk::Tile::TProgressbar
-	  with Tk::Tile::TProgress in tile 0.4. (repeating buttons demo)
-
-2005-08-02  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: added repeating buttons demo.
-
-	* sample/tkextlib/tile/repeater.tcl: ditto. (new file)
-
-2005-08-01  ocean  <ocean@ruby-lang.org>
-
-	* lib/tkextlib/tile.rb: fixed autoload for Treeview.
-
-	* lib/tkextlib/tile/treeview.rb: replaced `ary2tk_list(items)' with
-	  `*items'.
-
-	* sample/tkextlib/tile/demo.rb: added treeview demo. (tile 0.5 or
-	  later is required) [ruby-dev:26668]
-
-2005-08-01  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: added combobox demo.
-
-2005-07-27  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: fixed typo.
-
-2005-06-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPOPRT_STATUS: add RELEASE_DATE information.
-
-	* lib/tkextlib/tile/style.rb: add "style element options <elem>"
-	  command support.
-
-2005-06-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/ICONS/icons.rb: fail to create instances of
-	  Tk::ICONS [ruby-dev:26305].
-
-2005-06-07  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/themes/kroc.{rb,tcl}: also support tile 0.4.
-
-2005-06-07  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/themes/kroc.{rb,tcl}: support tile 0.5 or later.
-	  ("pixmap" element constructor replaced by "image")
-
-2005-06-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/tile/demo.rb: fix TypeError & create Console
-
-2005-05-30  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt.rb: add PACKAGE_NAME information of Tcl/Tk
-          Extension.
-
-	* lib/tkextlib/bwidget.rb: ditto.
-
-	* lib/tkextlib/iwidgets.rb: ditto.
-
-	* lib/tkextlib/tile.rb: ditto.
-
-	* lib/tkextlib/tkimg.rb: ditto.
-
-	* lib/tkextlib/vu.rb: ditto.
-
-	* lib/tkextlib/ICONS/icons.rb: ditto.
-
-	* lib/tkextlib/itcl/incr_tcl.rb: ditto.
-
-	* lib/tkextlib/itk/incr_tk.rb: ditto.
-
-	* lib/tkextlib/tcllib/autoscroll.rb: ditto.
-
-	* lib/tkextlib/tcllib/ctext.rb: ditto.
-
-	* lib/tkextlib/tcllib/cursor.rb: ditto.
-
-	* lib/tkextlib/tcllib/datefield.rb: ditto.
-
-	* lib/tkextlib/tcllib/ico.rb: ditto.
-
-	* lib/tkextlib/tcllib/ip_entry.rb: ditto.
-
-	* lib/tkextlib/tcllib/plotchart.rb: ditto.
-
-	* lib/tkextlib/tcllib/style.rb: ditto.
-
-	* lib/tkextlib/tcllib/tkpiechart.rb: ditto.
-
-	* lib/tkextlib/tclx/tclx.rb: ditto.
-
-	* lib/tkextlib/tkDND/shape.rb: ditto.
-
-	* lib/tkextlib/tkDND/tkdnd.rb: ditto.
-
-	* lib/tkextlib/tkHTML/htmlwidget.rb: ditto.
-
-	* lib/tkextlib/tkimg/bmp.rb: ditto.
-
-	* lib/tkextlib/tkimg/gif.rb: ditto.
-
-	* lib/tkextlib/tkimg/ico.rb: ditto.
-
-	* lib/tkextlib/tkimg/jpeg.rb: ditto.
-
-	* lib/tkextlib/tkimg/pcx.rb: ditto.
-
-	* lib/tkextlib/tkimg/pixmap.rb: ditto.
-
-	* lib/tkextlib/tkimg/png.rb: ditto.
-
-	* lib/tkextlib/tkimg/ppm.rb: ditto.
-
-	* lib/tkextlib/tkimg/ps.rb: ditto.
-
-	* lib/tkextlib/tkimg/sgi.rb: ditto.
-
-	* lib/tkextlib/tkimg/sun.rb: ditto.
-
-	* lib/tkextlib/tkimg/tga.rb: ditto.
-
-	* lib/tkextlib/tkimg/tiff.rb: ditto.
-
-	* lib/tkextlib/tkimg/window.rb: ditto.
-
-	* lib/tkextlib/tkimg/xbm.rb: ditto.
-
-	* lib/tkextlib/tkimg/xpm.rb: ditto.
-
-	* lib/tkextlib/tktable/tktable.rb: ditto.
-
-	* lib/tkextlib/tktrans/tktrans.rb: ditto.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto.
-
-	* lib/tkextlib/winico/winico.rb: ditto.
-
-2005-05-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/iwidgets/scrolledlistbox.rb: follow the change
-          of tk.rb. modify to attend encoding.
-
-	* lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
-
-	* lib/tkextlib/iwidgets/scrolledcanvas.rb: bug fix on
-	  TkCanvas#delete when given non-TkcItem arguments. 
-
-2005-05-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/winop.rb: fix typo
-
-2005-05-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/vu/pie.rb: fix typo
-
-2005-04-10  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/mailwasher.rb: fixed typo. [ruby-dev:26008]
-
-2005-04-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/tile/demo.rb: new demo of Tile extension.
-
-	* sample/tkextlib/tile/iconlib.tcl: part of the demo.
-
-	* sample/tkextlib/tile/toolbutton.tcl: ditto.
-
-	* sample/tkextlib/tile/readme.txt: document of the demo.
-
-	* sample/tkextlib/tile/Orig_LICENSE.txt: ditto.
-
-	* sample/tkextlib/tile/themes/kroc.tcl: sample theme written with Tcl.
-
-	* sample/tkextlib/tile/themes/pkgIndex.tcl: pkgIndex of kroc.tcl.
-
-	* sample/tkextlib/tile/themes/kroc.rb: Kroc theme written with Ruby.
-
-	* sample/tkextlib/tile/themes/kroc/button-h.gif: images for Kroc theme.
-
-	* sample/tkextlib/tile/themes/kroc/button-n.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/button-p.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/check-hc.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/check-hu.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/check-nc.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/check-nu.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/radio-hc.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/radio-hu.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/radio-nc.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/radio-nu.gif: ditto.
-
-	* lib/tkextlib/tile.rb: bug fix (tested on the new demo).
-
-	* lib/tkextlib/tile/style.rb: ditto.
-
-	* lib/tkextlib/tile/tbutton.rb: ditto.
-
-	* lib/tkextlib/tile/tcheckbutton.rb: ditto.
-
-	* lib/tkextlib/tile/tcombobox.rb: ditto.
-
-	* lib/tkextlib/tile/tentry.rb: ditto.
-
-	* lib/tkextlib/tile/tframe.rb: ditto.
-
-	* lib/tkextlib/tile/tlabel.rb: ditto.
-
-	* lib/tkextlib/tile/tlabelframe.rb: ditto.
-
-	* lib/tkextlib/tile/tmenubutton.rb: ditto.
-
-	* lib/tkextlib/tile/tnotebook.rb: ditto.
-
-	* lib/tkextlib/tile/tprogressbar.rb: ditto.
-
-	* lib/tkextlib/tile/tradiobutton.rb: ditto.
-
-	* lib/tkextlib/tile/treeview.rb: ditto.
-
-	* lib/tkextlib/tile/tscrollbar.rb: ditto.
-
-	* lib/tkextlib/tile/tseparator.rb: ditto.
-
-	* lib/tkextlib/tile/tsquare.rb: ditto.
-
-	* lib/tkextlib/tile/tpaned.rb: new library
-
-	* lib/tkextlib/tile/tscale.rb: ditto.
-
-	* lib/tkextlib/SUPPORT_STATUS: update support status of Tile extension.
-
-	* lib/tkextlib/tcllib/ctext.rb: use TkCommandNames on create_self().
-
-	* lib/tkextlib/tcllib/datefield.rb: ditto.
-
-	* lib/tkextlib/tcllib/ip_entry.rb: ditto.
-
-	* lib/tkextlib/tkHTML/htmlwidget.rb: ditto.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto.
-
-2005-04-09  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/explorer.rb: File.executable? returns true
-	  even if it's plain text file. (this function only checks access right)
-
-2005-04-09  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/{help,www-options}.rb: fixed typo.
-	  (click or resize column header)
-
-2005-04-09  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/imovie.rb: fixed typo. (click on clip title)
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/random.rb: fixed typo. (drop node outside of
-	  widget, or reenter widget while draggging)
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/outlook-newgrounp.rb: image had disappered when
-	  node was selected.
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/{random,outlook-newgroup}.rb:
-	  tk::treectrl uses 'afterId' not 'afterID'.
-
-	* sample/tkextlib/treectrl/{random,outlook-newgroup}.rb:
-	  item_firstchild can return empty string. (drop node to leaf node)
-
-	* sample/tkextlib/treectrl/random.rb: Enumerable#find didn't work properly
-	  because tried to compare String with Integer. (drag node and leave widget)
-
-	* sample/tkextlib/treectrl/random.rb: and some fixes.
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* lib/tkextlib/treectrl/tktreectrl.rb (selection_clear): fixed typo.
-
-	* sample/tkextlib/treectrl/random.rb: node deselection now works.
-
-	* sample/tkextlib/treectrl/demo.rb: fixed typo. (popup menu on column header)
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/help.rb: fixed typo. (wrong color)
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/random.rb: fixed typo. (wrong itemheight)
-
-	* sample/tkextlib/treectrl/outlook-newgroup.rb: ditto.
-
-	* sample/tkextlib/treectrl/explorer.rb: ditto.
-
-	* sample/tkextlib/treectrl/help.rb: ditto.
-
-2005-04-07  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/*.rb: some speed up... cache the result of
-	  version checking.
-
-2005-04-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: performance tuning by calling
-	  tk_send_without_enc. [ruby-dev:25997]
-
-2005-04-04  ocean  <ocean@ruby-lang.org>
-
-	* lib/tkextlib/tktable/tktable.rb: added Tk::TkTable#selection_present.
-
-2005-04-02  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: support TreeCtrl's cvs head.
-
-2005-04-02  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/component.rb: add TreeCtrl#legend_window_create().
-
-	* sample/tkextlib/blt/graph6.rb: use legend_window_create().
-
-	* lib/tkextlib/blt/tree.rb: forget to call tagid().
-
-	* lib/tkextlib/blt/treeview.rb: ditto.
-
-2005-04-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/treectrl/demo.rb: bridge the gap of
-	  Hash#index or Hash#key between ruby 1.8 and 1.9
-
-2005-04-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/component.rb: bug fix on treatment of
-	  component objects.
-
-	* sample/tkextlib/blt/graph6.rb: a new sample script. 
-
-2005-03-31  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/demo.rb: should use Hash#index.
-
-	* sample/tkextlib/treectrl/demo.rb: TkImage was not
-	  cached properly.
-
-	* sample/tkextlib/treectrl/random.rb: fixed typo.
-
-2005-03-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/iwidgets/sample/hierarchy.rb: show basename
-	  only [ruby-dev:25970]
-
-	* sample/tkextlib/treectrl/demo.rb: add check for existence of 
-	  'backgroundimage' option.
-
-	* sample/tkextlib/treectrl/bitmaps.rb: ditto.
-
-	* sample/tkextlib/treectrl/outlook-newgroup.rb: lack of '%I'
-	  event callback argument.
-
-2005-03-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/iwidgets/sample/hierarchy.rb: fail to treat
-	  Japanese (i18n?) filenames.
-
-2005-03-30  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/bwidget/tree.rb: use 'return' in the Proc object.
-
-	* sample/tkextlib/tkHTML/hv.rb: ditto.
-
-	* sample/tkextlib/tkHTML/ss.rb: ditto.
-
-	* sample/tkextlib/tktable/basic.rb: ditto.
-
-	* sample/tkextlib/tktable/command.rb: ditto.
-
-	* sample/tkextlib/tktable/debug.rb: ditto.
-
-	* sample/tkextlib/tktable/maxsize.rb: ditto.
-
-	* sample/tkextlib/treectrl/demo.rb: ditto.
-
-2005-03-29  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/component.rb: cannot create elements except
-	  default type of element. 
-
-	* lib/tkextlib/blt/barchart.rb: ditto.
-
-	* lib/tkextlib/blt/graph.rb: ditto.
-
-	* lib/tkextlib/blt/stripchart.rb: ditto.
-
-	* lib/tkextlib/blt/component.rb: axis command option gets
-	  proper object type of arguments.
-
-	* sample/tkextlib/blt/calendar.rb: new sample.
-
-	* sample/tkextlib/blt/pareto.rb: ditto.
-
-2005-03-28  ocean  <ocean@ruby-lang.org>
-
-	* lib/tkextlib/iwidgets/notebook.rb: fixed typo.
-
-2005-03-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt.rb: add commands for zooming.
-
-	* lib/tkextlib/blt/bitmap.rb (new_with_name): add for using
-          given name.
-
-	* lib/tkextlib/blt/busy.rb: bug fix on Tk::BLT::Busy::Shild class.
-
-	* lib/tkextlib/blt/component.rb: typo fix.
-
-	* lib/tkextlib/blt/component.rb: fix lack of *_create methods
-
-	* lib/tkextlib/blt/component.rb: proper call on xaxis_* and so on.
-
-	* lib/tkextlib/blt/htext.rb: add TkVariable object to access
-          special Tcl variables. 
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: typo fix.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: proper treatment
-          of 'font' option of element_configure.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix on item_sort.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: add methods to
-          call TreeCtrl commands for bindings.
-
-	* sample/tkextlib/blt/*: add some sample scripts.
-
-	* sample/tkextlib/treectrl/*: add some sample scripts.
-
-2005-03-18  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix and define some
-	  classes for components of Tk::TreeCtrl
-
-2005-03-17  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: call wrong method in
-	  Tk::TreeCtrl#*_configinfo and current_*_configinfo method
-
-2005-03-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPORT_STATUS: change the status of TkImg
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix and support
-	  TkTreeCtrl-1.1
-
-	* lib/tkextlib/SUPPORT_STATUS: change the supported version of
-	  TkTreeCtrl
-
-2005-03-15  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/tkimg: add sample
-
-2005-03-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPORT_STATUS: add version info of each extension
-
-2005-03-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile.rb: lack of "autoload TProgressbar"
-
-2005-03-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile.rb: support tile-0.6
-
-	* lib/tkextlib/tile/tbutton.rb: ditto
-
-	* lib/tkextlib/tile/tcheckbutton.rb: ditto
-
-	* lib/tkextlib/tile/tlabel.rb: ditto
-
-	* lib/tkextlib/tile/tmenubutton.rb: ditto
-
-	* lib/tkextlib/tile/tnotebook.rb: ditto
-
-	* lib/tkextlib/tile/tradiobutton.rb: ditto
-
-	* lib/tkextlib/tile/tcombobox.rb: [new] ditto
-
-	* lib/tkextlib/tile/tentry.rb: [new] ditto
-
-	* lib/tkextlib/tile/tframe.rb: [new] ditto
-
-	* lib/tkextlib/tile/tlabelframe.rb: [new] ditto
-
-	* lib/tkextlib/tile/tprogressbar.rb: [new] ditto
-
-	* lib/tkextlib/tile/treeview.rb: [new] ditto
-
-	* lib/tkextlib/tile/tscrollbar.rb: [new] ditto
-
-	* lib/tkextlib/tile/tseparator.rb: [new] ditto
-
-	* lib/tkextlib/tile/tsquare.rb: [new] ditto
-
-2005-02-20  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tclx/tclx.rb: warning TclX's 'signal' command.
-
-2005-01-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/component.rb: bug fix. cannot accept
-          a callback ID string for a command argument. [ruby-dev:25479]
-
-	* lib/tkextlib/blt/tabset.rb: ditto
-
-	* lib/tkextlib/blt/treeview.rb: ditto
-
-	* lib/tkextlib/bwidget/labelentry.rb: ditto
-
-	* lib/tkextlib/bwidget/listbox.rb: ditto
-
-	* lib/tkextlib/bwidget/notebook.rb: ditto
-
-	* lib/tkextlib/bwidget/spinbox.rb: ditto
-
-	* lib/tkextlib/bwidget/tree.rb: ditto
-
-	* lib/tkextlib/itk/incr_tk.rb: ditto
-
-	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
-
-	* lib/tkextlib/tkDND/tkdnd.rb: ditto
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
-
-	* sample/tkextlib/tkHTML/ss.rb: local variable scope bug fix
-          [ruby-dev:25479]
-
-	* sample/tkextlib/vu/vu_demo.rb: rename from vu.rb; avoid the bug on
-	  Windows version of Tcl/Tk. The trouble based on the bug occurs when
-	  the script name (without extension) is a same name as a Tcl/Tk's
-	  library file name (without extension) required in the script.
-
-2004-12-24  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt: add BLT extension support
-
-2004-12-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/bwidget/labelentry.rb: use TkCore.callback_obj?()
-
-	* lib/tkextlib/bwidget/listbox.rb: ditto
-
-	* lib/tkextlib/bwidget/notebook.rb: ditto
-
-	* lib/tkextlib/bwidget/spinbox.rb: ditto
-
-	* lib/tkextlib/itk/incr_tk.rb: ditto
-
-	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
-
-	* lib/tkextlib/tkDND/tkdnd.rb: ditto
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
-
-	* lib/tkextlib/winico/winico.rb: ditto
-
-2004-12-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile/style.rb: 'theme_use' method bug fix
-
-2004-12-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/bwidget/notebook.rb: raise method cannot return
-          the raised page.
-
-	* lib/tkextlib/bwidget/labelentry.rb: bind methods accept
-          subst_args + block
-
-	* lib/tkextlib/bwidget/listbox.rb: ditto
-
-	* lib/tkextlib/bwidget/notebook.rb: ditto
-
-	* lib/tkextlib/bwidget/spinbox.rb: ditto
-
-	* lib/tkextlib/bwidget/tree.rb: ditto
-
-	* lib/tkextlib/itk/incr_tk.rb: ditto
-
-	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
-
-	* lib/tkextlib/tkDND/tkdnd.rb: ditto
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
-
-2004-11-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/bwidget/notebook.rb: uses epath
-
-	* lib/tkextlib/bwidget/widget.rb: ditto
-
-	* lib/tkextlib/tktable/tktable.rb: ditto
-
-	* lib/tkextlib/tcllib/cursor.rb: ditto, and bug fix
-
-2004-11-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile/style.rb: bug fix
-
-2004-11-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/iwidgets/scrolledcanvas.rb: bind-event methods
-	  accept multi substitution arguments.
-
-	* lib/tkextlib/tktable/tktable.rb: ditto.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
-
-2004-11-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPORT_STATUS: BLT moves to 'plan to support'
-          from 'not determined'
-
-	* lib/tkextlib/itk/incr_tk.rb: __cget_cmd and __config_cmd are
-          private methods
-
-	* lib/tkextlib/tcllib/autoscroll.rb: extend TkCore
-
-	* lib/tkextlib/tcllib/cursor.rb: ditto.
-
-	* lib/tkextlib/tcllib/plotchart.rb: ditto.
-
-	* lib/tkextlib/tcllib/style.rb: ditto.
-
-	* lib/tkextlib/tile/style.rb: ditto.
-
-	* lib/tkextlib/tkDND/shape.rb: ditto.
-
-2004-10-24  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/bwidget/tree.rb: bug fix on Windows
-
-2004-10-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tcllib/ico.rb: new library (Tk::Tcllib:ICO)
-
-	* lib/tkextlib/tcllib.rb: add Tk::Tcllib::ICO (based on tcllib 1.7)
-
-2004-10-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/bwidget.rb (BWidget.grab): bug fix
-
-	* lib/tkextlib/tcllib.rb: typo fix
-
-2004-07-28  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/add winico support
-
-2004-07-23  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/add TclX support (partially; infox command and
-          XPG/3 MsgCat only)
-
-2004-07-15  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* bug fix
-
-	* support TkTable extension
-
-2004-07-12  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* bug fix
-
-	* support Iwidgets extension
-
-2004-07-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* bug fix
-
-	* add more part of [incr Widget] support (about 65%? are complete)
-
-	* use Tk::ValidateConfigure.__def_validcmd() method
-          (new function to define validatecommand methods easier)
-
-	* tcllib.rb : avoid the loading trouble that almost all part of 
-	  the extension is not available when some libraries are invalid. 
-
-2004-07-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* add some part of [incr Widget] support (about 50%? are complete)
-
-2004-07-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* add [incr Tck], [incr Tk] support
-
-2004-07-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* support BWidget extension
-
-	* add BWidget extension demo
-
-	* add ICONS extension demo
-
-	* many bug fix 
-
-2004-07-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* 1st release of tkextlib ( to support Tcl/Tk extensions )
diff --git a/ext/tk/MANIFEST b/ext/tk/MANIFEST
new file mode 100644
index 0000000000..bf03ac3841
--- /dev/null
+++ b/ext/tk/MANIFEST
@@ -0,0 +1,26 @@
+MANIFEST
+extconf.rb
+depend
+tkutil.c
+lib/README
+lib/tk.rb
+lib/tkafter.rb
+lib/tkbgerror.rb
+lib/tkcanvas.rb
+lib/tkclass.rb
+lib/tkdialog.rb
+lib/tkentry.rb
+lib/tkfont.rb
+lib/tkmenubar.rb
+lib/tkmngfocus.rb
+lib/tkpalette.rb
+lib/tkscrollbox.rb
+lib/tktext.rb
+lib/tkvirtevent.rb
+sample/tkbiff.rb
+sample/tkbrowse.rb
+sample/tkdialog.rb
+sample/tkfrom.rb
+sample/tkhello.rb
+sample/tkline.rb
+sample/tktimer.rb
diff --git a/ext/tk/MANUAL_tcltklib.eng b/ext/tk/MANUAL_tcltklib.eng
deleted file mode 100644
index 1db61f228e..0000000000
--- a/ext/tk/MANUAL_tcltklib.eng
+++ /dev/null
@@ -1,445 +0,0 @@
-(tof)
-                                    2005/07/05  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 TclTkLib::VarAccessFlag
-    : Defines flags to give '_get_variable' and so on. When to give, 
-    : please use bit-operator (e.g. GLOBAL_ONLY | LEAVE_ERR_MSG ). 
-
-    [constants]
-       NONE
-         : Is 0. It means "set no flag". 
-
-       GLOBAL_ONLY
-         : (site Tcl/Tk's man page)
-         : Under normal circumstances the procedures look up 
-         : variables as follows: If a procedure call is active 
-         : in interp, a variable is looked up at the current
-         : level of procedure call. Otherwise, a variable is
-         : looked up first in the current namespace,  then  in
-         : the global namespace. However, if this bit is set
-         : in flags then the variable is looked up only in the
-         : global namespace even if there is a procedure call
-         : active. If both GLOBAL_ONLY and NAMESPACE_ONLY are
-         : given, GLOBAL_ONLY is ignored.
-         :
-         :  *** ATTENTION ***
-         : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY 
-         : is defined as 0, and then GLOBAL_ONLY is available
-         : even if flag is (GLOBAL_ONLY | NAMESPACE_ONLY). 
-
-       NAMESPACE_ONLY
-         : (site Tcl/Tk's man page)
-         : Under normal circumstances the procedures look up
-         : variables as follows: If a procedure call is active
-         : in interp, a variable is looked up at the current
-         : level of procedure call. Otherwise, a variable is
-         : looked up first in the current namespace, then in
-         : the global namespace. However, if this bit is set
-         : in flags then the variable is looked up only in the
-         : current namespace even if there is a procedure call
-         : active.
-         :
-         :  *** ATTENTION ***
-         : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY 
-         : is defined as 0.
-
-       LEAVE_ERR_MSG
-         : (site Tcl/Tk's man page)
-         : If an error is returned and this bit is set in flags, 
-         : then an error message will be left in the interpreter's
-         : result, where it can be retrieved with Tcl_GetObjResult
-         : or Tcl_GetStringResult. If this flag bit isn't set then 
-         : no error message is left and the interpreter's result 
-         : will not be modified.
-
-       APPEND_VALUE
-         : (site Tcl/Tk's man page)
-         : If this bit is set then newValue is appended to the
-         : current value, instead of replacing it. If the variable
-         : is currently undefined, then this bit is ignored.
-
-       LIST_ELEMENT
-         : (site Tcl/Tk's man page)
-         : If this bit is set, then newValue is converted to a
-         : valid Tcl list element before setting (or appending
-         : to) the variable. A separator space is appended before
-         : the new list element unless the list element is going
-         : to be the first element in a list or sublist (i.e. the 
-         : variable's current value is empty, or contains the 
-         : single character ``{'', or ends  in `` }'').
-
-       PARSE_VARNAME
-         : (site Tcl/Tk's man page)
-         : If this bit is set when calling _set_variable and so 
-         : on, var_name argument may contain both an array and an
-         : element name: if the name contains an open parenthesis 
-         : and ends with a close parenthesis, then the value 
-         : between the parentheses is treated as an element name 
-         : (which can have any string value) and the characters
-         : before  the first open parenthesis are treated as the 
-         : name of an array variable. If the flag PARSE_VARNAME
-         : is given, index_name argument should be 'nil' since the 
-         : array and element names are taken from var_name.
-         :
-         :  *** ATTENTION ***
-         : Tcl7.6 doesn't have this flag. So PARSE_VARNAME is 
-         : defined as 0. 
-
-  [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_thread?
-       : Returns whether the current thread executes the eventloop. 
-       : If true, the eventloop is working on the current thread. 
-       : If no eventloop is working, this method returns nil.
-       : And if the other thread executes the eventloop, returns false.
-       : 
-       :  *** ATTENTION ***
-       : When this methods returns false, it is dangerous to call a Tk 
-       : interpreter directly.
-
-    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.
-
-    _merge_tklist(str, str, ... )
-       : Get a Tcl's list string from arguments with a Tcl/Tk's 
-       : library function. Each arguemnt is converted to a valid 
-       : Tcl list element. 
-
-    _conv_listelement(str)
-       : Convert the argument to a valid Tcl list element with
-       : Tcl/Tk's library function.
-
-    _toUTF8(str, encoding=nil)
-    _fromUTF8(str, encoding=nil)
-       : Call the function (which is internal function of Tcl/Tk) to
-       : convert to/from a UTF8 string.
-
-    _subst_UTF_backslash(str)
-    _subst_Tcl_backslash(str)
-       : Substitute backslash sequence with Tcl's rule (include \uhhhh;
-       : give a sixteen-bit hexadecimal value for Unicode character).
-       : _subst_Tcl_backslash method parses all backslash sequence. 
-       : _subst_UTF_backslash method parses \uhhhh only.
-
-    encoding_system
-    encoding_system=(encoding)
-       : Get and set Tcl's system encoding.
-
-    encoding
-    encoding=(encoding)
-       : alias of encoding_system / encoding_system=
-       : ( probably, Ruby/Tk's tk.rb will override them )
-
-
-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. 
-
-    allow_ruby_exit?
-       : Return the mode whether 'exit' function of ruby or 'exit' 
-       : command of Tcl/Tk can quit the ruby process or not on the 
-       : interpreter. If false, such a command quit the interpreter 
-       : only.
-       : The default value for a master interpreter is true, and 
-       : for a slave interpreter is false.
-
-    allow_ruby_exit=(mode)
-       : Change the mode of 'allow_ruby_exit?'.
-       : If $SAFE >= 4 or the interpreter is a "safe" interpreter, 
-       : this is not permitted (raise an exception). 
-
-    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. 
-
-    has_mainwindow?
-       : Check whether the interpreter has a MainWindow (root widget).
-       : If has, returns true. If doesn't, returns false.  
-       : If IP is already deleted, returns nil. 
-
-    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=nil)
-    _fromUTF8(str, encoding=nil)
-       : 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. 
-
-    _get_variable(var_name, flag)
-    _get_variable2(var_name, index_name, flag)
-       : Get the current value of a variable. If specified a 
-       : index_name (see also the PARSE_VARNAME flag), get the 
-       : value of the index_name element. 
-
-    _set_variable(var_name, value, flag)
-    _set_variable2(var_name, index_name, value, flag)
-       : Create or modify a variable. If specified a index_name 
-       : (see also the PARSE_VARNAME flag), create or modify the 
-       : index_name element. 
-
-    _unset_variable(var_name)
-    _unset_variable2(var_name, index_name)
-       : Remove a variable. If specified a index_name (see also 
-       : the PARSE_VARNAME flag), remove the index_name element. 
-
-    _get_global_var(var_name)
-    _get_global_var2(var_name, index_name)
-    _set_global_var(var_name, value)
-    _set_global_var2(var_name, index_name, value)
-    _unset_global_var(var_name)
-    _unset_global_var2(var_name, index_name)
-       : Call the associated method with the flag argument
-       : (GLOBAL_ONLY | LEAVE_ERR_MSG).
-
-    _split_tklist(str)
-       : Split the argument with Tcl/Tk's library function and 
-       : get an array as a list of Tcl list elements.
-
-    _merge_tklist(str, str, ... )
-       : Get a Tcl's list string from arguments with a Tcl/Tk's 
-       : library function. Each arguemnt is converted to a valid 
-       : Tcl list element. 
-
-    _conv_listelement(str)
-       : Convert the argument to a valid Tcl list element with
-       : Tcl/Tk's library function.
-
-    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/tk/MANUAL_tcltklib.eucj b/ext/tk/MANUAL_tcltklib.eucj
deleted file mode 100644
index 5dd36726ba..0000000000
--- a/ext/tk/MANUAL_tcltklib.eucj
+++ /dev/null
@@ -1,557 +0,0 @@
-(tof)
-                                    2005/07/05  Hidetoshi NAGAI
-
-�ܥɥ�����ȤˤϸŤ� tcltk �饤�֥�ꡤtcltklib �饤�֥�������
-���ޤޤ�Ƥ��ޤ��������ε������ƤϸŤ���ΤȤʤäƤ��ޤ���
-
-tcltk �饤�֥���tcltk.rb�ˤϸ��ߤǤϥ��ƥʥ󥹤����¾�Ԥ���
-���ʤ����ᡤ�Ť��ɥ�����Ȥ����������Τޤ�ͭ���Ǥ���������Ф���
-tcltklib �饤�֥��ˤĤ��Ƥϡ����ߤ� Ruby/Tk��tk.rb �ʲ��Υ饤�֥�
-�귲�ˤ��Ư�����뤿����濴�Ȥ��ƥ��ƥʥ󥹤���Ƥ��뤿�ᡤ����
-�㤤�������Ƥ��ޤ���
-
-�����ǡ��ޤ��Ť�����ʸ��򼨤����塤���ߤ� tcltklib �饤�֥��ˤ�
-���Ƥ�������ä��ޤ���
-
-�ʲ����饤�֥��θŤ�����ʸ��Ǥ���
-==============================================================
-	MANUAL.euc
-		Sep. 19, 1997	Y. Shigehiro
-
-�ʲ�, ��tcl/tk�פȤ���ɽ����, tclsh �� wish ��¸����Ƥ���, ���̤Ǥ���
-�Ȥ����� tcl/tk ��ؤ��ޤ�. ��tcltk �饤�֥���, ��tcltklib �饤�֥�
-��פȤ���ɽ����, �ܥѥå������˴ޤޤ�� ruby �ѤΥ饤�֥���ؤ��ޤ�.
-
-<< tcltk �饤�֥�� >>
-
-tcl/tk �� C �饤�֥������Ѥ��뤿��ι�(��?)��।�󥿡��ե���������
-�����ޤ�.
-
-���Υ饤�֥��� ruby ���� tcl/tk �饤�֥������Ѥ��뤿��Τ�Τ�, ��
-���� tcltklib �饤�֥������Ѥ��Ƥ��ޤ�.
-
-[����]
-
-tcl/tk ���󥿥ץ꥿�Ǥ�, ���������åȤ˲����ؼ�������ˤ�, ����������
-��̾��³���ƥѥ�᡼����񤭤ޤ�. �������ä�, ���������åȤ����֥�����
-�ȤǤ���, ������Ф��ƥ᥽�åɤ����äƤ���, �Ȥߤʤ����Ȥ��Ǥ��ޤ�. ��
-��, tcl/tk ���󥿥ץ꥿�Ǥ�, �Ȥ߹��ߥ��ޥ�ɤ�, ���ҤΥ��������åȤ�
-Ʊ���褦�ʽ񼰤�̿��Ǽ¹Ԥ���ޤ�. ���ʤ��, ���ޥ�ɤ⥪�֥������Ȥ�
-����ȹͤ��뤳�Ȥ��Ǥ��ޤ�.
-
-���Τ褦�ʹͤ��˴�Ť�, tcltk �饤�֥��Ǥ�, tcl/tk �Υ��ޥ�ɤ䥦��
-�����åȤ��б����륪�֥������Ȥ��������ޤ�. ���֥������Ȥ��Ф���᥽��
-�ɸƤӽФ���, e() �᥽�åɤˤ��¹Ԥ���ޤ�. �㤨��, tcl/tk �� info 
-���ޥ�ɤ��б����� ruby �Υ��֥������Ȥ� info �Ȥ���̾���Ǥ���Ȥ����,
-tcl/tk ��
-	info commands
-�Ȥ���̿��� tcltk �饤�֥��Ǥ�
-	info.e("commands")
-�ȵ��Ҥ���ޤ�. �ޤ�, ��.�פȤ������������å� (wish �¹Ի��˼�ưŪ����
-�������롼�ȥ��������å�) ���б����� ruby �Υ��֥������Ȥ� root �Ȥ�
-��̾���Ǥ���Ȥ����,
-	. configure -height 300 -width 300
-�Ȥ��� tcl/tk ��̿���
-	root.e("configure -height 300 -width 300")
-�ȵ��Ҥ���ޤ�. ���Τ褦�ʵ��Ҥ�, ������ˤ�����������ޤ���, ������, 
-������ץȤ��ɤ�ͤˤϸ��Ť餤�����Τ�ޤ���, �ºݤ˥�����ץȤ��
-�Ƥߤ��ͽ�۳��˼�ڤǤ�.
-
-[����ˡ]
-
-1. �饤�֥����ɤ߹���.
-     require "tcltk"
-
-2. tcl/tk ���󥿥ץ꥿����������.
-     ip = TclTkInterpreter.new()
-
-3. tcl/tk �Υ��ޥ�ɤ��б����륪�֥������Ȥ��ѿ����������Ƥ���.
-     # ���ޥ�ɤ��б����륪�֥������Ȥ����ä� Hash ����Ф�.
-     c = ip.commands()
-     # �Ȥ��������ޥ�ɤ��б����륪�֥������Ȥ���̤��ѿ�����������.
-     bind, button, info, wm = c.indexes("bind", "button", "info", "wm")
-
-4. ɬ�פʽ�����Ԥ�.
-     �ܤ�����, ����ץ�򻲾ȤΤ���.
-
-5. �������Ǥ�����, ���٥�ȥ롼�פ�����.
-     TclTk.mainloop()
-
-(( �ʲ�, �⥸�塼��, ���饹�����������ͽ��.))
-
-
-
-<< tcltklib �饤�֥�� >>
-
-tcl/tk �� C �饤�֥������Ѥ��뤿������।�󥿡��ե��������󶡤���
-��.
-
-����ѥ���/�¹Ԥˤ�, tcl/tk �� C �饤�֥�꤬ɬ�פǤ�.
-
-[����]
-
-���Υ饤�֥����Ѥ����, ruby ���� tcl/tk �� C �饤�֥������ѤǤ���
-��. ����Ū�ˤ�, ruby ���󥿥ץ꥿���� tcl/tk ���󥿥ץ꥿��ƤӽФ���
-�Ȥ��Ǥ��ޤ�. �����, ����(ruby ���󥿥ץ꥿����ƤӽФ���) tcl/tk ��
-�󥿥ץ꥿����, �դ� ruby ���󥿥ץ꥿��ƤӽФ����Ȥ�Ǥ��ޤ�.
-
-[����ˡ]
-
-require "tcltklib" �����, �ʲ��Υ⥸�塼��, ���饹�����Ѳ�ǽ�Ǥ�.
-
-�⥸�塼�� TclTkLib
-    tcl/tk �饤�֥���ƤӽФ��᥽�åɤ򽸤᤿�⥸�塼��Ǥ�. ������,
-    tcl/tk ���󥿥ץ꥿�ط��Υ᥽�åɤϥ��饹 TclTkIp �ˤ���ޤ�.
-
-  �⥸�塼��᥽�å� mainloop()
-      Tk_MainLoop ��¹Ԥ��ޤ�. ���Ƥ� tk �Υ�����ɥ���̵���ʤ�Ƚ�λ
-      ���ޤ�(�㤨��, tcl/tk �ǽ񤯤Ȥ����� "destroy ." �򤷤������).
-    ����: ̵��
-    �����: nil
-
-���饹 TclTkIp
-    ���󥹥��󥹤� tcl/tk �Υ��󥿥ץ꥿���б����ޤ�. tcl/tk �Υ饤��
-    ���λ����̤�, ���󥹥��󥹤�ʣ�����������Ƥ�������ư��ޤ�(��
-    ��ʤ��Ȥ򤹤�ɬ�פϤ��ޤ�̵���Ϥ��Ǥ���). ���󥿥ץ꥿�� wish ��
-    tcl/tk ���ޥ�ɤ�¹ԤǤ��ޤ�. �����, �ʲ��Υ��ޥ�ɤ�¹ԤǤ���
-    ��.
-      ���ޥ�� ruby
-	������ ruby �Ǽ¹Ԥ��ޤ�(ruby_eval_string ��¹Ԥ��ޤ�). ����
-	�� 1 �ĤǤʤ���Фʤ�ޤ���. ����ͤ� ruby �μ¹Է�̤Ǥ�.
-	ruby �μ¹Է�̤� nil �� String �Ǥʤ���Фʤ�ޤ���.
-
-  ���饹�᥽�å� new()
-      TclTkIp ���饹�Υ��󥹥��󥹤��������ޤ�
-    ����: ̵��
-    ����� (TclTkIp): �������줿���󥹥���
-
-  �᥽�å� _eval(script)
-      ���󥿥ץ꥿�� script ��ɾ�����ޤ�(Tcl_Eval ��¹Ԥ��ޤ�). ����
-      �Τ褦��, ruby ���ޥ�ɤˤ�� script �⤫�� ruby ������ץȤ��
-      �ԤǤ��ޤ�.
-    ����: script (String) - ���󥿥ץ꥿��ɾ�����륹����ץ�ʸ����
-    ����� (String): ɾ����� ((Tcl_Interp *)->result)
-
-  �᥽�å� _return_value()
-      ľ���� Tcl_Eval ������ͤ��֤��ޤ�. 0(TCL_OK) �����ｪλ�Ǥ�.
-    ����: ̵��
-    ����� (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 ���֤� ) ���� 
-
-   �⥸�塼�� TclTkLib::VarAccessFlag
-      : _get_variable �ʤɤǤΥե饰����ꤹ�뤿��Τ�Ρ��ե饰��
-      : �ϰʲ�������� OR ��Ϣ�뤷��Ϳ���롥
-
-      ���  NONE
-         : �ͤ� 0 �ǡ�����ե饰����ꤷ�Ƥ��ʤ��Τ���������
-
-      ���  GLOBAL_ONLY
-         : �̾�ѿ��θ����Ϥޤ���³���ƤӽФ���Ԥä���٥�Ǹ�
-         : ���������˸��ߤ�̾�����֤Ǹ������Ǹ�˥������Х���֤�
-         : ������Ԥ��������������Υե饰�����ꤵ�줿���ˤϡ���
-         : �����Х���֤ǤΤ߸������롥
-         : �⤷ GLOBAL_ONLY �� NAMESPACE_ONLY �Ȥ�ξ�����ꤵ�줿��
-         : ��ˤϡ�GLOBAL_ONLY �λ����̵�뤵��롥
-
-      ���  NAMESPACE_ONLY
-         : ���Υե饰�����ꤵ�줿���ˤϡ����ߤ�̾�����֤ǤΤ���
-         : ���θ�����Ԥ���GLOBAL_ONLY �������⻲�Ȥ��뤳�ȡ�
-
-      ���  LEAVE_ERR_MSG
-         : �ѿ����������ˤ����ƥ��顼��ȯ��������硤���Υե饰��
-         : ���ꤵ��Ƥ���С��¹Է�̤Ȥ��� Tcl ���󥿡��ץ꥿�˥�
-         : �顼��å��������Ĥ���롥���Υե饰�����ꤵ��Ƥ��ʤ�
-         : ��С����顼��å������ϰ��ڻĤ���ʤ���
-
-      ���  APPEND_VALUE
-         : ���Υե饰�����ꤵ��Ƥ�����硤�ѿ����ͤ��֤������Τ�
-         : �Ϥʤ������ߤ��ͤ������ͤ��ɲ� (append; ʸ����Ϣ��) ��
-         : ��롥�ѿ���̤������ä���硤���Υե饰��̵�뤵��롥
-
-      ���  LIST_ELEMENT
-         : ���Υե饰�����ꤵ��Ƥ�����硤�����ͤϤޤ� Tcl �Υꥹ
-         : �����ǤȤ���Ŭ�ڤȤʤ�褦���Ѵ�����롥�����ͤ��ꥹ��
-         : (�ޤ��ϥ��֥ꥹ��) �κǽ�����ǤȤʤ�ΤǤʤ��¤ꡤ����
-         : �ͤ�ľ���ˤ϶���ʸ�����ɲä���롥
-
-      ���  PARSE_VARNAME
-         : _set_variable �ʤɤθƤӽФ��ˤ����Ƥ��Υե饰�����ꤵ
-         : ��Ƥ�����硤var_name ������Ϣ������̾������̾�Ȥ�ξ��
-         : �ޤ��ǽ�������� (������̤�ޤߡ��Ĥ���̤ǽ����) ��
-         : �Ȥ򼨤������ξ�硤��̤δ֤�����̾���ꡤ�ǽ�γ�����
-         : �̤ޤǤ�Ϣ������̾�Ȥ��ư����롥_set_variable2 �ʤɤ�
-         : ���Υե饰����ꤹ���硤Ϣ������̾������̾�� var_name 
-         : ������Ф����Ϥ��Ǥ��뤫�顤index_name ������ nil ��
-         : ���ͤФʤ�ʤ���
-
-   �⥸�塼��᥽�å�
-      mainloop(check_root = true)
-         : ���٥�ȥ롼�פ�ư���롥check_root �� true �Ǥ���С�
-         : root widget ��¸�ߤ���¤ꡤ���Υ᥽�åɤϽ�λ���ʤ���
-         : check_root �� false �ξ��ϡ�root widget �����Ǥ��Ƥ�
-         : ���Υ᥽�åɤϽ�λ���ʤ� ( root widget �����Ǥ��Ƥ⡤
-         : WINDOW �ʳ��Υ��٥�Ȥ�ȯ�������뤿�� )����λ�ˤϡ�����
-         : �����Ư���ݤ� ( ����åɤ���Ѥ���ʤ� ) ��ɬ�ס�
-
-      mainloop_thread?
-         : �����ȥ���åɤ����٥�ȥ롼�פ�¹Ԥ��Ƥ��륹��å�
-         : ���ɤ������֤���
-         : ���٥�ȥ롼�פ�¹Ԥ��Ƥ��륹��åɤǤ���� true ��
-         : �ɤΥ���åɤǤ⥤�٥�ȥ롼�פ��¹Ԥ���Ƥ��ʤ����� 
-         : nil ��¾�Υ���åɤǥ��٥�ȥ롼�פ��¹Ԥ���Ƥ����
-         : ��� false ���֤���
-         : false �κݤ� Tk ���󥿡��ץ꥿��ľ�ܸƤ֤Τϴ����Ǥ��롥
-
-      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 �ε�ǽ��ͭ���Ǥ��륤�󥿡��ץ꥿����
-         : ������������
-
-      _merge_tklist(str, str, ... )
-         : Tcl/Tk �Υ饤�֥��ؿ���Ȥäơ�������ʸ���󤬤��줾��
-         : ��������ĤΥꥹ�����ǤȤʤ�褦��Ϣ�뤷��ʸ������֤���
-
-      _conv_listelement(str)
-         : Tcl/Tk �Υ饤�֥��ؿ���Ȥäơ�������ʸ���� Tcl ��
-         : ��ĤΥꥹ�����ǤȤ���Ŭ�ڤ�ɽ���ˤʤ�褦���Ѵ�����ʸ
-         : ������֤���
-
-      _toUTF8(str, encoding=nil)
-      _fromUTF8(str, encoding=nil)
-         : Tcl/Tk ����¢���Ƥ��� UTF8 �Ѵ�������ƤӽФ���
-
-      _subst_UTF_backslash(str)
-      _subst_Tcl_backslash(str)
-         : Tcl �Υ롼��ǥХå�����å��嵭ˡ ( \uhhhh �ˤ�� 
-         : Unicode ʸ��ɽ����ޤ� ) ����Ϥ��롥
-         : _subst_Tcl_backslash �Ϥ��٤ƤΥХå�����å��嵭ˡ��
-         : �֤�������Τ��Ф���_subst_UTF_backslash �� \uhhhh 
-         : �ˤ�� Unicode ʸ��ɽ���������֤������롥
-
-      encoding_system
-      encoding_system=(encoding)
-         : Tcl �� system encoding �γ������������
-
-      encoding
-      encoding=(encoding)
-         : encoding_system / encoding_system= �� alias
-         : ( Ruby/Tk �� tk.rb �Ǥ��֤���������ͽ��Τ�Ρ�)
-
-
-���饹 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 ���֤���
-
-      allow_ruby_exit?
-         : �оݤȤʤ륤�󥿡��ץ꥿���ɾ���ǡ�ruby �� exit �ؿ��ޤ��� 
-         : Tcl/Tk ��� exit ���ޥ�ɤˤ�ä� ruby ���Τ�λ�����뤳��
-         : ��������ɤ������֤���
-	 : �����ʤ������оݤΥ��󥿡��ץ꥿��������λ���롥
-         : �ޥ��������󥿡��ץ꥿�Υǥե�����ͤ� true�����졼�֥��󥿡�
-         : �ץ꥿�Υǥե�����ͤ� false �Ǥ��롥
-
-      allow_ruby_exit=(mode)
-         : �оݤȤʤ륤�󥿡��ץ꥿�� allow_ruby_exit? �ξ��֤��ѹ����롥
-	 : $SAFE >= 4 �ޤ��ϥ��󥿡��ץ꥿�� safe ���󥿡��ץ꥿�ξ���
-	 : �ѹ���������ʤ� (�㳰��ȯ��)��
-
-      delete
-         : Tcl/Tk ���󥿡��ץ꥿�� delete ���롥
-         : delete ���줿���󥿡��ץ꥿�ϡ��ʸ���ڤ����Ǥ��ʤ��ʤꡤ
-         : ���ޥ�ɤ����äƤ��㳰��ȯ������褦�ˤʤ롥
-
-      deleted?
-         : Tcl/Tk ���󥿡��ץ꥿�����Ǥ� delete ����Ƥ��뤫��Ĵ�٤롥
-         : delete �Ѥߤǥ��ޥ�ɤ�����դ��ʤ����֤ˤʤäƤ���ʤ��
-         : true ���֤���
-
-      has_mainwindow?
-         : Tcl/Tk ���󥿡��ץ꥿�˥ᥤ�󥦥���ɥ� (root widget) ��
-         : ¸�ߤ���� true ��¸�ߤ��ʤ���� false ���֤���
-         : ���󥿡��ץ꥿������ delete �ѤߤǤ���� nil ���֤���
-
-      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=nil)
-      _fromUTF8(str, encoding=nil)
-         : 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 ��Ǥ�ɾ���μ¹Է�̤Ȥ��Ƥ�����ͤ��֤���
-
-      _get_variable(var_name, flag)
-      _get_variable2(var_name, index_name, flag)
-         : Tcl/Tk ��� var �Ȥ����ѿ�̾���ѿ����ͤ��֤���
-         : �⤷ index_name ������ (PARSE_VARNAME �ե饰�������⻲��) 
-         : ���줿����Ϣ������ var_name �� index_name �����Ǥ��֤���
-         : flag �ˤ��ѿ��򸡺�����ݤξ�����ꤹ�롥flag ��Ϳ����
-         : �ͤϥ⥸�塼�� TclTkLib::VarAccessFlag �򻲾Ȥ��뤳�ȡ�
-
-      _set_variable(var_name, value, flag)
-      _set_variable2(var_name, index_name, value, flag)
-         : Tcl/Tk ��� var �Ȥ����ѿ�̾���ѿ����ͤ����ꤹ�롥
-         : �⤷ index_name ������ (PARSE_VARNAME �ե饰�������⻲��) 
-         : ���줿����Ϣ������ var_name �� index_name �����Ǥ�����
-         : ���롥
-         : flag �ˤ��ѿ��򸡺�����ݤξ�����ꤹ�롥flag ��Ϳ����
-         : �ͤϥ⥸�塼�� TclTkLib::VarAccessFlag �򻲾Ȥ��뤳�ȡ�
-
-      _unset_variable(var_name)
-      _unset_variable2(var_name, index_name)
-         : Tcl/Tk ��� var_name �Ȥ����ѿ�̾���ѿ���õ�롥
-         : �⤷ index_name ������ (PARSE_VARNAME �ե饰�������⻲��) 
-         : ���줿����Ϣ������ var_name ���� index_name �����Ǥ���
-         : ��õ�롥
-
-      _get_global_var(var_name)
-      _get_global_var2(var_name, index_name)
-      _set_global_var(var_name, value)
-      _set_global_var2(var_name, index_name, value)
-      _unset_global_var(var_name)
-      _unset_global_var2(var_name, index_name)
-         : ���줾�졤�б������ѿ����������᥽�åɤ� flag ���Ф���
-         : (GLOBAL_ONLY | LEAVE_ERR_MSG) ��Ϳ������Ρ�
-
-      _split_tklist(str)
-         : Tcl/Tk �Υ饤�֥��ؿ���Ȥäơ�ʸ���� str ��ꥹ�Ȥ�
-         : ʬ�䤹�� (ʸ���������Ȥ����֤�)��
-
-      _merge_tklist(str, str, ... )
-         : Tcl/Tk �Υ饤�֥��ؿ���Ȥäơ�������ʸ���󤬤��줾��
-         : ��������ĤΥꥹ�����ǤȤʤ�褦��Ϣ�뤷��ʸ������֤���
-
-      _conv_listelement(str)
-         : Tcl/Tk �Υ饤�֥��ؿ���Ȥäơ�������ʸ���� Tcl ��
-         : ��ĤΥꥹ�����ǤȤ���Ŭ�ڤ�ɽ���ˤʤ�褦���Ѵ�����ʸ
-         : ������֤���
-
-      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/tk/README.1st b/ext/tk/README.1st
deleted file mode 100644
index df6c819d26..0000000000
--- a/ext/tk/README.1st
+++ /dev/null
@@ -1,22 +0,0 @@
-If you want to use Ruby/Tk (tk.rb and so on), you must have tcltklib.so 
-which is working correctly. If you fail to call 'require "tcltklib"', 
-you may not have tcltklib.so. When you have some troubles on compiling
-tcltklib, please read README files on tcltklib. 
-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 �����󥹥ȡ��뤵��Ƥ��ʤ��Τ��⤷��ޤ���tcltklib ��
-����ѥ�����˲������꤬�����Ƥ�����ϡ�tcltklib �� README �ե�����
-�򸫤Ƥ���������
-���Ȥ� Ruby �Υ饤�֥��ǥ��쥯�ȥ�� tcltklib.so ��¸�ߤ��Ƥ����Ȥ���
-�⡤�¹ԴĶ��� Tcl/Tk �饤�֥�� (libtcl8.4.so �ʤ�) ���ʤ���е�ǽ����
-����Tcl/Tk �����������󥹥ȡ��뤵��Ƥ��뤫������å����Ƥ���������
-
-==========================================================
-                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.ActiveTcl b/ext/tk/README.ActiveTcl
deleted file mode 100644
index 3afb3f4cf6..0000000000
--- a/ext/tk/README.ActiveTcl
+++ /dev/null
@@ -1,49 +0,0 @@
-ActiveTcl is ActiveState's quality-assured distribution of Tcl. 
-
-# see <http://www.activestate.com/Products/ActiveTcl/>
-#     <http://www.tcl.tk/>
-
-If you want to use ActiveTcl binary package as the Tcl/Tk libraries, 
-please use the following configure options.
-
-   --with-tcl-dir=<ActiveTcl_root>
-   --with-tk-dir=<ActiveTcl_root>
-
-And use the followings if you need.
-
-   --with-tcllib=<libname>
-   --with-tklib=<libname>
-   --enable-tcltk-stubs
-
-For example, when you install ActiveTcl-8.4.x to '/usr/local/ActiveTcl', 
-
-   configure --with-tcl-dir=/usr/local/ActiveTcl/  \
-             --with-tk-dir=/usr/local/ActiveTcl/   \
-             --with-tcllib=tclstub8.4              \
-             --with-tklib=tkstub8.4                \
-             --enable-tcltk-stubs
-
-It depends on your environment that you have to add the directory of 
-ActiveTcl's libraries to your library path when execute Ruby/Tk. 
-One of the way is to add entries to TCLLIBPATH environment variable, 
-and one of the others add to LD_LIBRARY_PATH environment variable
-
-Probably, using TCLLIBPATH is better. The value is appended at the 
-head of Tcl's 'auto_path' variable. You can see the value of the 
-variable by using 'Tk::AUTO_PATH.value' or 'Tk::AUTO_PATH.list'.
-
-For example, on Linux, one of the ways is to use LD_LIBRARY_PATH 
-environment variable. 
--------------------------------------------------------------------------
- [bash]$ LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH \
-         ruby your-Ruby/Tk-script
-
- [bash]$ LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH irb
--------------------------------------------------------------------------
-Based on it, the Tcl interpreter changes auto_path variable's value.
-
-Then, you'll be able to use Tcl/Tk extension libraries included in the
-ActiveTcl package (e.g. call TkPackage.require('BWidget'), and then,
-use functions/widgets of BWidget extention). 
-
-                                  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.fork b/ext/tk/README.fork
deleted file mode 100644
index 707d78fc12..0000000000
--- a/ext/tk/README.fork
+++ /dev/null
@@ -1,34 +0,0 @@
-Ruby/Tk does NOT support forking the process on which Tk interpreter
-is running (unless NEVER control Tk interpreter under the forked child 
-process). In the library 'tk.rb', a Tk interpreter is initialized. 
-Therefore, if you want running Tk under a child process, please call
-"require 'tk'" in the child process. 
-
-# If do fork and exec(<new Ruby/Tk>) on the child process, you can 
-# control Ruby/Tk interpreter on the child process by 'send' command 
-# of Tcl/Tk. About this, please see Tk.appsend and Tk.rb_appsend, or 
-# 'remote-tk.rb' and the sample 'sample/remote-ip_sample.rb'. 
-
-For example, the following sample1 will NOT work, and sample2 will
-work properly.
-
----<sample1: NOT work>---------------------------------------
-require 'tk'  ## init Tk interpreter under parent process
-
-exit! if fork ## exit parent process
-
-## child process
-TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
-Tk.mainloop
--------------------------------------------------------------
-
----<sample2: will work>--------------------------------------
-exit! if fork ## exit main process
-
-## child process
-require 'tk'  ## init Tk interpreter under child process
-TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
-Tk.mainloop
--------------------------------------------------------------
-
-                                         2004/05/22  Hidetoshi NAGAI
diff --git a/ext/tk/README.macosx-aqua b/ext/tk/README.macosx-aqua
deleted file mode 100644
index 25a8ed827c..0000000000
--- a/ext/tk/README.macosx-aqua
+++ /dev/null
@@ -1,67 +0,0 @@
-
-  *** for MacOS X Aqua (Tcl/Tk Aqua) users ***
-
-First of all, please read README.tcltklib to use Tcl/Tk Aqua Framework.
-
-With Tcl/Tk Aqua libraries, current tcltklib somtimes freezes when 
-using Aqua specific dialogs (e.g. Tk.messageBox). 
-This is a known bug of Ruby-1.8.4 release.
-
-When you meet the trouble on your GUI, you'll be able to avoid the trouble 
-by Tcl/Tk's traditional dialogs. 
-If you want to do that, please call some of the following bits of script 
-after "reqruie 'tk'".
-
-=================================================================
-# use a traditional dialog for Tk.chooseColor()
-Tk.ip_eval(<<'EOS')
-    proc ::tk_chooseColor {args} {
-        return [eval tk::dialog::color:: $args]
-    }
-EOS
-
-# use a traditional dialog for Tk.getOpenFile() and Tk.getMultipleOpenFile()
-Tk.ip_eval(<<'EOS')
-    proc ::tk_getOpenFile {args} {
-        if {$::tk_strictMotif} {
-            return [eval tk::MotifFDialog open $args]
-        } else {
-            return [eval ::tk::dialog::file:: open $args]
-        }
-    }
-EOS
-
-# use a traditional dialog for Tk.getSaveFile() and Tk.getMultipleSaveFile()
-Tk.ip_eval(<<'EOS')
-    proc ::tk_getSaveFile {args} {
-        if {$::tk_strictMotif} {
-            return [eval tk::MotifFDialog save $args]
-        } else {
-            return [eval ::tk::dialog::file:: save $args]
-        }
-    }
-EOS
-
-# use a traditional dialog for Tk.messageBox()
-Tk.ip_eval(<<'EOS')
-    proc ::tk_messageBox {args} {
-        return [eval tk::MessageBox $args]
-    }
-EOS
-
-# use a traditional dialog for Tk.chooseDirectory()
-Tk.ip_eval(<<'EOS')
-    proc ::tk_chooseDirectory {args} {
-        return [eval ::tk::dialog::file::chooseDir:: $args]
-    }
-EOS
-=================================================================
-
-Each of them replaces the platform specific dialog command to the 
-traditional one. 
-
-If you use some MultiTkIp objects, probably, you'll have to call the 
-bits of script for each MultiTkIp object. 
-
--- 
-Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.tcltklib b/ext/tk/README.tcltklib
deleted file mode 100644
index 5d1da48a45..0000000000
--- a/ext/tk/README.tcltklib
+++ /dev/null
@@ -1,72 +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.4.so ==> --with-tcllib=tcl8.4)
- --with-tklib=<libname>        (e.g. libtk8.4.so  ==> --with-tklib=tk8.4)
-
- --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'
-
- --enable-mac-tcltk-framework  (MacOS X) use Tcl/Tk framework
-                               (Obsolete. Please use '--enable-tcltk-framework'.)
-
- --enable-tcltk-framework      use Tcl/Tk framework
-
- --with-tcltk-framework=<dir>  the directory containts Tcl/Tk framework; 
-                               "<dir>/Tcl.framework" and "<dir>/Tk.framework".
-                               When this option is given, it is assumed that 
-                               --enable-tcltk-framework option is given also.
-
- --with-tcl-framework-header=<dir>
-      Tcl framework headers directory 
-      (e.g. "/Library/Frameworks/Tcl.framework/Headers")
-
- --with-tk-framework-header=<dir>
-      Tk framework headers directory 
-      (e.g. "/Library/Frameworks/Tk.framework/Headers")
-
-
-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.4/ --with-tcllib=tcl8.4 --with-tklib=tk8.4' ruby extconf.rb
-
-
- *** ATTENTION ***
-When your Tcl/Tk libraries are compiled with "pthread support", 
-Ruby/Tk may cause "Hang-up" or "Segmentation Fault" frequently. 
-If you have such a trouble, please try to use the '--enable-pthread' 
-option of the 'configure' command and re-compile Ruby sources. 
-It may help you to avoid this trouble. The following configure 
-options may be useful.
-
-  --enable-tcl-thread/--disable-tcl-thread
-  --with-tclConfig-file=<path of 'tclConfig.sh'>
-
-It is not need that 'tclConfig.sh' is a normal Tcl/Tk's tclConfig.sh. 
-But the file is expected to include the line "TCL_THREADS=0" or "...=1".
-When no "TCL_THREADS=?" line, if Tcl version is 7.x or 8.0 which is 
-given by "TCL_MAJOR_VERSION=?" line and "TCL_MINOR_VERSION=?" line, 
-then --disable-tcl-thread is expected. Else, ignore the 'tclConfig.sh'.
-If --enable-tcl-thread or --disable-tcl-thread option is given, then 
---with-tclConfig-file option is ignored. 
-
-==========================================================
-                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/depend b/ext/tk/depend
index 2cd9c400f7..fd63e230f0 100644
--- a/ext/tk/depend
+++ b/ext/tk/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
+tkutil.o: tkutil.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 8c8d833481..f769b06e30 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -1,309 +1,2 @@
-# extconf.rb for tcltklib
-
 require 'mkmf'
-
-is_win32 = (/mswin32|mingw|cygwin|bccwin32/ =~ RUBY_PLATFORM)
-#is_macosx = (/darwin/ =~ RUBY_PLATFORM)
-
-def find_framework(tcl_hdr, tk_hdr)
-  if framework_dir = with_config("tcltk-framework")
-    paths = [framework_dir]
-  else
-    unless tcl_hdr || tk_hdr ||
-        enable_config("tcltk-framework", false) ||
-        enable_config("mac-tcltk-framework", false)
-      return false
-    end
-    paths = ["/Library/Frameworks", "/System/Library/Frameworks"]
-  end
-
-  checking_for('Tcl/Tk Framework') {
-    paths.find{|dir|
-      dir.strip!
-      dir.chomp!('/')
-      (tcl_hdr || FileTest.directory?(dir + "/Tcl.framework/") ) &&
-        (tk_hdr || FileTest.directory?(dir + "/Tk.framework/") )
-    }
-  }
-end
-
-tcl_framework_header = with_config("tcl-framework-header")
-tk_framework_header  = with_config("tk-framework-header")
-
-tcltk_framework = find_framework(tcl_framework_header, tk_framework_header)
-
-unless is_win32
-  have_library("nsl", "t_open")
-  have_library("socket", "socket")
-  have_library("dl", "dlopen")
-  have_library("m", "log") 
-end
-
-dir_config("tk")
-dir_config("tcl")
-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"]
-  if stubs
-    func = "Tcl_InitStubs"
-    lib = "tclstub"
-  else
-    func = "Tcl_FindExecutable"
-    lib = "tcl"
-  end
-  if tcllib
-    find_library(tcllib, func, *paths)
-  elsif find_library(lib, func, *paths)
-    true
-  else
-    %w[8.5 8.4 8.3 8.2 8.1 8.0 7.6].find { |ver|
-      find_library("#{lib}#{ver}", func, *paths) or
-        find_library("#{lib}#{ver.delete('.')}", func, *paths) or
-        find_library("tcl#{ver}", func, *paths) or
-        find_library("tcl#{ver.delete('.')}", func, *paths)
-    }
-  end
-end
-
-def find_tk(tklib, stubs)
-  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-  if stubs
-    func = "Tk_InitStubs"
-    lib = "tkstub"
-  else
-    func = "Tk_Init"
-    lib = "tk"
-  end
-  if tklib
-    find_library(tklib, func, *paths)
-  elsif find_library(lib, func, *paths)
-    true
-  else
-    %w[8.5 8.4 8.3 8.2 8.1 8.0 4.2].find { |ver|
-      find_library("#{lib}#{ver}", func, *paths) or
-        find_library("#{lib}#{ver.delete('.')}", func, *paths) or
-        find_library("tk#{ver}", func, *paths) or
-        find_library("tk#{ver.delete('.')}", func, *paths)
-    }
-  end
-end
-
-def pthread_check()
-  tcl_major_ver = nil
-  tcl_minor_ver = nil
-
-  # Is tcl-thread given by user ?
-  case enable_config("tcl-thread")
-  when true
-    tcl_enable_thread = true
-  when false
-    tcl_enable_thread = false
-  else
-    tcl_enable_thread = nil
-  end
-
-  if (tclConfig = with_config("tclConfig-file"))
-    if tcl_enable_thread == true
-      puts("Warning: --with-tclConfig-file option is ignored, because --enable-tcl-thread option is given.")
-    elsif tcl_enable_thread == false
-      puts("Warning: --with-tclConfig-file option is ignored, because --disable-tcl-thread option is given.")
-    else
-      # tcl-thread is unknown and tclConfig.sh is given
-      begin
-        open(tclConfig, "r") do |cfg|
-          while line = cfg.gets()
-            if line =~ /^\s*TCL_THREADS=(0|1)/
-              tcl_enable_thread = ($1 == "1")
-              break
-            end
-
-            if line =~ /^\s*TCL_MAJOR_VERSION=("|')(\d+)\1/
-              tcl_major_ver = $2
-              if tcl_major_ver =~ /^[1-7]$/
-                tcl_enable_thread = false
-                break
-              end
-              if tcl_major_ver == "8" && tcl_minor_ver == "0"
-                tcl_enable_thread = false
-                break
-              end
-            end
-
-            if line =~ /^\s*TCL_MINOR_VERSION=("|')(\d+)\1/
-              tcl_minor_ver = $2
-              if tcl_major_ver == "8" && tcl_minor_ver == "0"
-                tcl_enable_thread = false
-                break
-              end
-            end
-          end
-        end
-
-        if tcl_enable_thread == nil
-          # not find definition
-          if tcl_major_ver
-            puts("Warning: '#{tclConfig}' doesn't include TCL_THREADS definition.")
-          else
-            puts("Warning: '#{tclConfig}' may not be a tclConfig file.")
-          end
-          tclConfig = false
-        end
-      rescue Exception
-        puts("Warning: fail to read '#{tclConfig}'!! --> ignore the file")
-        tclConfig = false
-      end
-    end
-  end
-
-  if tcl_enable_thread == nil && !tclConfig
-    # tcl-thread is unknown and tclConfig is unavailable
-    begin
-      try_run_available = try_run("int main() { exit(0); }")
-    rescue Exception
-      # cannot try_run. Is CROSS-COMPILE environment?
-      puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT CHECK WARNING: 
-**
-**   We cannot check the consistency of pthread support between Ruby 
-**   and the Tcl/Tk library in your environment (are you perhaps
-**   cross-compiling?). If pthread support for these 2 packages is
-**   inconsistent you may find you get errors when running Ruby/Tk
-**   (e.g. hangs or segmentation faults).  We strongly recommend
-**   you to check the consistency manually.
-**
-*****************************************************************************
-')
-      return true
-    end
-  end
-
-  if tcl_enable_thread == nil
-    # tcl-thread is unknown
-    if try_run(<<EOF)
-#include <tcl.h>
-int main() { 
-   Tcl_Interp *ip;
-   ip = Tcl_CreateInterp();
-   exit((Tcl_Eval(ip, "set tcl_platform(threaded)") == TCL_OK)? 0: 1);
-}
-EOF
-      tcl_enable_thread = true
-    elsif try_run(<<EOF)
-#include <tcl.h>
-static Tcl_ThreadDataKey dataKey;
-int main() { exit((Tcl_GetThreadData(&dataKey, 1) == dataKey)? 1: 0); }
-EOF
-      tcl_enable_thread = true
-    else
-      tcl_enable_thread = false
-    end
-  end
-
-  # check pthread mode
-  if (macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"'))
-    # ruby -> enable
-    unless tcl_enable_thread
-      # ruby -> enable && tcl -> disable
-      puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT MODE WARNING: 
-**
-**   Ruby is compiled with --enable-pthread, but your Tcl/Tk library
-**   seems to be compiled without pthread support. Although you can
-**   create the tcltklib library, this combination may cause errors
-**   (e.g. hangs or segmentation faults). If you have no reason to
-**   keep the current pthread support status, we recommend you reconfigure
-**   and recompile the libraries so that both or neither support pthreads.
-**
-**   If you want change the status of pthread support, please recompile 
-**   Ruby without "--enable-pthread" configure option or recompile Tcl/Tk 
-**   with "--enable-threads" configure option (if your Tcl/Tk is later 
-**   than or equal to Tcl/Tk 8.1).
-**
-*****************************************************************************
-')
-    end
-
-    # ruby -> enable && tcl -> enable/disable
-    if tcl_enable_thread
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
-    else
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
-    end
-
-    return true
-
-  else
-    # ruby -> disable
-    if tcl_enable_thread
-      # ruby -> disable && tcl -> enable
-      puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT MODE ERROR: 
-**
-**   Ruby is not compiled with --enable-pthread, but your Tcl/Tk 
-**   library seems to be compiled with pthread support. This
-**   combination may cause frequent hang or segmentation fault
-**   errors when Ruby/Tk is working. We recommend that you NEVER
-**   create the library with such a combination of pthread support.
-**
-**   Please recompile Ruby with the "--enable-pthread" configure option
-**   or recompile Tcl/Tk with the "--disable-threads" configure option.
-**
-*****************************************************************************
-')
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
-      return false
-    else
-      # ruby -> disable && tcl -> disable
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
-      return true
-    end
-  end
-end
-
-if tcltk_framework || 
-   (have_header("tcl.h") && have_header("tk.h") &&
-    (is_win32 || 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
-
-  if tcltk_framework
-    if tcl_framework_header
-      $CPPFLAGS += " -I#{tcl_framework_header}"
-    else
-      $CPPFLAGS += " -I#{tcltk_framework}/Tcl.framework/Headers"
-    end
-
-    if tk_framework_header
-      $CPPFLAGS += " -I#{tk_framework_header}"
-    else
-      $CPPFLAGS += " -I#{tcltk_framework}/Tk.framework/Headers"
-    end
-
-    $LDFLAGS += ' -framework Tk -framework Tcl'
-  end
-
-  if stubs or pthread_check
-    # create Makefile
-
-    # for SUPPORT_STATUS
-    $INSTALLFILES ||= []
-    $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
-
-    # create
-    create_makefile("tcltklib")
-  end
-end
+create_makefile("tkutil")
diff --git a/ext/tk/lib/README b/ext/tk/lib/README
index 5918fe4bf0..87b59f4972 100644
--- a/ext/tk/lib/README
+++ b/ext/tk/lib/README
@@ -1,30 +1,15 @@
 README		this file
-multi-tk.rb	multiple Tk interpreter (included safe-Tk) support
-remotei-tk.rb	control remote Tk interpreter on the other process support
 tk.rb		Tk interface
-
-tk/             library files construct Ruby/Tk
-
-tkextlib/       non-standard Tcl/Tk extension support libraries
-
-*********************************************************************
-***  The followings exists for backward compatibility only.
-***  The only thing which they work is that requires current 
-***  library files ( tk/*.rb ). 
-*********************************************************************
 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 78ed1aa6ee..0000000000
--- a/ext/tk/lib/multi-tk.rb
+++ /dev/null
@@ -1,3233 +0,0 @@
-#
-#               multi-tk.rb - supports multi Tk interpreters
-#                       by Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-require 'tcltklib'
-require 'tkutil'
-require 'thread'
-
-if defined? Tk
-  fail RuntimeError,"'multi-tk' library must be required before requiring 'tk'"
-end
-
-################################################
-# ignore exception on the mainloop?
-
-TclTkLib.mainloop_abort_on_exception = true
-# TclTkLib.mainloop_abort_on_exception = false
-# TclTkLib.mainloop_abort_on_exception = nil
-
-
-################################################
-# add ThreadGroup check to TclTkIp.new
-class << TclTkIp
-  alias __new__ new
-  private :__new__
-
-  def new(*args)
-    if Thread.current.group != ThreadGroup::Default
-      raise SecurityError, 'only ThreadGroup::Default can call TclTkIp.new'
-    end
-    __new__(*args)
-  end
-end
-
-
-################################################
-# use pseudo-toplevel feature of MultiTkIp ?
-if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) || 
-      Use_PseudoToplevel_Feature_of_MultiTkIp)
-  module MultiTkIp_PseudoToplevel_Evaluable
-    #def pseudo_toplevel_eval(body = Proc.new)
-    #  Thread.current[:TOPLEVEL] = self
-    #  begin
-    #    body.call
-    #  ensure
-    #    Thread.current[:TOPLEVEL] = nil
-    #  end
-    #end
-
-    def pseudo_toplevel_evaluable?
-      @pseudo_toplevel_evaluable
-    end
-
-    def pseudo_toplevel_evaluable=(mode)
-      @pseudo_toplevel_evaluable = (mode)? true: false
-    end
-
-    def self.extended(mod)
-      mod.__send__(:extend_object, mod)
-      mod.instance_variable_set('@pseudo_toplevel_evaluable', true)
-    end
-  end
-
-  class Object
-    alias __method_missing_alias_for_MultiTkIp__ method_missing
-    private :__method_missing_alias_for_MultiTkIp__
-
-    def method_missing(id, *args)
-      begin
-        has_top = (top = MultiTkIp.__getip.__pseudo_toplevel) && 
-          top.respond_to?(:pseudo_toplevel_evaluable?) && 
-          top.pseudo_toplevel_evaluable? && 
-          top.respond_to?(id)
-      rescue Exception => e
-        has_top = false
-      end
-
-      if has_top
-        top.__send__(id, *args)
-      else
-        __method_missing_alias_for_MultiTkIp__(id, *args)
-      end
-    end
-  end
-else
-  # dummy
-  module MultiTkIp_PseudoToplevel_Evaluable
-    def pseudo_toplevel_evaluable?
-      false
-    end
-  end
-end
-
-################################################
-# exceptiopn to treat the return value from IP
-class MultiTkIp_OK < Exception
-  def self.send(thread, 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
-  BASE_DIR = File.dirname(__FILE__)
-
-  @@SLAVE_IP_ID = ['slave'.freeze, '0'.taint].freeze
-
-  @@IP_TABLE = {}.taint unless defined?(@@IP_TABLE)
-
-  @@INIT_IP_ENV  = [].taint unless defined?(@@INIT_IP_ENV)  # table of Procs
-  @@ADD_TK_PROCS = [].taint unless defined?(@@ADD_TK_PROCS) # table of [name, args, body]
-
-  @@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST)
-
-  unless defined?(@@TK_CMD_TBL)
-    @@TK_CMD_TBL = Object.new.taint
-
-    @@TK_CMD_TBL.instance_variable_set('@tbl', {}.taint)
-
-    class << @@TK_CMD_TBL
-      allow = [
-        '__send__', '__id__', 'freeze', 'inspect', 'kind_of?', 
-        '[]', '[]=', 'delete', 'each', 'has_key?'
-      ]
-      instance_methods.each{|m| undef_method(m) unless allow.index(m)}
-
-      def kind_of?(klass)
-        @tbl.kind_of?(klass)
-      end
-
-      def inspect
-        if Thread.current.group == ThreadGroup::Default
-          @tbl.inspect
-        else
-          ip = MultiTkIp.__getip
-          @tbl.reject{|idx, ent| ent.respond_to?(:ip) && ent.ip != ip}.inspect
-        end
-      end
-
-      def [](idx)
-        return unless (ent = @tbl[idx])
-        if Thread.current.group == ThreadGroup::Default
-          ent
-        elsif ent.respond_to?(:ip)
-          (ent.ip == MultiTkIp.__getip)? ent: nil
-        else
-          ent
-        end
-      end
-
-      def []=(idx,val)
-        if self.has_key?(idx) && Thread.current.group != ThreadGroup::Default
-          fail SecurityError,"cannot change the entried command"
-        end
-        @tbl[idx] = val
-      end
-
-      def delete(idx, &blk)
-        # if gets an entry, is permited to delete
-        if self[idx]
-          @tbl.delete(idx) 
-        elsif blk
-          blk.call(idx)
-        else
-          nil
-        end
-      end
-
-      def each(&blk)
-        if Thread.current.group == ThreadGroup::Default
-          @tbl.each(&blk)
-        else
-          ip = MultiTkIp.__getip
-          @tbl.each{|idx, ent|
-            blk.call(idx, ent) unless ent.respond_to?(:ip) && ent.ip != ip
-          }
-        end
-        self
-      end
-
-      def has_key?(k)
-        @tbl.has_key?(k)
-      end
-      alias include? has_key?
-      alias key? has_key?
-      alias member? has_key?
-    end
-
-    @@TK_CMD_TBL.freeze
-  end
-
-  ######################################
-
-  @@CB_ENTRY_CLASS = Class.new(TkCallbackEntry){
-    def initialize(ip, cmd)
-      @ip = ip
-      @cmd = cmd
-      freeze
-    end
-    attr_reader :ip, :cmd
-    def inspect
-      cmd.inspect
-    end
-    def call(*args)
-      unless @ip.deleted?
-        current = Thread.current
-        backup_ip = current['callback_ip']
-        current['callback_ip'] = @ip
-        begin
-          ret = @ip.cb_eval(@cmd, *args)
-          fail ret if ret.kind_of?(Exception)
-          ret
-        rescue TkCallbackBreak, TkCallbackContinue => e
-          fail e
-	rescue SecurityError => e
-          # in 'exit', 'exit!', and 'abort' : security error --> delete IP
-          if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
-	    @ip.delete
-          elsif @ip.safe?
-	    if @ip.respond_to?(:cb_error)
-              @ip.cb_error(e)
-            else
-              nil # ignore
-            end
-          else
-            fail e
-          end
-        rescue Exception => e
-          fail e if e.message =~ /^TkCallback/
-
-          if @ip.safe?
-	    if @ip.respond_to?(:cb_error)
-              @ip.cb_error(e)
-            else
-              nil # ignore
-            end
-          else
-            fail e
-          end
-        ensure
-          current['callback_ip'] = backup_ip
-        end
-      end
-    end
-  }.freeze
-
-  ######################################
-
-  def _keys2opts(src_keys)
-    return nil if src_keys == nil
-    keys = {}; src_keys.each{|k, v| keys[k.to_s] = v}
-    #keys.collect{|k,v| "-#{k} #{v}"}.join(' ')
-    keys.collect{|k,v| "-#{k} #{TclTkLib._conv_listelement(TkComm::_get_eval_string(v))}"}.join(' ')
-  end
-  private :_keys2opts
-
-  def _check_and_return(thread, exception, wait=0)
-    unless thread
-      unless exception.kind_of?(MultiTkIp_OK)
-        msg = "#{exception.class}: #{exception.message}"
-
-        if @interp.deleted?
-          warn("Warning (#{self}): " + msg)
-          return nil
-        end
-
-        if safe?
-          warn("Warning (#{self}): " + msg) if $DEBUG
-          return nil
-        end
-
-        begin
-          @interp._eval_without_enc(@interp._merge_tklist('bgerror', msg))
-        rescue Exception => e
-          warn("Warning (#{self}): " + msg)
-        end
-      end
-      return nil
-    end
-
-    if wait == 0
-      # no wait
-      Thread.pass
-      if thread.stop?
-        thread.raise exception
-      end
-      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_cb_error(cmd = Proc.new)
-    @cb_error_proc[0] = cmd
-  end
-
-  def cb_error(e)
-    if @cb_error_proc[0].respond_to?(:call)
-      @cb_error_proc[0].call(e)
-    end
-  end
-
-  ######################################
-
-  def set_safe_level(safe)
-    if safe > @safe_level[0]
-      @safe_level[0] = safe
-      @cmd_queue.enq([@system, 'set_safe_level', safe])
-    end
-    @safe_level[0]
-  end
-  def safe_level=(safe)
-    set_safe_level(safe)
-  end
-  def self.set_safe_level(safe)
-    __getip.set_safe_level(safe)
-  end
-  def self.safe_level=(safe)
-    self.set_safe_level(safe)
-  end
-  def safe_level
-    @safe_level[0]
-  end
-  def self.safe_level
-    __getip.safe_level
-  end
-
-  def wait_on_mainloop?
-    @wait_on_mainloop[0]
-  end
-  def wait_on_mainloop=(bool)
-    @wait_on_mainloop[0] = bool
-  end
-
-  def running_mainloop?
-    @wait_on_mainloop[1] > 0
-  end
-
-  def _destroy_slaves_of_slaveIP(ip)
-    unless ip.deleted?
-      # ip._split_tklist(ip._invoke('interp', 'slaves')).each{|name|
-      ip._split_tklist(ip._invoke_without_enc('interp', 'slaves')).each{|name|
-        name = _fromUTF8(name)
-        begin
-          # ip._eval_without_enc("#{name} eval {foreach i [after info] {after cancel $i}}")
-          after_ids = ip._eval_without_enc("#{name} eval {after info}")
-          ip._eval_without_enc("#{name} eval {foreach i {#{after_ids}} {after cancel $i}}")
-        rescue Exception
-        end
-        begin
-          # ip._invoke('interp', 'eval', name, 'destroy', '.')
-          ip._invoke(name, 'eval', 'destroy', '.')
-        rescue Exception
-        end
-
-        # safe_base?
-        if ip._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
-          begin
-            ip._eval_without_enc("::safe::interpDelete #{name}")
-          rescue Exception
-          end
-        end
-=begin
-        if ip._invoke('interp', 'exists', name) == '1'
-          begin
-            ip._invoke(name, 'eval', 'exit')
-          rescue Exception
-          end
-        end
-=end
-        unless ip.deleted?
-          if ip._invoke('interp', 'exists', name) == '1'
-            begin
-              ip._invoke('interp', 'delete', name)
-            rescue Exception
-            end
-          end
-        end
-      }
-    end
-  end
-
-  def _receiver_eval_proc_core(safe_level, thread, cmd, *args)
-    begin
-      #ret = proc{$SAFE = safe_level; cmd.call(*args)}.call
-      #ret = cmd.call(safe_level, *args)
-      normal_ret = false
-      ret = catch(:IRB_EXIT) do  # IRB hack
-        retval = cmd.call(safe_level, *args)
-        normal_ret = true
-        retval
-      end
-      unless normal_ret
-        # catch IRB_EXIT
-        exit(ret)
-      end
-      ret
-    rescue SystemExit => e
-      # delete IP
-      unless @interp.deleted?
-        @slave_ip_tbl.each{|name, subip| 
-          _destroy_slaves_of_slaveIP(subip)
-          begin
-            # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-            after_ids = subip._eval_without_enc("after info")
-            subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-          rescue Exception
-          end
-=begin
-          begin
-            subip._invoke('destroy', '.') unless subip.deleted?
-          rescue Exception
-          end
-=end
-          # safe_base?
-          if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
-            begin
-              @interp._eval_without_enc("::safe::interpDelete #{name}")
-            rescue Exception
-            else
-              next if subip.deleted?
-            end
-          end
-          if subip.respond_to?(:safe_base?) && subip.safe_base? && 
-              !subip.deleted?
-            # do 'exit' to call the delete_hook procedure
-            begin
-              subip._eval_without_enc('exit') 
-            rescue Exception
-            end
-          else
-            begin
-              subip.delete unless subip.deleted?
-            rescue Exception
-            end
-          end
-        }
-
-        begin
-          # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-          after_ids = @interp._eval_without_enc("after info")
-          @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-        rescue Exception
-        end
-        begin
-          @interp._invoke('destroy', '.') unless @interp.deleted?
-        rescue Exception
-        end
-        if @safe_base && !@interp.deleted?
-          # do 'exit' to call the delete_hook procedure
-          @interp._eval_without_enc('exit')
-        else
-          @interp.delete unless @interp.deleted?
-        end
-      end
-
-      if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
-        _check_and_return(thread, MultiTkIp_OK.new($3 == 'exit'))
-      else
-        _check_and_return(thread, MultiTkIp_OK.new(nil))
-      end
-
-      # if master? && !safe? && allow_ruby_exit?
-      if !@interp.deleted? && master? && !safe? && allow_ruby_exit?
-=begin
-        ObjectSpace.each_object(TclTkIp){|obj|
-          obj.delete unless obj.deleted?
-        }
-=end
-        #exit(e.status)
-        fail e
-      end
-      # break
-
-    rescue SecurityError => e
-      # in 'exit', 'exit!', and 'abort' : security error --> delete IP
-      if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
-        ret = ($3 == 'exit')
-        unless @interp.deleted?
-          @slave_ip_tbl.each{|name, subip|
-            _destroy_slaves_of_slaveIP(subip)
-            begin
-              # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-              after_ids = subip._eval_without_enc("after info")
-              subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-            rescue Exception
-            end
-=begin
-            begin
-              subip._invoke('destroy', '.') unless subip.deleted?
-            rescue Exception
-            end
-=end
-            # safe_base?
-            if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
-              begin
-                @interp._eval_without_enc("::safe::interpDelete #{name}")
-              rescue Exception
-              else
-                next if subip.deleted?
-              end
-            end
-            if subip.respond_to?(:safe_base?) && subip.safe_base? && 
-                !subip.deleted?
-              # do 'exit' to call the delete_hook procedure
-              begin
-                subip._eval_without_enc('exit') 
-              rescue Exception
-              end
-            else
-              begin
-                subip.delete unless subip.deleted?
-              rescue Exception
-              end
-            end
-          }
-
-          begin
-            # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-            after_ids = @interp._eval_without_enc("after info")
-            @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-          rescue Exception
-          end
-=begin
-          begin
-            @interp._invoke('destroy', '.') unless @interp.deleted?
-          rescue Exception
-          end
-=end
-          if @safe_base && !@interp.deleted?
-            # do 'exit' to call the delete_hook procedure
-            @interp._eval_without_enc('exit')
-          else
-            @interp.delete unless @interp.deleted?
-          end
-        end
-        _check_and_return(thread, MultiTkIp_OK.new(ret))
-        # break
-
-      else
-        # raise security error
-        _check_and_return(thread, e)
-      end
-
-    rescue Exception => e
-      # raise exception
-      begin
-        bt = _toUTF8(e.backtrace.join("\n"))
-        bt.instance_variable_set(:@encoding, 'utf-8')
-      rescue Exception
-        bt = e.backtrace.join("\n")
-      end
-      begin
-        @interp._set_global_var('errorInfo', bt)
-      rescue Exception
-      end
-      _check_and_return(thread, e)
-
-    else
-      # no exception
-      _check_and_return(thread, MultiTkIp_OK.new(ret))
-    end
-  end
-
-  def _receiver_eval_proc(last_thread, safe_level, thread, cmd, *args)
-    if thread
-      Thread.new{
-        last_thread.join if last_thread
-        unless @interp.deleted?
-          _receiver_eval_proc_core(safe_level, thread, cmd, *args)
-        end
-      }
-    else
-      Thread.new{
-        unless  @interp.deleted?
-          _receiver_eval_proc_core(safe_level, thread, cmd, *args)
-        end
-      }
-      last_thread
-    end
-  end
-
-  private :_receiver_eval_proc, :_receiver_eval_proc_core
-
-  def _receiver_mainloop(check_root)
-    if @evloop_thread[0] && @evloop_thread[0].alive?
-      @evloop_thread[0]
-    else
-      @evloop_thread[0] = Thread.new{
-	while !@interp.deleted?
-	  #if check_root
-	  #  inf = @interp._invoke_without_enc('info', 'command', '.')
-	  #  break if !inf.kind_of?(String) || inf != '.'
-	  #end
-          break if check_root && !@interp.has_mainwindow?
-	  sleep 0.5
-	end
-      }
-      @evloop_thread[0]
-    end
-  end
-
-  def _create_receiver_and_watchdog(lvl = $SAFE)
-    lvl = $SAFE if lvl < $SAFE
-
-    # command-procedures receiver
-    receiver = Thread.new(lvl){|safe_level|
-      last_thread = {}
-
-      loop do
-        break if @interp.deleted?
-        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
-            end
-          when 'call_mainloop'
-            thread = args.shift
-            _check_and_return(thread, 
-                              MultiTkIp_OK.new(_receiver_mainloop(*args)))
-          else
-            # ignore
-          end
-
-        else
-          # procedure
-          last_thread[thread] = _receiver_eval_proc(last_thread[thread], 
-						    safe_level, thread, 
-						    cmd, *args)
-        end
-      end
-    }
-
-    # watchdog of receiver
-    watchdog = Thread.new{
-      begin
-        loop do
-          sleep 1
-          receiver.kill if @interp.deleted?
-          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{
-    @tk_windows = {}.taint
-
-    @tk_table_list = [].taint
-
-    @slave_ip_tbl = {}.taint
-
-    @slave_ip_top = {}.taint
-
-    @evloop_thread = [].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
-
-    @callback_status = [].taint
-
-    @system = Object.new
-
-    @wait_on_mainloop = [true, 0].taint
-
-    @threadgroup  = Thread.current.group
-
-    @safe_base = false
-
-    @safe_level = [$SAFE]
-
-    @cmd_queue = Queue.new
-
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
-
-    @threadgroup.add @cmd_receiver
-    @threadgroup.add @receiver_watchdog
-
-    # NOT enclose @threadgroup for @@DEFAULT_MASTER
-
-    @@IP_TABLE[ThreadGroup::Default] = self
-    @@IP_TABLE[@threadgroup] = self
-
-    #################################
-
-    @pseudo_toplevel = [false, nil]
-
-    def self.__pseudo_toplevel
-      Thread.current.group == ThreadGroup::Default && 
-        MultiTkIp.__getip == @@DEFAULT_MASTER &&
-        self.__pseudo_toplevel_evaluable? && @pseudo_toplevel[1]
-    end
-
-    def self.__pseudo_toplevel=(m)
-      unless (Thread.current.group == ThreadGroup::Default && 
-                MultiTkIp.__getip == @@DEFAULT_MASTER)
-        fail SecurityError, "no permission to manipulate"
-      end
-
-      # if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
-      if m.respond_to?(:pseudo_toplevel_evaluable?)
-        @pseudo_toplevel[0] = true
-        @pseudo_toplevel[1] = m
-      else
-        fail ArgumentError, 'fail to set pseudo-toplevel'
-      end
-      self
-    end
-
-    def self.__pseudo_toplevel_evaluable?
-      begin
-        @pseudo_toplevel[0] && @pseudo_toplevel[1].pseudo_toplevel_evaluable?
-      rescue Exception
-        false
-      end
-    end
-
-    def self.__pseudo_toplevel_evaluable=(mode)
-      unless (Thread.current.group == ThreadGroup::Default && 
-                MultiTkIp.__getip == @@DEFAULT_MASTER)
-        fail SecurityError, "no permission to manipulate"
-      end
-
-      @pseudo_toplevel[0] = (mode)? true: false
-    end
-
-    #################################
-
-    @assign_request = Class.new(Exception){
-      def self.new(target, ret)
-        obj = super()
-        obj.target = target
-        obj.ret = ret
-        obj
-      end
-      attr_accessor :target, :ret
-    }
-
-    @assign_thread = Thread.new{
-      loop do
-        begin
-          Thread.stop
-        rescue @assign_request=>req
-          begin
-            req.ret[0] = req.target.instance_eval{
-              @cmd_receiver, @receiver_watchdog = 
-                _create_receiver_and_watchdog(@safe_level[0])
-              @threadgroup.add @cmd_receiver
-              @threadgroup.add @receiver_watchdog
-              @threadgroup.enclose
-              true
-            }
-          rescue Exception=>e
-            begin
-              req.ret[0] = e
-            rescue Exception
-              # ignore
-            end
-          end
-        rescue Exception
-          # ignore
-        end
-      end
-    }
-
-    def self.assign_receiver_and_watchdog(target)
-      ret = [nil]
-      @assign_thread.raise(@assign_request.new(target, ret))
-      while ret[0] == nil
-        unless @assign_thread.alive?
-          raise RuntimeError, 'lost the thread to assign a receiver and a watchdog thread'
-        end
-      end
-      if ret[0].kind_of?(Exception)
-        raise ret[0]
-      else
-        ret[0]
-      end
-    end
-
-    #################################
-
-    @init_ip_env_queue = Queue.new
-    Thread.new{
-      current = Thread.current
-      loop {
-        mtx, ret, table, script = @init_ip_env_queue.deq
-        begin        
-          ret[0] = table.each{|tg, ip| ip._init_ip_env(script) }
-        rescue Exception => e
-          ret[0] = e
-        ensure
-          mtx.unlock
-        end
-      }
-    }
-
-    def self.__init_ip_env__(table, script)
-      ret = []
-      mtx = Mutex.new.lock
-      @init_ip_env_queue.enq([mtx, ret, table, script])
-      mtx.lock
-      if ret[0].kind_of?(Exception)
-        raise ret[0]
-      else
-        ret[0]
-      end
-    end
-
-    #################################
-
-    class << self
-      undef :instance_eval
-    end
-  }
-
-  @@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|
-      k_str = k.to_s
-      if k_str == 'name'
-        name = v 
-      elsif k_str == 'safe'
-        safe = v
-      elsif @@SAFE_OPT_LIST.member?(k_str)
-        safe_opts[k_str] = v
-      else
-        tk_opts[k_str] = v
-      end
-    }
-
-    if keys['without_tk'] || keys[:without_tk]
-      [name, safe, safe_opts, nil]
-    else
-      [name, safe, safe_opts, tk_opts]
-    end
-  end
-  private :_parse_slaveopts
-
-  def _create_slave_ip_name
-    name = @@SLAVE_IP_ID.join('')
-    @@SLAVE_IP_ID[1].succ!
-    name.freeze
-  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'])
-          assoc_display = @interp._invoke('winfo', 'screen', pathname)
-        rescue
-          assoc_display = new_keys['display']
-        end
-      end
-
-      # match display?
-      if assoc_display != new_keys['display']
-        if optkeys.key?(:display) || optkeys.key?('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 => e
-      fail e 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
-        slave_ip._eval_without_enc('exit')
-      end
-      begin
-        top.destroy if top.winfo_exist?
-      rescue
-        # ignore
-      end
-    }
-    tag = TkBindTag.new.bind('Destroy', slave_delete_proc)
-
-    top.bindtags = top.bindtags.unshift(tag)
-
-    # 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)
-    c.bind('Destroy', proc{top.destroy})
-
-    # return keys
-    loadTk_keys['use'] = TkWinfo.id(c)
-    [loadTk_keys, top.path]
-  end
-  private :__create_safetk_frame
-
-  def __create_safe_slave_obj(safe_opts, app_name, tk_opts)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    # safe interpreter
-    ip_name = _create_slave_ip_name
-    slave_ip = @interp.create_slave(ip_name, true)
-    @slave_ip_tbl[ip_name] = slave_ip
-    def slave_ip.safe_base?
-      true
-    end
-
-    @interp._eval("::safe::interpInit #{ip_name}")
-
-    slave_ip._invoke('set', 'argv0', app_name) if app_name.kind_of?(String)
-
-    if tk_opts
-      tk_opts = __check_safetk_optkeys(tk_opts)
-      if tk_opts.key?('use')
-        @slave_ip_top[ip_name] = ''
-      else
-        tk_opts, top_path = __create_safetk_frame(slave_ip, ip_name, app_name, 
-                                                  tk_opts)
-        @slave_ip_top[ip_name] = top_path
-      end
-      @interp._eval("::safe::loadTk #{ip_name} #{_keys2opts(tk_opts)}")
-    else
-      @slave_ip_top[ip_name] = nil
-    end
-
-    if safe_opts.key?('deleteHook') || safe_opts.key?(:deleteHook)
-      @interp._eval("::safe::interpConfigure #{ip_name} " + 
-                    _keys2opts(safe_opts))
-    else
-      @interp._eval("::safe::interpConfigure #{ip_name} " + 
-                    _keys2opts(safe_opts) + '-deleteHook {' + 
-                    TkComm._get_eval_string(proc{|slave|
-                                              self._default_delete_hook(slave)
-                                            }) + '}')
-    end
-
-    [slave_ip, ip_name]
-  end
-
-  def __create_trusted_slave_obj(name, keys)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    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={})
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    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.deleted? && safeip == nil
-      fail RuntimeError, "cannot create a slave of a deleted interpreter"
-    end
-
-    if !master.deleted? && !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
-
-    @tk_windows = {}
-    @tk_table_list = []
-    @slave_ip_tbl = {}
-    @slave_ip_top = {}
-    @cb_error_proc = []
-    @evloop_thread = []
-
-    @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?
-    @slave_ip_top.taint unless @slave_ip_top.tainted?
-    @cb_error_proc.taint unless @cb_error_proc.tainted?
-    @evloop_thread.taint unless @evloop_thread.tainted?
-
-    @callback_status = []
-
-    name, safe, safe_opts, tk_opts = _parse_slaveopts(keys)
-
-    safe = 4 if safe && !safe.kind_of?(Fixnum)
-
-    @safe_base = false
-
-    if safeip == nil
-      # create master-ip
-      @interp = TclTkIp.new(name, _keys2opts(tk_opts))
-
-      @ip_name = nil
-      if safe
-        safe = $SAFE if safe < $SAFE
-        @safe_level = [safe]
-      else
-        @safe_level = [$SAFE]
-      end
-    else
-      # create slave-ip
-      if safeip || master.safe?
-        @safe_base = true
-        @interp, @ip_name = master.__create_safe_slave_obj(safe_opts, 
-                                                           name, tk_opts)
-        if safe
-          safe = master.safe_level if safe < master.safe_level
-          @safe_level = [safe]
-        else
-          @safe_level = [4]
-        end
-      else
-        @interp, @ip_name = master.__create_trusted_slave_obj(name, tk_opts)
-        if safe
-          safe = master.safe_level if safe < master.safe_level
-          @safe_level = [safe]
-        else
-          @safe_level = [master.safe_level]
-        end
-      end
-      @set_alias_proc = proc{|name| 
-        master._invoke('interp', 'alias', @ip_name, name, '', name)
-      }.freeze
-    end
-
-    @system = Object.new
-
-    @wait_on_mainloop = [true, 0].taint
-    # @wait_on_mainloop = [false, 0].taint
-
-    @threadgroup  = ThreadGroup.new
-
-    @pseudo_toplevel = [false, nil]
-
-    @cmd_queue = Queue.new
-
-=begin
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
-
-    @threadgroup.add @cmd_receiver
-    @threadgroup.add @receiver_watchdog
-
-    @threadgroup.enclose
-=end
-    @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
-
-    @@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
-    }
-
-    class << self
-      undef :instance_eval
-    end
-
-    # dummy call for initialization
-    self.eval_proc{ Tk.tk_call('set', 'tcl_patchLevel') }
-
-    self.freeze  # defend against modification
-  end
-
-  ######################################
-
-  def _default_delete_hook(slave)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @slave_ip_tbl.delete(slave)
-    top = @slave_ip_top.delete(slave)
-    if top.kind_of?(String)
-      # call default hook of safetk.tcl (ignore exceptions)
-      if top == ''
-        begin
-          @interp._eval("::safe::disallowTk #{slave}")
-        rescue
-          warn("Waring: fail to call '::safe::disallowTk'") if $DEBUG
-        end
-      else # toplevel path
-        begin
-          @interp._eval("::safe::tkDelete {} #{top} #{slave}")
-        rescue
-          warn("Waring: fail to call '::safe::tkDelete'") if $DEBUG
-          begin
-            @interp._eval("destroy #{top}")
-          rescue
-            warn("Waring: fail to destroy toplevel") if $DEBUG
-          end
-        end
-      end
-    end
-  end
-
-end
-
-
-# get target IP
-class MultiTkIp
-  def self._ip_id_
-    __getip._ip_id_
-  end
-  def _ip_id_
-    # for RemoteTkIp
-    ''
-  end
-
-  def self.__getip
-    current = Thread.current
-    if TclTkLib.mainloop_thread? != false && current['callback_ip']
-      return current['callback_ip']
-    end
-    if current.group == ThreadGroup::Default
-      @@DEFAULT_MASTER
-    else
-      ip = @@IP_TABLE[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(safe=nil, keys={})
-    if safe.kind_of?(Hash)
-      keys = safe
-    elsif safe.kind_of?(Integer)
-      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
-      if !keys.key?(:safe) && !keys.key?('safe')
-        keys[:safe] = safe
-      end
-    elsif safe == nil
-      # do nothing
-    else
-      raise ArgumentError, "unexpected argument(s)"
-    end
-
-    ip = __new(__getip, nil, keys)
-    #ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
-     if block_given?
-       Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
-     end
-    ip
-  end
-
-  alias new new_master
-
-  def new_slave(safe=nil, keys={})
-    if safe.kind_of?(Hash)
-      keys = safe
-    elsif safe.kind_of?(Integer)
-      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
-      if !keys.key?(:safe) && !keys.key?('safe')
-        keys[:safe] = safe
-      end
-    elsif safe == nil
-      # do nothing
-    else
-      raise ArgumentError, "unexpected argument(s)"
-    end
-
-    ip = __new(__getip, false, keys)
-    # ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
-    if block_given?
-      Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
-    end
-    ip
-  end
-  alias new_trusted_slave new_slave
-
-  def new_safe_slave(safe=4, keys={})
-    if safe.kind_of?(Hash)
-      keys = safe
-    elsif safe.kind_of?(Integer)
-      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
-      if !keys.key?(:safe) && !keys.key?('safe')
-        keys[:safe] = safe
-      end
-    else
-      raise ArgumentError, "unexpected argument(s)"
-    end
-
-    ip = __new(__getip, true, keys)
-    # ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
-    if block_given?
-      Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
-    end
-    ip
-  end
-  alias new_safeTk new_safe_slave
-end
-
-
-# get info
-class MultiTkIp
-  def inspect
-    s = self.to_s.chop!
-    if self.manipulable?
-      if master?
-        if @interp.deleted?
-          s << ':deleted-master'
-        else
-          s << ':master'
-        end
-      else
-        if @interp.deleted?
-          s << ':deleted-slave'
-        elsif @interp.safe?
-          s << ':safe-slave'
-        else
-          s << ':trusted-slave'
-        end
-      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?
-    not self.master?
-  end
-
-  def alive?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    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)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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
-
-  def manipulable?
-    return true if (Thread.current.group == ThreadGroup::Default)
-    ip = MultiTkIp.__getip
-    (ip == self) || ip._is_master_of?(@interp)
-  end
-  def self.manipulable?
-    true
-  end
-
-  def _is_master_of?(tcltkip_obj)
-    tcltkip_obj.slave_of?(@interp)
-  end
-  protected :_is_master_of?
-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)
-    self.eval_proc{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 _remove_tk_procs(*names)
-    return if slave?
-    names.each{|name|
-      name = name.to_s
-      @interp._invoke('rename', name, '')
-      @interp._invoke('interp', 'slaves').split.each{|slave|
-        @interp._invoke('interp', 'alias', slave, name, '') rescue nil
-      }
-    }
-  end
-
-  def _init_ip_internal(init_ip_env, add_tk_procs)
-    #init_ip_env.each{|script| self.eval_proc{script.call(self)}}
-    init_ip_env.each{|script| self._init_ip_env(script)}
-    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? 
-      begin
-        raise SecurityError, "slave-IP has no permission creating a new table"
-      rescue SecurityError => e
-        #p e.backtrace
-        # Is called on a Ruby/Tk library?
-        caller_info = e.backtrace[1]
-        if caller_info =~ %r{^#{MultiTkIp::BASE_DIR}/(tk|tkextlib)/[^:]+\.rb:}
-          # Probably, caller is a Ruby/Tk library  -->  allow creating
-        else
-          raise e
-        end
-      end
-    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
-    if __getip.slave?
-      begin
-        raise SecurityError, "slave-IP has no permission initializing IP env"
-      rescue SecurityError => e
-        #p e.backtrace
-        # Is called on a Ruby/Tk library?
-        caller_info = e.backtrace[1]
-        if caller_info =~ %r{^#{MultiTkIp::BASE_DIR}/(tk|tkextlib)/[^:]+\.rb:}
-          # Probably, caller is a Ruby/Tk library  -->  allow creating
-        else
-          raise e
-        end
-      end
-    end
-
-    # @@IP_TABLE.each{|tg, ip| 
-    #   ip._init_ip_env(script)
-    # }
-    @@DEFAULT_MASTER.__init_ip_env__(@@IP_TABLE, script)
-  end
-
-  def self.add_tk_procs(name, args=nil, body=nil)
-    if name.kind_of?(Array) # => an array of [name, args, body]
-      name.each{|param| self.add_tk_procs(*param)}
-    else
-      name = name.to_s
-      @@ADD_TK_PROCS << [name, args, body]
-      @@IP_TABLE.each{|tg, ip| 
-        ip._add_tk_procs(name, args, body)
-      }
-    end
-  end
-
-  def self.remove_tk_procs(*names)
-    names.each{|name|
-      name = name.to_s
-      @@ADD_TK_PROCS.delete_if{|elem| 
-        elem.kind_of?(Array) && elem[0].to_s == name
-      }
-    }
-    @@IP_TABLE.each{|tg, ip| 
-      ip._remove_tk_procs(*names)
-    }
-  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.cb_entry_class
-    @@CB_ENTRY_CLASS
-  end
-  def self.get_cb_entry(cmd)
-    @@CB_ENTRY_CLASS.new(__getip, cmd).freeze
-  end
-
-=begin
-  def cb_eval(cmd, *args)
-    #self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
-    #ret = self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
-    ret = self.eval_callback(*args){|safe, *params|
-      $SAFE=safe if $SAFE < safe
-      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
-    }
-    if ret.kind_of?(Exception)
-      raise ret
-    end
-    ret
-  end
-=end
-  def cb_eval(cmd, *args)
-    self.eval_callback(*args){|safe, *params|
-      $SAFE=safe if $SAFE < safe
-      # TkUtil.eval_cmd(cmd, *params)
-      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
-    }
-  end
-=begin
-  def cb_eval(cmd, *args)
-    @callback_status[0] ||= TkVariable.new
-    @callback_status[1] ||= TkVariable.new
-    st, val = @callback_status
-    th = Thread.new{
-      self.eval_callback(*args){|safe, *params|
-        #p [status, val, safe, *params]
-        $SAFE=safe if $SAFE < safe
-        begin
-          TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
-        rescue TkCallbackContinue
-          st.value = 4
-        rescue TkCallbackBreak
-          st.value = 3
-        rescue TkCallbackReturn
-          st.value = 2
-        rescue Exception => e
-          val.value = e.message
-          st.value = 1
-        else
-          st.value = 0
-        end
-      }
-    }
-    begin
-      st.wait
-      status = st.numeric
-      retval = val.value
-    rescue => e
-      fail e
-    end
-
-    if status == 1
-      fail RuntimeError, retval
-    elsif status == 2
-      fail TkCallbackReturn, "Tk callback returns 'return' status"
-    elsif status == 3
-      fail TkCallbackBreak, "Tk callback returns 'break' status"
-    elsif status == 4
-      fail TkCallbackContinue, "Tk callback returns 'continue' status"
-    else
-      ''
-    end
-  end
-=end
-
-end
-
-# pseudo-toplevel operation support
-class MultiTkIp
-  # instance method
-  def __pseudo_toplevel
-    ip = MultiTkIp.__getip
-    (ip == @@DEFAULT_MASTER || ip == self) &&
-      self.__pseudo_toplevel_evaluable? && @pseudo_toplevel[1]
-  end
-
-  def __pseudo_toplevel=(m)
-    unless (Thread.current.group == ThreadGroup::Default && 
-              MultiTkIp.__getip == @@DEFAULT_MASTER)
-      fail SecurityError, "no permission to manipulate"
-    end
-
-    # if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
-    if m.respond_to?(:pseudo_toplevel_evaluable?)
-      @pseudo_toplevel[0] = true
-      @pseudo_toplevel[1] = m
-    else
-      fail ArgumentError, 'fail to set pseudo-toplevel'
-    end
-    self
-  end
-
-  def __pseudo_toplevel_evaluable?
-    begin
-      @pseudo_toplevel[0] && @pseudo_toplevel[1].pseudo_toplevel_evaluable?
-    rescue Exception
-      false
-    end
-  end
-
-  def __pseudo_toplevel_evaluable=(mode)
-    unless (Thread.current.group == ThreadGroup::Default && 
-              MultiTkIp.__getip == @@DEFAULT_MASTER)
-      fail SecurityError, "no permission to manipulate"
-    end
-
-    @pseudo_toplevel[0] = (mode)? true: false
-  end
-end
-
-# evaluate a procedure on the proper interpreter
-class MultiTkIp
-  # instance method
-  def eval_proc_core(req_val, cmd, *args)
-    # check
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    unless cmd.kind_of?(Proc) || cmd.kind_of?(Method)
-      raise RuntimeError, "A Proc/Method object is expected for the 'cmd' argument"
-    end
-
-    # on IP thread
-    if @cmd_receiver == Thread.current || 
-        (!req_val && TclTkLib.mainloop_thread? != false) # callback
-      begin
-        ret = cmd.call(safe_level, *args)
-      rescue SystemExit => e
-        # exit IP
-        warn("Warning: "+ $! + " on " + self.inspect) if $DEBUG
-        begin
-          self._eval_without_enc('exit')
-        rescue Exception
-        end
-        self.delete
-        ret = nil
-      rescue Exception => e
-        if $DEBUG
-          warn("Warning: " + e.class.inspect + 
-               ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-               " on " + self.inspect)
-        end
-=begin
-        begin
-          bt = _toUTF8(e.backtrace.join("\n"))
-          bt.instance_variable_set(:@encoding, 'utf-8')
-        rescue Exception
-          bt = e.backtrace.join("\n")
-        end
-        begin
-          @interp._set_global_var('errorInfo', bt)
-        rescue Exception
-        end
-=end
-        ret = e
-      end
-      return ret
-    end
-
-    # send cmd to the proc-queue
-    unless req_val
-      begin
-        @cmd_queue.enq([nil, cmd, *args])
-      rescue Exception => e
-        # ignore
-        if $DEBUG
-          warn("Warning: " + e.class.inspect + 
-               ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-               " on " + self.inspect) 
-        end
-        return e
-      end
-      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 => e
-      # exit IP
-      warn("Warning: " + $! + " on " + self.inspect) if $DEBUG
-      begin
-        self._eval_without_enc('exit')
-      rescue Exception
-      end
-      if !self.deleted? && !safe? && allow_ruby_exit?
-        self.delete
-        fail e
-      else
-        self.delete
-      end
-    rescue Exception => e
-      if $DEBUG
-        warn("Warning: " + e.class.inspect + 
-             ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-             " on " + self.inspect) 
-      end
-      return e
-    end
-    return nil
-  end
-  private :eval_proc_core
-
-  def eval_callback(*args)
-    if block_given?
-      cmd = Proc.new
-    else
-      cmd = args.shift
-    end
-    current = Thread.current
-    backup_ip = current['callback_ip']
-    current['callback_ip'] = self
-    begin
-      eval_proc_core(false, cmd, *args)
-    ensure
-      current['callback_ip'] = backup_ip
-    end
-  end
-
-  def eval_proc(*args)
-    # The scope of the eval-block of 'eval_proc' method is different from 
-    # the external. If you want to pass local values to the eval-block, 
-    # use arguments of eval_proc method. They are passed to block-arguments.
-    if block_given?
-      cmd = Proc.new
-    else
-      unless (cmd = args.shift)
-        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
-      end
-    end
-    if TclTkLib.mainloop_thread? == true
-      # call from eventloop
-      current = Thread.current
-      backup_ip = current['callback_ip']
-      current['callback_ip'] = self
-      begin
-        eval_proc_core(false, 
-	               proc{|safe, *params|
-		         $SAFE=safe if $SAFE < safe
-                         cmd.call(*params)
-                       }, *args)
-      ensure
-        current['callback_ip'] = backup_ip
-      end
-    else
-      eval_proc_core(true, 
-                     proc{|safe, *params| 
-                       $SAFE=safe if $SAFE < safe
-                       Thread.new(*params, &cmd).value
-                     },
-                     *args)
-    end
-  end
-  alias call eval_proc
-
-  def bg_eval_proc(*args)
-    if block_given?
-      cmd = Proc.new
-    else
-      unless (cmd = args.shift)
-        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
-      end
-    end
-    Thread.new{
-      eval_proc(cmd, *args)
-=begin
-      eval_proc_core(false, 
-                     proc{|safe, *params| 
-                       $SAFE=safe if $SAFE < safe
-                       Thread.new(*params, &cmd).value
-                     },
-                     safe_level, *args)
-=end
-    }
-  end
-  alias background_eval_proc bg_eval_proc
-  alias thread_eval_proc bg_eval_proc
-  alias bg_call bg_eval_proc
-  alias background_call bg_eval_proc
-
-  def eval_string(cmd, *eval_args)
-    # cmd string ==> proc
-    unless cmd.kind_of?(String)
-      raise RuntimeError, "A String object is expected for the 'cmd' argument"
-    end
-
-    eval_proc_core(true, 
-                   proc{|safe| 
-                     Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
-                                 *eval_args)
-                   })
-  end
-  alias eval_str eval_string
-
-  def bg_eval_string(cmd, *eval_args)
-    # cmd string ==> proc
-    unless cmd.kind_of?(String)
-      raise RuntimeError, "A String object is expected for the 'cmd' argument"
-    end
-    Thread.new{
-      eval_proc_core(true, 
-                     proc{|safe| 
-                       Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
-                                   *eval_args)
-                     })
-    }
-  end
-  alias background_eval_string bg_eval_string
-  alias bg_eval_str bg_eval_string
-  alias background_eval_str bg_eval_string
-
-  def eval(*args, &blk)
-    if block_given?
-      eval_proc(*args, &blk)
-    elsif args[0]
-      if args[0].respond_to?(:call)
-        eval_proc(*args)
-      else
-        eval_string(*args)
-      end
-    else
-      fail ArgumentError, "no argument to eval"
-    end
-  end
-
-  def bg_eval(*args, &blk)
-    if block_given?
-      bg_eval_proc(*args, &blk)
-    elsif args[0]
-      if args[0].respond_to?(:call)
-        bg_eval_proc(*args)
-      else
-        bg_eval_string(*args)
-      end
-    else
-      fail ArgumentError, "no argument to eval"
-    end
-  end
-  alias background_eval bg_eval
-end
-
-class << MultiTkIp
-  # class method
-  def eval_proc(*args, &blk)
-    # class ==> interp object
-    __getip.eval_proc(*args, &blk)
-  end
-  alias call eval_proc
-
-  def bg_eval_proc(*args, &blk)
-    # class ==> interp object
-    __getip.bg_eval_proc(*args, &blk)
-  end
-  alias background_eval_proc bg_eval_proc
-  alias thread_eval_proc bg_eval_proc
-  alias bg_call bg_eval_proc
-  alias background_call bg_eval_proc
-
-  def eval_string(cmd, *eval_args)
-    # class ==> interp object
-    __getip.eval_string(cmd, *eval_args)
-  end
-  alias eval_str eval_string
-
-  def bg_eval_string(cmd, *eval_args)
-    # class ==> interp object
-    __getip.bg_eval_string(cmd, *eval_args)
-  end
-  alias background_eval_string bg_eval_string
-  alias bg_eval_str bg_eval_string
-  alias background_eval_str bg_eval_string
-
-  def eval(*args, &blk)
-    # class ==> interp object
-    __getip.eval(*args, &blk)
-  end
-  def bg_eval(*args, &blk)
-    # class ==> interp object
-    __getip.bg_eval(*args, &blk)
-  end
-  alias background_eval bg_eval
-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
-    TclTkLib.mainloop_abort_on_exception
-  end
-  def mainloop_abort_on_exception=(mode)
-    # __getip.mainloop_abort_on_exception=(mode)
-    TclTkLib.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 safe_base?
-    begin
-      __getip.safe_base?
-    rescue
-      false
-    end
-  end
-
-  def allow_ruby_exit?
-    __getip.allow_ruby_exit?
-  end
-
-  def allow_ruby_exit= (mode)
-    __getip.allow_ruby_exit = mode
-  end
-
-  def delete
-    __getip.delete
-  end
-
-  def deleted?
-    __getip.deleted?
-  end
-
-  def has_mainwindow?
-    __getip.has_mainwindow?
-  end
-
-  def invalid_namespace?
-    __getip.invalid_namespace?
-  end
-
-  def abort(msg = nil)
-    __getip.abort(msg)
-  end
-
-  def exit(st = true)
-    __getip.exit(st)
-  end
-
-  def exit!(st = false)
-    __getip.exit!(st)
-  end
-
-  def restart(app_name = nil, keys = {})
-    init_ip_internal
-
-    __getip._invoke('set', 'argv0', app_name) if app_name
-    if keys.kind_of?(Hash)
-      __getip._invoke('set', 'argv', _keys2opts(keys))
-    end
-
-    __getip.restart
-  end
-
-  def _eval(str)
-    __getip._eval(str)
-  end
-
-  def _invoke(*args)
-    __getip._invoke(*args)
-  end
-
-  def _eval_without_enc(str)
-    __getip._eval_without_enc(str)
-  end
-
-  def _invoke_without_enc(*args)
-    __getip._invoke_without_enc(*args)
-  end
-
-  def _eval_with_enc(str)
-    __getip._eval_with_enc(str)
-  end
-
-  def _invoke_with_enc(*args)
-    __getip._invoke_with_enc(*args)
-  end
-
-  def _toUTF8(str, encoding=nil)
-    __getip._toUTF8(str, encoding)
-  end
-
-  def _fromUTF8(str, encoding=nil)
-    __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
-
-  def _get_variable(var, flag)
-    __getip._get_variable(var, flag)
-  end
-  def _get_variable2(var, idx, flag)
-    __getip._get_variable2(var, idx, flag)
-  end
-  def _set_variable(var, value, flag)
-    __getip._set_variable(var, value, flag)
-  end
-  def _set_variable2(var, idx, value, flag)
-    __getip._set_variable2(var, idx, value, flag)
-  end
-  def _unset_variable(var, flag)
-    __getip._unset_variable(var, flag)
-  end
-  def _unset_variable2(var, idx, flag)
-    __getip._unset_variable2(var, idx, flag)
-  end
-
-  def _get_global_var(var)
-    __getip._get_global_var(var)
-  end
-  def _get_global_var2(var, idx)
-    __getip._get_global_var2(var, idx)
-  end
-  def _set_global_var(var, value)
-    __getip._set_global_var(var, value)
-  end
-  def _set_global_var2(var, idx, value)
-    __getip._set_global_var2(var, idx, value)
-  end
-  def _unset_global_var(var)
-    __getip._unset_global_var(var)
-  end
-  def _unset_global_var2(var, idx)
-    __getip._unset_global_var2(var, idx)
-  end
-
-  def _make_menu_embeddable(menu_path)
-    __getip._make_menu_embeddable(menu_path)
-  end
-
-  def _split_tklist(str)
-    __getip._split_tklist(str)
-  end
-  def _merge_tklist(*args)
-    __getip._merge_tklist(*args)
-  end
-  def _conv_listelement(arg)
-    __getip._conv_listelement(arg)
-  end
-
-  def _create_console
-    __getip._create_console
-  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(*args)
-    MultiTkIp.restart(*args)
-  end
-
-  def _merge_tklist(*args)
-    MultiTkIp._merge_tklist(*args)
-  end
-  def _conv_listelement(arg)
-    MultiTkIp._conv_listelement(arg)
-  end
-end
-
-
-# depend on TclTkIp
-class MultiTkIp
-  def mainloop(check_root = true, restart_on_dead = true)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    #return self if self.slave?
-    #return self if self != @@DEFAULT_MASTER
-    if self != @@DEFAULT_MASTER
-      if @wait_on_mainloop[0]
-        begin
-          @wait_on_mainloop[1] += 1
-          if $SAFE >= 4
-	    _receiver_mainloop(check_root).join
-          else
-            @cmd_queue.enq([@system, 'call_mainloop', 
-                            Thread.current, check_root])
-            Thread.stop
-          end
-        rescue MultiTkIp_OK => ret
-          # return value
-          if ret.value.kind_of?(Thread)
-            return ret.value.value
-          else
-            return ret.value
-          end
-        rescue SystemExit => e
-          # exit IP
-          warn("Warning: " + $! + " on " + self.inspect) if $DEBUG
-          begin
-            self._eval_without_enc('exit')
-          rescue Exception
-          end
-          self.delete
-        rescue StandardError => e
-          if $DEBUG
-            warn("Warning: " + e.class.inspect + 
-                 ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-                 " on " + self.inspect) 
-          end
-          return e
-        rescue Exception => e
-	  return e
-        ensure
-          @wait_on_mainloop[1] -= 1
-        end
-      end
-      return
-    end
-
-    unless restart_on_dead
-      @wait_on_mainloop[1] += 1
-=begin
-      begin
-        @interp.mainloop(check_root)
-      rescue StandardError => e
-        if $DEBUG
-          warn("Warning: " + e.class.inspect + 
-               ((e.message.length > 0)? ' "' + e.message + '"': '') +  
-               " on " + self.inspect) 
-        end
-      end
-=end
-      begin
-	@interp.mainloop(check_root)
-      ensure
-	@wait_on_mainloop[1] -= 1
-      end
-    else
-      loop do
-        break unless self.alive?
-        if check_root
-          begin
-            break if TclTkLib.num_of_mainwindows == 0
-          rescue StandardError
-            break
-          end
-        end
-        break if @interp.deleted?
-        begin
-	  @wait_on_mainloop[1] += 1
-          @interp.mainloop(check_root)
-        rescue StandardError => e
-          if TclTkLib.mainloop_abort_on_exception != nil
-            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect, 
-            #             " exception (ignore) : ", $!.message, "\n");
-            if $DEBUG
-              warn("Warning: Tk mainloop receives " << e.class.inspect <<
-                   " exception (ignore) : " << e.message);
-            end
-          end
-          #raise e
-        rescue Exception => e
-=begin
-          if TclTkLib.mainloop_abort_on_exception != nil
-            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect, 
-            #             " exception (ignore) : ", $!.message, "\n");
-            if $DEBUG
-              warn("Warning: Tk mainloop receives " << e.class.inspect <<
-                   " exception (ignore) : " << e.message);
-            end
-          end
-=end
-          raise e
-        ensure
-          @wait_on_mainloop[1] -= 1
-          Thread.pass  # avoid eventloop conflict
-        end
-      end
-    end
-    self
-  end
-
-  def make_safe
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.make_safe
-  end
-
-  def safe?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.safe?
-  end
-
-  def safe_base?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @safe_base
-  end
-
-  def allow_ruby_exit?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.allow_ruby_exit?
-  end
-
-  def allow_ruby_exit= (mode)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.allow_ruby_exit = mode
-  end
-
-  def delete
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @slave_ip_tbl.each{|name, subip|
-      _destroy_slaves_of_slaveIP(subip)
-=begin
-      begin
-        subip._invoke('destroy', '.') unless subip.deleted?
-      rescue Exception
-      end
-=end
-      begin
-        # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-	unless subip.deleted?
-	  after_ids = subip._eval_without_enc("after info")
-	  subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-	end
-      rescue Exception
-      end
-
-      # safe_base?
-      if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
-        begin
-          @interp._eval_without_enc("::safe::interpDelete #{name}")
-        rescue Exception
-        else
-          next if subip.deleted?
-        end
-      end
-      if subip.respond_to?(:safe_base?) && subip.safe_base? && 
-          !subip.deleted?
-        # do 'exit' to call the delete_hook procedure
-        begin
-          subip._eval_without_enc('exit') 
-        rescue Exception
-        end
-      else
-        begin
-          subip.delete unless subip.deleted?
-        rescue Exception
-        end
-      end
-    }
-
-    begin
-      # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-      after_ids = @interp._eval_without_enc("after info")
-      @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-    rescue Exception
-    end
-
-    begin
-      @interp._invoke('destroy', '.') unless @interp.deleted?
-    rescue Exception
-    end
-
-    if @safe_base && !@interp.deleted?
-      # do 'exit' to call the delete_hook procedure
-      @interp._eval_without_enc('exit')
-    end
-    @interp.delete
-    self
-  end
-
-  def deleted?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.deleted?
-  end
-
-  def has_mainwindow?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.has_mainwindow?
-  end
-
-  def invalid_namespace?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.invalid_namespace?
-  end
-
-  def abort(msg = nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if master? && !safe? && allow_ruby_exit?
-      if msg
-        Kernel.abort(msg)
-      else
-        Kernel.abort
-      end
-    else
-      # ignore msg
-      delete
-      1
-    end
-  end
-
-  def exit(st = true)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if master? && !safe? && allow_ruby_exit?
-      Kernel.exit(st)
-    else
-      delete
-      st
-    end
-  end
-
-  def exit!(st = false)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if master? && !safe? && allow_ruby_exit?
-      Kernel.exit!(st)
-    else
-      delete
-      st
-    end
-  end
-
-  def restart(app_name = nil, keys = {})
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
-
-    @interp._invoke('set', 'argv0', app_name) if app_name
-    if keys.kind_of?(Hash)
-      @interp._invoke('set', 'argv', _keys2opts(keys))
-    end
-
-    @interp.restart
-  end
-
-  def __eval(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.__eval(str)
-  end
-
-  def __invoke(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.__invoke(*args)
-  end
-
-  def _eval(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._eval(str)
-  end
-
-  def _invoke(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke(*args)
-  end
-
-  def _eval_without_enc(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._eval_without_enc(str)
-  end
-
-  def _invoke_without_enc(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke_without_enc(*args)
-  end
-
-  def _eval_with_enc(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._eval_with_enc(str)
-  end
-
-  def _invoke_with_enc(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke_with_enc(*args)
-  end
-
-  def _toUTF8(str, encoding=nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._toUTF8(str, encoding)
-  end
-
-  def _fromUTF8(str, encoding=nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._fromUTF8(str, encoding)
-  end
-
-  def _thread_vwait(var)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._thread_vwait(var)
-  end
-
-  def _thread_tkwait(mode, target)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._thread_tkwait(mode, target)
-  end
-
-  def _return_value
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._return_value
-  end
-
-  def _get_variable(var, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._get_variable(var, flag)
-  end
-  def _get_variable2(var, idx, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._get_variable2(var, idx, flag)
-  end
-  def _set_variable(var, value, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._set_variable(var, value, flag)
-  end
-  def _set_variable2(var, idx, value, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._set_variable2(var, idx, value, flag)
-  end
-  def _unset_variable(var, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._unset_variable(var, flag)
-  end
-  def _unset_variable2(var, idx, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._unset_variable2(var, idx, flag)
-  end
-
-  def _get_global_var(var)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._get_global_var(var)
-  end
-  def _get_global_var2(var, idx)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._get_global_var2(var, idx)
-  end
-  def _set_global_var(var, value)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._set_global_var(var, value)
-  end
-  def _set_global_var2(var, idx, value)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._set_global_var2(var, idx, value)
-  end
-  def _unset_global_var(var)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._unset_global_var(var)
-  end
-  def _unset_global_var2(var, idx)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._unset_global_var2(var, idx)
-  end
-
-  def _make_menu_embeddable(menu_path)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._make_menu_embeddable(menu_path)
-  end
-
-  def _split_tklist(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._split_tklist(str)
-  end
-  def _merge_tklist(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._merge_tklist(*args)
-  end
-  def _conv_listelement(arg)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._conv_listelement(arg)
-  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 += _lst2ary(str[i+1..-1])
-    list.concat(_lst2ary(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
-      slave.to_s
-    end
-  end
-  private :_slavearg
-
-  def alias_info(slave, cmd_name)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    _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)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    _lst2ary(@interp._invoke('interp', 'aliases', _slavearg(slave)))
-  end
-  def self.aliases(slave = '')
-    __getip.aliases(slave)
-  end
-
-  def delete_slaves(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    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)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    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)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    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)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    _lst2ary(@interp._invoke('interp', 'hidden', _slavearg(slave)))
-  end
-  def self.hidden_cmds(slave = '')
-    __getip.hidden_cmds(slave)
-  end
-
-  def invoke_hidden(slave, cmd, *args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-    else
-      keys = []
-    end
-    keys << _slavearg(slave)
-    if Tk::TCL_MAJOR_VERSION > 8 ||
-        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5) 
-      keys << '--'
-    end
-    keys << cmd
-    keys.concat(args)
-    @interp._invoke('interp', 'invokehidden', *keys)
-  end
-  def self.invoke_hidden(slave, cmd, *args)
-    __getip.invoke_hidden(slave, cmd, *args)
-  end
-
-  def invoke_hidden_on_global(slave, cmd, *args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-    else
-      keys = []
-    end
-    keys << _slavearg(slave)
-    keys << '-global'
-    if Tk::TCL_MAJOR_VERSION > 8 ||
-        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5) 
-      keys << '--'
-    end
-    keys << cmd
-    keys.concat(args)
-    @interp._invoke('interp', 'invokehidden', *keys)
-  end
-  def self.invoke_hidden_on_global(slave, cmd, *args)
-    __getip.invoke_hidden_on_global(slave, cmd, *args)
-  end
-
-  def invoke_hidden_on_namespace(slave, ns, cmd, *args)
-    # for Tcl8.5 or later
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-    else
-      keys = []
-    end
-    keys << _slavearg(slave)
-    keys << '-namespace' << TkComm._get_eval_string(ns)
-    keys << '--' << cmd
-    keys.concat(args)
-    @interp._invoke('interp', 'invokehidden', *keys)
-  end
-  def self.invoke_hidden_on_namespace(slave, ns, cmd, *args)
-    __getip.invoke_hidden_on_namespace(slave, ns, cmd, *args)
-  end
-
-  def mark_trusted(slave = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'marktrusted', _slavearg(slave))
-    self
-  end
-  def self.mark_trusted(slave = '')
-    __getip.mark_trusted(slave)
-    self
-  end
-
-  def set_bgerror_handler(cmd = Proc.new, slave = nil, &b)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    unless TkComm._callback_entry?(cmd)
-      if !slave && b
-        slave = cmd
-        cmd = Proc.new(&b)
-      end
-    end
-    slave = '' unless slave
-
-    @interp._invoke('interp', 'bgerror', _slavearg(slave), cmd)
-  end
-  def self.bgerror(cmd = Proc.new, slave = nil, &b)
-    __getip.bgerror(cmd, slave, &b)
-  end
-
-  def get_bgerror_handler(slave = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    procedure(@interp._invoke('interp', 'bgerror', _slavearg(slave)))
-  end
-  def self.bgerror(slave = '')
-    __getip.bgerror(slave)
-  end
-
-  def set_limit(limit_type, slave = '', opts = {})
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'limit', _slavearg(slave), limit_type, opts)
-  end
-  def self.set_limit(limit_type, slave = '', opts = {})
-    __getip.set_limit(limit_type, slave, opts)
-  end
-
-  def get_limit(limit_type, slave = '', slot = nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    if slot
-      num_or_str(@interp._invoke('interp', 'limit', _slavearg(slave), 
-                                 limit_type, slot))
-    else
-      l = @interp._split_tklist(@interp._invoke_without_enc('interp', 'limit', 
-                                                            _slavearg(slave), 
-                                                            limit_type))
-      l.map!{|s| _fromUTF8(s)}
-      r = {}
-      until l.empty?
-        key = l.shift[1..-1]
-        val = l.shift
-        val = num_or_str(val) if val
-        r[key] = val
-      end
-      r
-    end
-  end
-  def self.get_limit(limit_type, slave = '', slot = nil)
-    __getip.get_limit(limit_type, slave, slot)
-  end
-
-  def recursion_limit(slave = '', limit = None)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    number(@interp._invoke('interp', 'recursionlimit', 
-                           _slavearg(slave), limit))
-  end
-  def self.recursion_limit(slave = '', limit = None)
-    __getip.recursion_limit(slave)
-  end
-
-  def alias_target(aliascmd, slave = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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 = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @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
-
-
-# Safe Base :: manipulating safe interpreter
-class MultiTkIp
-  def safeip_configure(slot, value=None)
-    # use for '-noStatics' option ==> {statics=>false}
-    #     for '-nestedLoadOk' option ==> {nested=>true}
-    if slot.kind_of?(Hash)
-      ip = MultiTkIp.__getip
-      ip._eval('::safe::interpConfigure ' + @ip_name + ' ' + _keys2opts(slot))
-    else
-      ip._eval('::safe::interpConfigure ' + @ip_name + ' ' + 
-               "-#{slot} #{_get_eval_string(value)}")
-    end
-    self
-  end
-
-  def safeip_configinfo(slot = nil)
-    ip = MultiTkIp.__getip
-    ret = {}
-    if slot
-      conf = _lst2ary(ip._eval("::safe::interpConfigure " + 
-                               @ip_name + " -#{slot}"))
-      if conf[0] == '-deleteHook'
-=begin
-        if conf[1] =~ /^rb_out\S* (c(_\d+_)?\d+)/
-          ret[conf[0][1..-1]] = MultiTkIp._tk_cmd_tbl[$1]
-=end
-        if conf[1] =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-          ret[conf[0][1..-1]] = MultiTkIp._tk_cmd_tbl[$4]
-        else
-          ret[conf[0][1..-1]] = conf[1]
-        end
-      else
-        ret[conf[0][1..-1]] = conf[1]
-      end
-    else
-      Hash[*_lst2ary(ip._eval("::safe::interpConfigure " + 
-                              @ip_name))].each{|k, v|
-        if k == '-deleteHook'
-=begin
-          if v =~ /^rb_out\S* (c(_\d+_)?\d+)/
-            ret[k[1..-1]] = MultiTkIp._tk_cmd_tbl[$1]
-=end
-          if v =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-            ret[k[1..-1]] = MultiTkIp._tk_cmd_tbl[$4]
-          else
-            ret[k[1..-1]] = v
-          end
-        else
-          ret[k[1..-1]] = v
-        end
-      }
-    end
-    ret
-  end
-
-  def safeip_delete
-    ip = MultiTkIp.__getip
-    ip._eval("::safe::interpDelete " + @ip_name)
-  end
-
-  def safeip_add_to_access_path(dir)
-    ip = MultiTkIp.__getip
-    ip._eval("::safe::interpAddToAccessPath #{@ip_name} #{dir}")
-  end
-
-  def safeip_find_in_access_path(dir)
-    ip = MultiTkIp.__getip
-    ip._eval("::safe::interpFindInAccessPath #{@ip_name} #{dir}")
-  end
-
-  def safeip_set_log_cmd(cmd = Proc.new)
-    ip = MultiTkIp.__getip
-    ip._eval("::safe::setLogCmd #{@ip_name} #{_get_eval_string(cmd)}")
-  end
-end
-
-
-# encoding convert
-class MultiTkIp
-  def encoding
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding
-  end
-  def encoding=(enc)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding = enc
-  end
-
-  def encoding_convertfrom(str, enc=None)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding_convertfrom(str, enc)
-  end
-  alias encoding_convert_from encoding_convertfrom
-
-  def encoding_convertto(str, enc=None)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding_convertto(str, enc)
-  end
-  alias encoding_convert_to encoding_convertto
-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/remote-tk.rb b/ext/tk/lib/remote-tk.rb
deleted file mode 100644
index 70115a60aa..0000000000
--- a/ext/tk/lib/remote-tk.rb
+++ /dev/null
@@ -1,526 +0,0 @@
-#
-#               remote-tk.rb - supports to control remote Tk interpreters
-#                       by Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-if defined? MultiTkIp
-  fail RuntimeError, "'remote-tk' library must be required before requiring 'multi-tk'"
-end
-
-class MultiTkIp; end
-class RemoteTkIp < MultiTkIp; end
-
-class MultiTkIp
-  @@IP_TABLE = {}.taint unless defined?(@@IP_TABLE)
-  @@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST)
-  def self._IP_TABLE; @@IP_TABLE; end
-  def self._TK_TABLE_LIST; @@TK_TABLE_LIST; end
-
-  @flag = true
-  def self._DEFAULT_MASTER
-    # work only once
-    if @flag
-      @flag = nil
-      @@DEFAULT_MASTER
-    else
-      nil
-    end
-  end
-end
-class RemoteTkIp
-  @@IP_TABLE = MultiTkIp._IP_TABLE unless defined?(@@IP_TABLE)
-  @@TK_TABLE_LIST = MultiTkIp._TK_TABLE_LIST unless defined?(@@TK_TABLE_LIST)
-end
-class << MultiTkIp
-  undef _IP_TABLE
-  undef _TK_TABLE_LIST
-end
-
-require 'multi-tk'
-
-class RemoteTkIp
-  if defined?(@@DEFAULT_MASTER)
-    MultiTkIp._DEFAULT_MASTER
-  else
-    @@DEFAULT_MASTER = MultiTkIp._DEFAULT_MASTER
-  end
-end
-
-
-###############################
-
-class << RemoteTkIp
-  undef new_master, new_slave, new_safe_slave
-  undef new_trusted_slave, new_safeTk
-
-  def new(*args, &b)
-    ip = __new(*args)
-    ip.eval_proc(&b) if b
-    ip
-  end
-end
-
-class RemoteTkIp
-  def initialize(remote_ip, displayof=nil, timeout=5)
-    if $SAFE >= 4
-      fail SecurityError, "cannot access another interpreter at level #{$SAFE}"
-    end
-
-    @interp = MultiTkIp.__getip
-    if @interp.safe?
-      fail SecurityError, "safe-IP cannot create RemoteTkIp"
-    end
-
-
-    @interp.allow_ruby_exit = false
-    @appname = @interp._invoke('tk', 'appname')
-    @remote = remote_ip.to_s.dup.freeze
-    if displayof.kind_of?(TkWindow)
-      @displayof = displayof.path.dup.freeze
-    else
-      @displayof = nil
-    end
-    if self.deleted?
-      fail RuntimeError, "no Tk application named \"#{@remote}\""
-    end
-
-    @tk_windows = {}
-    @tk_table_list = []
-    @slave_ip_tbl = {}
-    @slave_ip_top = {}
-
-    @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?
-    @slave_ip_top.taint unless @slave_ip_top.tainted?
-
-    @system = Object.new
-
-    @threadgroup  = ThreadGroup.new
-
-    @safe_level = [$SAFE]
-
-    @wait_on_mainloop = [true, 0]
-
-    @cmd_queue = Queue.new
-
-=begin
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog()
-
-    @threadgroup.add @cmd_receiver
-    @threadgroup.add @receiver_watchdog
-
-    @threadgroup.enclose
-=end
-    @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
-
-    @@IP_TABLE[@threadgroup] = self
-    @@TK_TABLE_LIST.size.times{ 
-      (tbl = {}).tainted? || tbl.taint
-      @tk_table_list << tbl
-    }
-
-    @ret_val = TkVariable.new
-    if timeout > 0 && ! _available_check(timeout)
-      fail RuntimeError, "cannot create connection"
-    end
-    @ip_id = _create_connection
-
-    class << self
-      undef :instance_eval
-    end
-
-    self.freeze  # defend against modification
-  end
-
-  def manipulable?
-    return true if (Thread.current.group == ThreadGroup::Default)
-    MultiTkIp.__getip == @interp && ! @interp.safe?
-  end
-  def self.manipulable?
-    true
-  end
-
-  def _is_master_of?(tcltkip_obj)
-    tcltkip_obj == @interp
-  end
-  protected :_is_master_of?
-
-  def _ip_id_
-    @ip_id
-  end
-
-  def _available_check(timeout = 5)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    return nil if timeout < 1
-    @ret_val.value = ''
-    @interp._invoke('send', '-async', @remote, 
-                    'send', '-async', Tk.appname, 
-                    "set #{@ret_val.id} ready")
-    Tk.update
-    if @ret_val != 'ready'
-      (1..(timeout*5)).each{
-        sleep 0.2 
-        Tk.update
-        break if @ret_val == 'ready'
-      }
-    end
-    @ret_val.value == 'ready'
-  end
-  private :_available_check
-
-  def _create_connection
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    ip_id = '_' + @interp._invoke('send', @remote, <<-'EOS') + '_'
-      if {[catch {set _rubytk_control_ip_id_} ret] != 0} {
-        set _rubytk_control_ip_id_ 0
-      } else {
-        set _rubytk_control_ip_id_ [expr $ret + 1]
-      }
-      return $_rubytk_control_ip_id_
-    EOS
-
-    @interp._invoke('send', @remote, <<-EOS)
-      proc rb_out#{ip_id} args {
-        send #{@appname} rb_out \$args
-      }
-    EOS
-
-    ip_id
-  end
-  private :_create_connection
-
-  def _appsend(enc_mode, async, *cmds)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    p ['_appsend', [@remote, @displayof], enc_mode, async, cmds] if $DEBUG
-    if $SAFE >= 4
-      fail SecurityError, "cannot send commands at level 4"
-    elsif $SAFE >= 1 && cmds.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted commands at level #{$SAFE}"
-    end
-
-    cmds = @interp._merge_tklist(*TkUtil::_conv_args([], enc_mode, *cmds))
-    if @displayof
-      if async
-        @interp.__invoke('send', '-async', '-displayof', @displayof, 
-                         '--', @remote, *cmds)
-      else
-        @interp.__invoke('send', '-displayof', @displayof, 
-                         '--', @remote, *cmds)
-      end
-    else
-      if async
-        @interp.__invoke('send', '-async', '--', @remote, *cmds)
-      else
-        @interp.__invoke('send', '--', @remote, *cmds)
-      end
-    end
-  end
-  private :_appsend
-
-  def ready?(timeout=5)
-    if timeout < 0
-      fail ArgumentError, "timeout must be positive number"
-    end
-    _available_check(timeout)
-  end
-
-  def is_rubytk?
-    return false if _appsend(false, false, 'info', 'command', 'ruby') == ""
-    [ _appsend(false, false, 'ruby', 'RUBY_VERSION'), 
-      _appsend(false, false, 'set', 'tk_patchLevel') ]
-  end
-
-  def appsend(async, *args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
-    if @displayof
-      Tk.appsend_displayof(@remote, @displayof, async, *args)
-    else
-      Tk.appsend(@remote, async, *args)
-    end
-  end
-
-  def rb_appsend(async, *args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
-    if @displayof
-      Tk.rb_appsend_displayof(@remote, @displayof, async, *args)
-    else
-      Tk.rb_appsend(@remote, async, *args)
-    end
-  end
-
-  def create_slave(name, safe=false)
-    if safe
-      safe_opt = ''
-    else
-      safe_opt = '-safe'
-    end
-    _appsend(false, false, "interp create #{safe_opt} -- #{name}")
-  end
-
-  def make_safe
-    fail RuntimeError, 'cannot change safe mode of the remote interpreter'
-  end
-
-  def safe?
-    _appsend(false, false, 'interp issafe')
-  end
-
-  def safe_base?
-    false
-  end
-
-  def allow_ruby_exit?
-    false
-  end
-
-  def allow_ruby_exit= (mode)
-    fail RuntimeError, 'cannot change mode of the remote interpreter'
-  end
-
-  def delete
-    _appsend(false, true, 'exit')
-  end
-
-  def deleted?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    if @displayof
-      lst = @interp._invoke_without_enc('winfo', 'interps', 
-                                        '-displayof', @displayof)
-    else
-      lst = @interp._invoke_without_enc('winfo', 'interps')
-    end
-    # unless @interp._split_tklist(lst).index(@remote)
-    unless @interp._split_tklist(lst).index(_toUTF8(@remote))
-      true
-    else
-      false
-    end
-  end
-
-  def has_mainwindow?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    begin
-      inf = @interp._invoke_without_enc('info', 'command', '.')
-    rescue Exception
-      return nil
-    end
-    if !inf.kind_of?(String) || inf != '.'
-      false
-    else
-      true
-    end
-  end
-
-  def invalid_namespace?
-    false
-  end
-
-  def restart
-    fail RuntimeError, 'cannot restart the remote interpreter'
-  end
-
-  def __eval(str)
-    _appsend(false, false, str)
-  end
-  def _eval(str)
-    _appsend(nil, false, str)
-  end
-  def _eval_without_enc(str)
-    _appsend(false, false, str)
-  end
-  def _eval_with_enc(str)
-    _appsend(true, false, str)
-  end
-
-  def _invoke(*args)
-    _appsend(nil, false, *args)
-  end
-
-  def __invoke(*args)
-    _appsend(false, false, *args)
-  end
-  def _invoke(*args)
-    _appsend(nil, false, *args)
-  end
-  def _invoke_without_enc(*args)
-    _appsend(false, false, *args)
-  end
-  def _invoke_with_enc(*args)
-    _appsend(true, false, *args)
-  end
-
-  def _toUTF8(str, encoding=nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._toUTF8(str, encoding)
-  end
-
-  def _fromUTF8(str, encoding=nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._fromUTF8(str, encoding)
-  end
-
-  def _thread_vwait(var_name)
-    _appsend(false, 'thread_vwait', varname)
-  end
-
-  def _thread_tkwait(mode, target)
-    _appsend(false, 'thread_tkwait', mode, target)
-  end
-
-  def _return_value
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._return_value
-  end
-
-  def _get_variable(var_name, flag)
-    # ignore flag
-    _appsend(false, 'set', TkComm::_get_eval_string(var_name))
-  end
-  def _get_variable2(var_name, index_name, flag)
-    # ignore flag
-    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})")
-  end
-
-  def _set_variable(var_name, value, flag)
-    # ignore flag
-    _appsend(false, 'set', TkComm::_get_eval_string(var_name), TkComm::_get_eval_string(value))
-  end
-  def _set_variable2(var_name, index_name, value, flag)
-    # ignore flag
-    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})", TkComm::_get_eval_string(value))
-  end
-
-  def _unset_variable(var_name, flag)
-    # ignore flag
-    _appsend(false, 'unset', TkComm::_get_eval_string(var_name))
-  end
-  def _unset_variable2(var_name, index_name, flag)
-    # ignore flag
-    _appsend(false, 'unset', "#{var_name}(#{index_name})")
-  end
-
-  def _get_global_var(var_name)
-    _appsend(false, 'set', TkComm::_get_eval_string(var_name))
-  end
-  def _get_global_var2(var_name, index_name)
-    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})")
-  end
-
-  def _set_global_var(var_name, value)
-    _appsend(false, 'set', TkComm::_get_eval_string(var_name), TkComm::_get_eval_string(value))
-  end
-  def _set_global_var2(var_name, index_name, value)
-    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})", TkComm::_get_eval_string(value))
-  end
-
-  def _unset_global_var(var_name)
-    _appsend(false, 'unset', TkComm::_get_eval_string(var_name))
-  end
-  def _unset_global_var2(var_name, index_name)
-    _appsend(false, 'unset', "#{var_name}(#{index_name})")
-  end
-
-  def _split_tklist(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._split_tklist(str)
-  end
-
-  def _merge_tklist(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._merge_tklist(*args)
-  end
-
-  def _conv_listelement(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._conv_listelement(str)
-  end
-
-  def _create_console
-    fail RuntimeError, 'not support "_create_console" on the remote interpreter'
-  end
-
-  def mainloop
-    fail RuntimeError, 'not support "mainloop" on the remote interpreter'
-  end
-  def mainloop_watchdog
-    fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter'
-  end
-  def do_one_evant(flag = nil)
-    fail RuntimeError, 'not support "do_one_event" on the remote interpreter'
-  end
-  def mainloop_abort_on_exception
-    fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter'
-  end
-  def mainloop_abort_on_exception=(mode)
-    fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter'
-  end
-  def set_eventloop_tick(*args)
-    fail RuntimeError, 'not support "set_eventloop_tick" on the remote interpreter'
-  end
-  def get_eventloop_tick
-    fail RuntimeError, 'not support "get_eventloop_tick" on the remote interpreter'
-  end
-  def set_no_event_wait(*args)
-    fail RuntimeError, 'not support "set_no_event_wait" on the remote interpreter'
-  end
-  def get_no_event_wait
-    fail RuntimeError, 'not support "get_no_event_wait" on the remote interpreter'
-  end
-  def set_eventloop_weight(*args)
-    fail RuntimeError, 'not support "set_eventloop_weight" on the remote interpreter'
-  end
-  def get_eventloop_weight
-    fail RuntimeError, 'not support "get_eventloop_weight" on the remote interpreter'
-  end
-end
-
-class << RemoteTkIp
-  def mainloop(*args)
-    fail RuntimeError, 'not support "mainloop" on the remote interpreter'
-  end
-  def mainloop_watchdog(*args)
-    fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter'
-  end
-  def do_one_evant(flag = nil)
-    fail RuntimeError, 'not support "do_one_event" on the remote interpreter'
-  end
-  def mainloop_abort_on_exception
-    fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter'
-  end
-  def mainloop_abort_on_exception=(mode)
-    fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter'
-  end
-  def set_eventloop_tick(*args)
-    fail RuntimeError, 'not support "set_eventloop_tick" on the remote interpreter'
-  end
-  def get_eventloop_tick
-    fail RuntimeError, 'not support "get_eventloop_tick" on the remote interpreter'
-  end
-  def set_no_event_wait(*args)
-    fail RuntimeError, 'not support "set_no_event_wait" on the remote interpreter'
-  end
-  def get_no_event_wait
-    fail RuntimeError, 'not support "get_no_event_wait" on the remote interpreter'
-  end
-  def set_eventloop_weight(*args)
-    fail RuntimeError, 'not support "set_eventloop_weight" on the remote interpreter'
-  end
-  def get_eventloop_weight
-    fail RuntimeError, 'not support "get_eventloop_weight" on the remote interpreter'
-  end
-end
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index eba2f72f29..9a15f09989 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -1,74 +1,22 @@
 #
-#               tk.rb - Tk interface module using tcltklib
-#                       $Date: 2006/07/14 04:10:49 $
-#                       by Yukihiro Matsumoto <matz@netlab.jp>
+#		tk.rb - Tk interface module using tcltklib
+#			$Date$
+#			by Yukihiro Matsumoto <matz@netlab.jp>
 
 # use Shigehiro's tcltklib
-require 'tcltklib'
-require 'tkutil'
+require "tcltklib"
+require "tkutil"
 
-# autoload
-require 'tk/autoload'
-
-class TclTkIp
-  # backup original (without encoding) _eval and _invoke
-  alias _eval_without_enc _eval
-  alias _invoke_without_enc _invoke
-
-  def _ip_id_
-    # for RemoteTkIp
-    ''
-  end
-end
-
-# define TkComm module (step 1: basic functions)
 module TkComm
-  include TkUtil
-  extend TkUtil
-
-  WidgetClassNames = {}.taint
-  TkExtlibAutoloadModule = [].taint
-
-  # None = Object.new  ### --> definition is moved to TkUtil module
-  # def None.to_s
-  #   'None'
-  # end
-  # None.freeze
+  WidgetClassNames = {}
 
-  #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)
+  None = Object.new
+  def None.to_s
+    'None'
   end
-  Tk_WINDOWS.freeze
 
-  self.instance_eval{
-    @cmdtbl = [].taint
-  }
-
-  unless const_defined?(:GET_CONFIGINFO_AS_ARRAY)
-    # GET_CONFIGINFO_AS_ARRAY = false => returns a Hash { opt =>val, ... }
-    #                           true  => returns an Array [[opt,val], ... ]
-    # val is a list which includes resource info. 
-    GET_CONFIGINFO_AS_ARRAY = true
-  end
-  unless const_defined?(:GET_CONFIGINFOwoRES_AS_ARRAY)
-    # for configinfo without resource info; list of [opt, value] pair
-    #           false => returns a Hash { opt=>val, ... }
-    #           true  => returns an Array [[opt,val], ... ]
-    GET_CONFIGINFOwoRES_AS_ARRAY = true
-  end
-  #  *** ATTENTION ***
-  # 'current_configinfo' method always returns a Hash under all cases of above.
+  Tk_CMDTBL = {}
+  Tk_WINDOWS = {}
 
   def error_at
     frames = caller()
@@ -83,365 +31,68 @@ module TkComm
     return TkRoot.new if path == '.'
 
     begin
-      #tk_class = TkCore::INTERP._invoke('winfo', 'class', path)
-      tk_class = Tk.ip_invoke_without_enc('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 = ''
-    else # ruby_class == nil
-      mods = TkExtlibAutoloadModule.find_all{|m| m.const_defined?(tk_class)}
-      mods.each{|mod|
-        begin
-          mod.const_get(tk_class)  # auto_load
-          break if (ruby_class = WidgetClassNames[tk_class])
-        rescue LoadError
-          # ignore load error
-        end
-      }
-
-      unless ruby_class
-        std_class = 'Tk' << tk_class
-        if Object.const_defined?(std_class)
-          Object.const_get(std_class)  # auto_load
-          ruby_class = WidgetClassNames[tk_class]
-        end
-      end
-
-      if ruby_class
-        # found
-        ruby_class_name = ruby_class.name
-        gen_class_name = ruby_class_name
-        classname_def = ''
-      else
-        # unknown
-        ruby_class_name = 'TkWindow'
-        gen_class_name = 'TkWidget_' + tk_class
-        classname_def = "WidgetClassName = '#{tk_class}'.freeze"
-      end
-    end
-
-###################################
-=begin
-    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 = ''
-    else
-      mod = TkExtlibAutoloadModule.find{|m| m.const_defined?(tk_class)}
-      if mod
-        ruby_class_name = mod.name + '::' + tk_class
-        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
-    end
-=end
-
-=begin
+    ruby_class = WidgetClassNames[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"
-    end
-    Object.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}', 
-                                             'without_creating'=>true)"
-=end
-    base = Object
-    gen_class_name.split('::').each{|klass|
-      next if klass == ''
-      if base.const_defined?(klass)
-        base = base.class_eval klass
-      else
-        base = base.class_eval "class #{klass}<#{ruby_class_name}
-                                  #{classname_def}
-                                end
-                                #{klass}"
-      end
-    }
-    base.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}', 
-                                           'without_creating'=>true)"
+      eval "class #{gen_class_name}<#{ruby_class.name}
+              def initialize(path)
+                @path=path
+                Tk_WINDOWS[@path] = self
+              end
+            end"
+    end
+    eval "#{gen_class_name}.new('#{path}')"
   end
-  private :_genobj_for_tkwidget
-  module_function :_genobj_for_tkwidget
 
-  def _at(x,y=nil)
-    if y
-      "@#{Integer(x)},#{Integer(y)}"
-    else
-      "@#{Integer(x)}"
-    end
-  end
-  module_function :_at
-
-  def tk_tcl2ruby(val, enc_mode = false, listobj = true)
-=begin
-    if val =~ /^rb_out\S* (c(_\d+_)?\d+)/
-      #return Tk_CMDTBL[$1]
-      return TkCore::INTERP.tk_cmd_tbl[$1]
-      #cmd_obj = TkCore::INTERP.tk_cmd_tbl[$1]
-      #if cmd_obj.kind_of?(Proc) || cmd_obj.kind_of?(Method)
-      #  cmd_obj
-      #else
-      #  cmd_obj.cmd
-      #end
-    end
-=end
-    if val =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-      return TkCore::INTERP.tk_cmd_tbl[$4]
-    end
-    #if val.include? ?\s
-    #  return val.split.collect{|v| tk_tcl2ruby(v)}
-    #end
+  def tk_tcl2ruby(val)
+    if val =~ /^rb_out (c\d+)/
+      return Tk_CMDTBL[$1]
+    end
+    if val.include? ?\s
+      return val.split.collect{|v| tk_tcl2ruby(v)}
+    end
     case val
-    when /\A@font\S+\z/
+    when /^@font/
       TkFont.get_obj(val)
-    when /\A-?\d+\z/
+    when /^-?\d+$/
       val.to_i
-    when /\A\.\S*\z/
-      #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 /\Ai(_\d+_)?\d+\z/
-      TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
-    when /\A-?\d+\.?\d*(e[-+]?\d+)?\z/
+    when /^\./
+      Tk_WINDOWS[val] ? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
+    when / /
+      val.split.collect{|elt|
+	tk_tcl2ruby(elt)
+      }
+    when /^-?\d+\.\d*$/
       val.to_f
-    when /\\ /
-      val.gsub(/\\ /, ' ')
-    when /[^\\] /
-      if listobj
-        #tk_split_escstr(val).collect{|elt|
-        #  tk_tcl2ruby(elt, enc_mode, listobj)
-        #}
-        val = _toUTF8(val) unless enc_mode
-        tk_split_escstr(val, false, false).collect{|elt|
-          tk_tcl2ruby(elt, true, listobj)
-        }
-      elsif enc_mode
-        _fromUTF8(val)
-      else
-        val
-      end
-    else
-      if enc_mode
-        _fromUTF8(val)
-      else
-        val
-      end
-    end
-  end
-
-  private :tk_tcl2ruby
-  module_function :tk_tcl2ruby
-  #private_class_method :tk_tcl2ruby
-
-unless const_defined?(:USE_TCLs_LIST_FUNCTIONS)
-  USE_TCLs_LIST_FUNCTIONS = true
-end
-
-if USE_TCLs_LIST_FUNCTIONS
-  ###########################################################################
-  # use Tcl function version of split_list
-  ###########################################################################
-
-  def tk_split_escstr(str, src_enc=true, dst_enc=true)
-    str = _toUTF8(str) if src_enc
-    if dst_enc
-      TkCore::INTERP._split_tklist(str).map!{|s| _fromUTF8(s)}
-    else
-      TkCore::INTERP._split_tklist(str)
-    end
-  end
-
-  def tk_split_sublist(str, depth=-1, src_enc=true, dst_enc=true)
-    # return [] if str == ""
-    # list = TkCore::INTERP._split_tklist(str)
-    str = _toUTF8(str) if src_enc
-
-    if depth == 0
-      return "" if str == ""
-      list = [str]
-    else
-      return [] if str == ""
-      list = TkCore::INTERP._split_tklist(str)
-    end
-    if list.size == 1
-      # tk_tcl2ruby(list[0], nil, false)
-      tk_tcl2ruby(list[0], dst_enc, false)
-    else
-      list.collect{|token| tk_split_sublist(token, depth - 1, false, dst_enc)}
-    end
-  end
-
-  def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
-    return [] if str == ""
-    str = _toUTF8(str) if src_enc
-    TkCore::INTERP._split_tklist(str).map!{|token|
-      tk_split_sublist(token, depth - 1, false, dst_enc)
-    }
-  end
-
-  def tk_split_simplelist(str, src_enc=true, dst_enc=true)
-    #lst = TkCore::INTERP._split_tklist(str)
-    #if (lst.size == 1 && lst =~ /^\{.*\}$/)
-    #  TkCore::INTERP._split_tklist(str[1..-2])
-    #else
-    #  lst
-    #end
-
-    str = _toUTF8(str) if src_enc
-    if dst_enc
-      TkCore::INTERP._split_tklist(str).map!{|s| _fromUTF8(s)}
     else
-      TkCore::INTERP._split_tklist(str)
-    end
-  end
-
-  def array2tk_list(ary, enc=nil)
-    return "" if ary.size == 0
-
-    sys_enc = TkCore::INTERP.encoding
-    sys_enc = TclTkLib.encoding_system unless sys_enc
-
-    dst_enc = (enc == nil)? sys_enc: enc
-
-    dst = ary.collect{|e|
-      if e.kind_of? Array
-        s = array2tk_list(e, enc)
-      elsif e.kind_of? Hash
-        tmp_ary = []
-        #e.each{|k,v| tmp_ary << k << v }
-        e.each{|k,v| tmp_ary << "-#{_get_eval_string(k)}" << v }
-        s = array2tk_list(tmp_ary, enc)
-      else
-        s = _get_eval_string(e, enc)
-      end
-
-      if dst_enc != true && dst_enc != false
-        if (s_enc = s.instance_variable_get(:@encoding))
-          s_enc = s_enc.to_s
-        else
-          s_enc = sys_enc
-        end
-        dst_enc = true if s_enc != dst_enc
-      end
-
-      s
-    }
-
-    if sys_enc && dst_enc
-      dst.map!{|s| _toUTF8(s)}
-      ret = TkCore::INTERP._merge_tklist(*dst)
-      if dst_enc.kind_of?(String)
-        ret = _fromUTF8(ret, dst_enc)
-        ret.instance_variable_set(:@encoding, dst_enc)
-      else
-        ret.instance_variable_set(:@encoding, 'utf-8')
-      end
-      ret
-    else
-      TkCore::INTERP._merge_tklist(*dst)
-    end
-  end
-
-else
-  ###########################################################################
-  # use Ruby script version of split_list (traditional methods)
-  ###########################################################################
-
-  def tk_split_escstr(str, src_enc=true, dst_enc=true)
-    return [] if str == ""
-    list = []
-    token = nil
-    escape = false
-    brace = 0
-    str.split('').each {|c|
-      brace += 1 if c == '{' && !escape
-      brace -= 1 if c == '}' && !escape
-      if brace == 0 && c == ' ' && !escape
-        list << token.gsub(/^\{(.*)\}$/, '\1') if token
-        token = nil
-      else
-        token = (token || "") << c
-      end
-      escape = (c == '\\' && !escape)
-    }
-    list << token.gsub(/^\{(.*)\}$/, '\1') if token
-    list
-  end
-
-  def tk_split_sublist(str, depth=-1, src_enc=true, dst_enc=true)
-    #return [] if str == ""
-    #return [tk_split_sublist(str[1..-2])] if str =~ /^\{.*\}$/
-    #list = tk_split_escstr(str)
-    if depth == 0
-      return "" if str == ""
-      str = str[1..-2] if str =~ /^\{.*\}$/
-      list = [str]
-    else
-      return [] if str == []
-      return [tk_split_sublist(str[1..-2], depth - 1)] if str =~ /^\{.*\}$/
-      list = tk_split_escstr(str)
-    end
-    if list.size == 1
-      tk_tcl2ruby(list[0], nil, false)
-    else
-      list.collect{|token| tk_split_sublist(token, depth - 1)}
+      val
     end
   end
 
-  def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
-    return [] if str == ""
-    tk_split_escstr(str).collect{|token| 
-      tk_split_sublist(token, depth - 1)
-    }
-  end
-=begin
   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 == ""
     str = str[idx+1..-1]
     i = -1
-    escape = false
     brace = 1
     str.each_byte {|c|
       i += 1
-      brace += 1 if c == ?{ && !escape
-      brace -= 1 if c == ?} && !escape
-      escape = (c == ?\\)
+      brace += 1 if c == ?{
+      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
@@ -450,227 +101,122 @@ else
     list += tk_split_list(str[i+1..-1])
     list
   end
-=end
 
-  def tk_split_simplelist(str, src_enc=true, dst_enc=true)
+  def tk_split_simplelist(str)
     return [] if str == ""
-    list = []
-    token = nil
-    escape = false
-    brace = 0
-    str.split('').each {|c|
-      if c == '\\' && !escape
-        escape = true
-        token = (token || "") << c if brace > 0
-        next
-      end
-      brace += 1 if c == '{' && !escape
-      brace -= 1 if c == '}' && !escape
-      if brace == 0 && c == ' ' && !escape
-        list << token.gsub(/^\{(.*)\}$/, '\1') if token
-        token = nil
-      else
-        token = (token || "") << c
-      end
-      escape = false
+    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
     }
-    list << token.gsub(/^\{(.*)\}$/, '\1') if token
+    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 :tk_tcl2ruby, :tk_split_list, :tk_split_simplelist
 
-  def array2tk_list(ary, enc=nil)
-    ary.collect{|e|
-      if e.kind_of? Array
-        "{#{array2tk_list(e, enc)}}"
-      elsif e.kind_of? Hash
-        # "{#{e.to_a.collect{|ee| array2tk_list(ee)}.join(' ')}}"
-        e.each{|k,v| tmp_ary << "-#{_get_eval_string(k)}" << v }
-        array2tk_list(tmp_ary, enc)
-      else
-        s = _get_eval_string(e, enc)
-        (s.index(/\s/) || s.size == 0)? "{#{s}}": s
-      end
-    }.join(" ")
-  end
-end
-
-  private :tk_split_escstr, :tk_split_sublist
-  private :tk_split_list, :tk_split_simplelist
-  private :array2tk_list
-
-  module_function :tk_split_escstr, :tk_split_sublist
-  module_function :tk_split_list, :tk_split_simplelist
-  module_function :array2tk_list
-
-  private_class_method :tk_split_escstr, :tk_split_sublist
-  private_class_method :tk_split_list, :tk_split_simplelist
-#  private_class_method :array2tk_list
-
-=begin
-  ### --> definition is moved to TkUtil module
   def _symbolkey2str(keys)
     h = {}
     keys.each{|key,value| h[key.to_s] = value}
     h
   end
   private :_symbolkey2str
-  module_function :_symbolkey2str
-=end
-
-=begin
-  ### --> definition is moved to TkUtil module
-  # def hash_kv(keys, enc_mode = nil, conf = [], flat = false)
-  def hash_kv(keys, enc_mode = nil, conf = nil)
-    # Hash {key=>val, key=>val, ... } or Array [ [key, val], [key, val], ... ]
-    #     ==> Array ['-key', val, '-key', val, ... ]
-    dst = []
+
+  def hash_kv(keys)
+    conf = []
     if keys and keys != None
-      keys.each{|k, v|
-        #dst.push("-#{k}")
-        dst.push('-' + k.to_s)
-        if v != None
-          # v = _get_eval_string(v, enc_mode) if (enc_mode || flat)
-          v = _get_eval_string(v, enc_mode) if enc_mode
-          dst.push(v)
-        end
-      }
-    end
-    if conf
-      conf + dst
-    else
-      dst
+      for k, v in keys
+	 conf.push("-#{k}")
+	 conf.push(v)
+      end
     end
+    conf
   end
   private :hash_kv
-  module_function :hash_kv
-=end
 
-=begin
-  ### --> definition is moved to TkUtil module
+  def array2tk_list(ary)
+    ary.collect{|e|
+      if e.kind_of? Array
+	"{#{array2tk_list(e)}}"
+      elsif e.kind_of? Hash
+	"{#{e.to_a.collect{|ee| array2tk_list(ee)}.join(' ')}}"
+      else
+	s = _get_eval_string(e)
+	(s.index(/\s/))? "{#{s}}": s
+      end
+    }.join(" ")
+  end
+  private :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, "invalid value for Number:'#{val}'")
+      val
     end
   end
   def string(val)
     if val == "{}"
       ''
-    elsif val[0] == ?{ && val[-1] == ?}
+    elsif val[0] == ?{
       val[1..-2]
     else
       val
     end
   end
-  def num_or_str(val)
-    begin
-      number(val)
-    rescue ArgumentError
-      string(val)
-    end
-  end
-=end
-
-  def list(val, depth=0, enc=true)
-    tk_split_list(val, depth, enc, enc)
-  end
-  def simplelist(val, src_enc=true, dst_enc=true)
-    tk_split_simplelist(val, src_enc, dst_enc)
+  def list(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
-  end
-  def image_obj(val)
-    if val =~ /^i(_\d+_)?\d+$/
-      TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
-    else
-      val
-    end
+    Tk_WINDOWS[val]
   end
   def procedure(val)
-=begin
-    if val =~ /^rb_out\S* (c(_\d+_)?\d+)/
-      #Tk_CMDTBL[$1]
-      #TkCore::INTERP.tk_cmd_tbl[$1]
-      TkCore::INTERP.tk_cmd_tbl[$1].cmd
-=end
-    if val =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-      return TkCore::INTERP.tk_cmd_tbl[$4].cmd
+    if val =~ /^rb_out (c\d+)/
+      Tk_CMDTBL[$1]
     else
-      #nil
-      val
+      nil
     end
   end
-  private :bool, :number, :string, :num_or_str
-  private :list, :simplelist, :window, :procedure
-  module_function :bool, :number, :num_or_str, :string
-  module_function :list, :simplelist, :window, :image_obj, :procedure
-
-  def subst(str, *opts)
-    # opts := :nobackslashes | :nocommands | novariables
-    tk_call('subst', 
-            *(opts.collect{|opt|
-                opt = opt.to_s
-                (opt[0] == ?-)? opt: '-' << opt
-              } << str))
-  end
+  private :bool, :number, :string, :list, :window, :procedure
 
-  def _toUTF8(str, encoding = nil)
-    TkCore::INTERP._toUTF8(str, encoding)
-  end
-  def _fromUTF8(str, encoding = nil)
-    TkCore::INTERP._fromUTF8(str, encoding)
-  end
-  private :_toUTF8, :_fromUTF8
-  module_function :_toUTF8, :_fromUTF8
-
-  def _callback_entry_class?(cls)
-    cls <= Proc || cls <= Method || cls <= TkCallbackEntry
-  end
-  private :_callback_entry_class?
-  module_function :_callback_entry_class?
-
-  def _callback_entry?(obj)
-    obj.kind_of?(Proc) || obj.kind_of?(Method) || obj.kind_of?(TkCallbackEntry)
-  end
-  private :_callback_entry?
-  module_function :_callback_entry?
-
-=begin
-  ### --> definition is moved to TkUtil module
-  def _get_eval_string(str, enc_mode = nil)
+  def _get_eval_string(str)
     return nil if str == None
-    if str.kind_of?(TkObject)
-      str = str.path
-    elsif str.kind_of?(String)
-      str = _toUTF8(str) if enc_mode
+    if str.kind_of?(String)
+      # do nothing
     elsif str.kind_of?(Symbol)
       str = str.id2name
-      str = _toUTF8(str) if enc_mode
     elsif str.kind_of?(Hash)
-      str = hash_kv(str, enc_mode).join(" ")
+      str = hash_kv(str).join(" ")
     elsif str.kind_of?(Array)
       str = array2tk_list(str)
-      str = _toUTF8(str) if enc_mode
     elsif str.kind_of?(Proc)
       str = install_cmd(str)
     elsif str == nil
@@ -681,215 +227,140 @@ end
       str = "1"
     elsif (str.respond_to?(:to_eval))
       str = str.to_eval()
-      str = _toUTF8(str) if enc_mode
     else
-      str = str.to_s() || ''
-      unless str.kind_of? String
-        fail RuntimeError, "fail to convert the object to a string" 
-      end
-      str = _toUTF8(str) if enc_mode
+      str = str.to_s()
     end
     return str
   end
-=end
-=begin
-  def _get_eval_string(obj, enc_mode = nil)
-    case obj
-    when Numeric
-      obj.to_s
-    when String
-      (enc_mode)? _toUTF8(obj): obj
-    when Symbol
-      (enc_mode)? _toUTF8(obj.id2name): obj.id2name
-    when TkObject
-      obj.path
-    when Hash
-      hash_kv(obj, enc_mode).join(' ')
-    when Array
-      (enc_mode)? _toUTF8(array2tk_list(obj)): array2tk_list(obj)
-    when Proc, Method, TkCallbackEntry
-      install_cmd(obj)
-    when false
-      '0'
-    when true
-      '1'
-    when nil
-      ''
-    when None
-      nil
-    else
-      if (obj.respond_to?(:to_eval))
-        (enc_mode)? _toUTF8(obj.to_eval): obj.to_eval
-      else
-        begin
-          obj = obj.to_s || ''
-        rescue
-          fail RuntimeError, "fail to convert object '#{obj}' to string" 
-        end
-        (enc_mode)? _toUTF8(obj): obj
-      end
-    end
-  end
   private :_get_eval_string
-  module_function :_get_eval_string
-=end
-
-=begin
-  ### --> definition is moved to TkUtil module
-  def _get_eval_enc_str(obj)
-    return obj if obj == None
-    _get_eval_string(obj, true)
-  end
-  private :_get_eval_enc_str
-  module_function :_get_eval_enc_str
-=end
-
-=begin
-  ### --> obsolete
-  def ruby2tcl(v, enc_mode = nil)
+
+  def ruby2tcl(v)
     if v.kind_of?(Hash)
       v = hash_kv(v)
       v.flatten!
-      v.collect{|e|ruby2tcl(e, enc_mode)}
+      v.collect{|e|ruby2tcl(e)}
     else
-      _get_eval_string(v, enc_mode)
+      _get_eval_string(v)
     end
   end
   private :ruby2tcl
-=end
-
-=begin
-  ### --> definition is moved to TkUtil module
-  def _conv_args(args, enc_mode, *src_args)
-    conv_args = []
-    src_args.each{|arg|
-      conv_args << _get_eval_string(arg, enc_mode) unless arg == None
-      # if arg.kind_of?(Hash)
-      # arg.each{|k, v|
-      #   args << '-' + k.to_s
-      #   args << _get_eval_string(v, enc_mode)
-      # }
-      # elsif arg != None
-      #   args << _get_eval_string(arg, enc_mode)
-      # end
-    }
-    args + conv_args
-  end
-  private :_conv_args
-=end
 
+  Tk_IDs = [0, 0]		# [0]-cmdid, [1]-winid
   def _curr_cmd_id
-    #id = format("c%.4d", Tk_IDs[0])
-    id = "c" + TkCore::INTERP._ip_id_ + 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 == ''
-    begin
-      ns = TkCore::INTERP._invoke_without_enc('namespace', 'current')
-      ns = nil if ns == '::' # for backward compatibility
-    rescue
-      # probably, Tcl7.6
-      ns = nil
-    end
     id = _next_cmd_id
-    #Tk_CMDTBL[id] = cmd
-    if cmd.kind_of?(TkCallbackEntry)
-      TkCore::INTERP.tk_cmd_tbl[id] = cmd
-    else
-      TkCore::INTERP.tk_cmd_tbl[id] = TkCore::INTERP.get_cb_entry(cmd)
-    end
-    @cmdtbl = [] unless defined? @cmdtbl
-    @cmdtbl.taint unless @cmdtbl.tainted?
+    Tk_CMDTBL[id] = cmd
+    @cmdtbl = [] unless @cmdtbl
     @cmdtbl.push id
-    #return Kernel.format("rb_out %s", id);
-    if ns
-      'rb_out' << TkCore::INTERP._ip_id_ << ' ' << ns << ' ' << id
-    else
-      'rb_out' << TkCore::INTERP._ip_id_ << ' ' << id
-    end
+    return format("rb_out %s", id);
   end
   def uninstall_cmd(id)
-    #id = $1 if /rb_out\S* (c(_\d+_)?\d+)/ =~ id
-    id = $4 if id =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-    #Tk_CMDTBL.delete(id)
-    TkCore::INTERP.tk_cmd_tbl.delete(id)
+    id = $1 if /rb_out (c\d+)/ =~ id
+    Tk_CMDTBL.delete(id)
   end
-  # private :install_cmd, :uninstall_cmd
-  module_function :install_cmd, :uninstall_cmd
+  private :install_cmd, :uninstall_cmd
 
-=begin
   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 = Kernel.format(".%s", name);
-    else
-      @path = Kernel.format("%s.%s", ppath, name)
+      name = format("w%.4d", Tk_IDs[1])
+      Tk_IDs[1] += 1
     end
-    #Tk_WINDOWS[@path] = self
-    TkCore::INTERP.tk_windows[@path] = self
-  end
-=end
-  def install_win(ppath,name=nil)
-    if name
-      if name == ''
-        raise ArgumentError, "invalid wiget-name '#{name}'"
-      end
-      if name[0] == ?.
-        @path = '' + name
-        @path.freeze
-        return TkCore::INTERP.tk_windows[@path] = self
-      end
-    else
-      name = "w" + TkCore::INTERP._ip_id_ + Tk_IDs[1]
-      Tk_IDs[1].succ!
-    end
-    if !ppath or ppath == '.'
-      @path = '.' + name
+    if !ppath or ppath == "."
+      @path = format(".%s", name);
     else
-      @path = ppath + '.' + name
+      @path = format("%s.%s", ppath, name)
     end
-    @path.freeze
-    TkCore::INTERP.tk_windows[@path] = self
+    Tk_WINDOWS[@path] = self
   end
 
   def uninstall_win()
-    #Tk_WINDOWS.delete(@path)
-    TkCore::INTERP.tk_windows.delete(@path)
-  end
-  private :install_win, :uninstall_win
-
-  def _epath(win)
-    if win.kind_of?(TkObject)
-      win.epath
-    elsif win.respond_to?(:epath)
-      win.epath
-    else
-      win
+    Tk_WINDOWS.delete(@path)
+  end
+
+  class Event
+    def initialize(seq,a,b,c,d,f,h,k,m,o,p,s,t,w,x,y,
+	           aa,bb,dd,ee,kk,nn,rr,ss,tt,ww,xx,yy)
+      @serial = seq
+      @above = a
+      @num = b
+      @count = c
+      @detail = d
+      @focus = (f == 1)
+      @height = h
+      @keycode = k
+      @mode = m
+      @override = (o == 1)
+      @place = p
+      @state = s
+      @time = t
+      @width = w
+      @x = x
+      @y = y
+      @char = aa
+      @borderwidth = bb
+      @wheel_delta = dd
+      @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 :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
+    attr :y_root
+  end
+
+  def install_bind(cmd, args=nil)
+    if args
+      id = install_cmd(proc{|*arg|
+	TkUtil.eval_cmd cmd, *arg
+      })
+      id + " " + args
+    else
+      id = install_cmd(proc{|arg|
+	TkUtil.eval_cmd cmd, Event.new(*arg)
+      })
+      id + ' %# %a %b %c %d %f %h %k %m %o %p %s %t %w %x %y' + 
+	   ' %A %B %D %E %K %N %R %S %T %W %X %Y'
     end
   end
-  private :_epath
-end
-
-# define TkComm module (step 2: event binding)
-module TkComm
-  include TkEvent
-  extend TkEvent
 
   def tk_event_sequence(context)
     if context.kind_of? TkVirtualEvent
@@ -897,11 +368,11 @@ module TkComm
     end
     if context.kind_of? Array
       context = context.collect{|ev|
-        if ev.kind_of? TkVirtualEvent
-          ev.path
-        else
-          ev
-        end
+	if ev.kind_of? TkVirtualEvent
+	  ev.path
+	else
+	  ev
+	end
       }.join("><")
     end
     if /,/ =~ context
@@ -911,395 +382,117 @@ module TkComm
     end
   end
 
-  def _bind_core(mode, what, context, cmd, *args)
-    id = install_bind(cmd, *args) if cmd
+  def _bind_core(mode, what, context, cmd, args=nil)
+    id = install_bind(cmd, args) if cmd
     begin
-      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", 
-                              mode + id]))
+      tk_call(*(what + ["<#{tk_event_sequence(context)}>", mode + id]))
     rescue
       uninstall_cmd(id) if cmd
       fail
     end
   end
 
-  def _bind(what, context, cmd, *args)
-    _bind_core('', what, context, cmd, *args)
+  def _bind(what, context, cmd, args=nil)
+    _bind_core('', what, context, cmd, args)
   end
 
-  def _bind_append(what, context, cmd, *args)
-    _bind_core('+', what, context, cmd, *args)
+  def _bind_append(what, context, cmd, args=nil)
+    _bind_core('+', what, context, cmd, args)
   end
 
   def _bind_remove(what, context)
-    tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", '']))
+    tk_call(*(what + ["<#{tk_event_sequence(context)}>", '']))
   end
 
   def _bindinfo(what, context=nil)
     if context
-      tk_call_without_enc(*what+["<#{tk_event_sequence(context)}>"]) .collect {|cmdline|
-=begin
-        if cmdline =~ /^rb_out\S* (c(?:_\d+_)?\d+)\s+(.*)$/
-          #[Tk_CMDTBL[$1], $2]
-          [TkCore::INTERP.tk_cmd_tbl[$1], $2]
-=end
-        if cmdline =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-          [TkCore::INTERP.tk_cmd_tbl[$4], $5]
-        else
-          cmdline
-        end
+      tk_call(*what+["<#{tk_event_sequence(context)}>"]).collect {|cmdline|
+	if cmdline =~ /^rb_out (c\d+)\s+(.*)$/
+	  [Tk_CMDTBL[$1], $2]
+	else
+	  cmdline
+	end
       }
     else
-      tk_split_simplelist(tk_call_without_enc(*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_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
       }
     end
   end
+  private :install_bind, :tk_event_sequence, 
+          :_bind_core, :_bind, :_bind_append, :_bind_remove, :_bindinfo
 
-  def _bind_core_for_event_class(klass, mode, what, context, cmd, *args)
-    id = install_bind_for_event_class(klass, cmd, *args) if cmd
-    begin
-      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", 
-                              mode + id]))
-    rescue
-      uninstall_cmd(id) if cmd
-      fail
-    end
-  end
-
-  def _bind_for_event_class(klass, what, context, cmd, *args)
-    _bind_core_for_event_class(klass, '', what, context, cmd, *args)
+  def bind(tagOrClass, context, cmd=Proc.new, args=nil)
+    _bind(["bind", tagOrClass], context, cmd, args)
   end
 
-  def _bind_append_for_event_class(klass, what, context, cmd, *args)
-    _bind_core_for_event_class(klass, '+', what, context, cmd, *args)
+  def bind_append(tagOrClass, context, cmd=Proc.new, args=nil)
+    _bind_append(["bind", tagOrClass], context, cmd, args)
   end
 
-  def _bind_remove_for_event_class(klass, what, context)
-    _bind_remove(what, context)
+  def bind_remove(tagOrClass, context)
+    _bind_remove(['bind', tagOrClass], context)
   end
 
-  def _bindinfo_for_event_class(klass, what, context=nil)
-    _bindinfo(what, context)
+  def bindinfo(tagOrClass, context=nil)
+    _bindinfo(['bind', tagOrClass], context)
   end
 
-  private :tk_event_sequence
-  private :_bind_core, :_bind, :_bind_append, :_bind_remove, :_bindinfo
-  private :_bind_core_for_event_class, :_bind_for_event_class, 
-          :_bind_append_for_event_class, :_bind_remove_for_event_class, 
-          :_bindinfo_for_event_class
-
-  #def bind(tagOrClass, context, cmd=Proc.new, *args)
-  #  _bind(["bind", tagOrClass], context, cmd, *args)
-  #  tagOrClass
-  #end
-  def bind(tagOrClass, context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind(["bind", tagOrClass], context, cmd, *args)
-    tagOrClass
+  def bind_all(context, cmd=Proc.new, args=nil)
+    _bind(['bind', 'all'], context, cmd, args)
   end
 
-  #def bind_append(tagOrClass, context, cmd=Proc.new, *args)
-  #  _bind_append(["bind", tagOrClass], context, cmd, *args)
-  #  tagOrClass
-  #end
-  def bind_append(tagOrClass, context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append(["bind", tagOrClass], context, cmd, *args)
-    tagOrClass
+  def bind_append_all(context, cmd=Proc.new, args=nil)
+    _bind_append(['bind', 'all'], context, cmd, args)
   end
 
-  def bind_remove(tagOrClass, context)
-    _bind_remove(['bind', tagOrClass], context)
-    tagOrClass
+  def bindinfo_all(context=nil)
+    _bindinfo(['bind', 'all'], context)
   end
 
-  def bindinfo(tagOrClass, context=nil)
-    _bindinfo(['bind', tagOrClass], context)
+  def pack(*args)
+    TkPack.configure(*args)
   end
 
-  #def bind_all(context, cmd=Proc.new, *args)
-  #  _bind(['bind', 'all'], context, cmd, *args)
-  #  TkBindTag::ALL
-  #end
-  def bind_all(context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind(['bind', 'all'], context, cmd, *args)
-    TkBindTag::ALL
+  def grid(*args)
+    TkGrid.configure(*args)
   end
 
-  #def bind_append_all(context, cmd=Proc.new, *args)
-  #  _bind_append(['bind', 'all'], context, cmd, *args)
-  #  TkBindTag::ALL
-  #end
-  def bind_append_all(context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
+  def update(idle=nil)
+    if idle
+      tk_call 'update', 'idletasks'
     else
-      cmd = Proc.new
+      tk_call 'update'
     end
-    _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)
-  end
 end
 
-
 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
-      name = $0
-    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
-      def @tk_cmd_tbl.[]=(idx,val)
-        if self.has_key?(idx) && Thread.current.group != ThreadGroup::Default
-          fail SecurityError,"cannot change the entried command"
-        end
-        super(idx,val)
-      end
-
-      @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(TkCallbackEntry){
-        class << self
-          def inspect
-            sprintf("#<Class(TkCallbackEntry):%0x>", self.__id__)
-          end
-          alias to_s inspect
-        end
-
-        def initialize(ip, cmd)
-          @ip = ip
-          @cmd = cmd
-        end
-        attr_reader :ip, :cmd
-        def call(*args)
-          @ip.cb_eval(@cmd, *args)
-        end
-        def inspect
-          sprintf("#<cb_entry:%0x>", self.__id__)
-        end
-        alias to_s inspect
-      }.freeze
-    }
-
-    def INTERP.cb_entry_class
-      @cb_entry_class
-    end
-    def INTERP.tk_cmd_tbl
-      @tk_cmd_tbl
-    end
-    def INTERP.tk_windows
-      @tk_windows
-    end
-
-    class Tk_OBJECT_TABLE
-      def initialize(id)
-        @id = id
-      end
-      def method_missing(m, *args, &b)
-        TkCore::INTERP.tk_object_table(@id).__send__(m, *args, &b)
-      end
-    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
-      Tk_OBJECT_TABLE.new(id)
-    end
-
-    def INTERP.get_cb_entry(cmd)
-      @cb_entry_class.new(__getip, cmd).freeze
-    end
-    def INTERP.cb_eval(cmd, *args)
-      TkUtil._get_eval_string(TkUtil.eval_cmd(cmd, *args))
-    end
+  INTERP = TclTkIp.new
 
-    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)
-      if name.kind_of?(Array)
-        name.each{|param| self.add_tk_procs(*param)}
-      else
-        name = name.to_s
-        @add_tk_procs << [name, args, body]
-        self._invoke('proc', name, args, body) if args && body
-      end
-    end
-    def INTERP.remove_tk_procs(*names)
-      names.each{|name|
-        name = name.to_s
-        @add_tk_procs.delete_if{|elem| 
-          elem.kind_of?(Array) && elem[0].to_s == name
-        }
-        self._invoke('rename', name, '')
-      }
-    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
-
-  WIDGET_DESTROY_HOOK = '<WIDGET_DESTROY_HOOK>'
-  INTERP._invoke_without_enc('event', 'add', 
-                             "<#{WIDGET_DESTROY_HOOK}>", '<Destroy>')
-  INTERP._invoke_without_enc('bind', 'all', "<#{WIDGET_DESTROY_HOOK}>",
-                             install_cmd(proc{|path|
-                                unless TkCore::INTERP.deleted?
-                                  begin
-                                    if (widget=TkCore::INTERP.tk_windows[path])
-                                      if widget.respond_to?(:__destroy_hook__)
-                                        widget.__destroy_hook__
-                                      end
-                                    end
-                                  rescue Exception=>e
-                                      p e if $DEBUG
-                                  end
-                                end
-                             }) << ' %W')
-
-  INTERP.add_tk_procs(TclTkLib::FINALIZE_PROC_NAME, '', 
-                      "bind all <#{WIDGET_DESTROY_HOOK}> {}")
-
-  INTERP.add_tk_procs('rb_out', 'ns args', <<-'EOL')
-    if [regexp {^::} $ns] {
-      set cmd {namespace eval $ns {ruby_cmd TkCore callback} $args}
-    } else {
-      set cmd {eval {ruby_cmd TkCore callback} $ns $args}
-    }
-    if {[set st [catch $cmd ret]] != 0} {
-       #return -code $st $ret
-       set idx [string first "\n\n" $ret]
-       if {$idx > 0} {
-          return -code $st \
-                 -errorinfo [string range $ret [expr $idx + 2] \
-                                               [string length $ret]] \
-                 [string range $ret 0 [expr $idx - 1]]
-       } else {
-          return -code $st $ret
-       }
-    } else {
-        return $ret
-    }
-  EOL
-=begin
-  INTERP.add_tk_procs('rb_out', 'args', <<-'EOL')
-    if {[set st [catch {eval {ruby_cmd TkCore callback} $args} ret]] != 0} {
-       #return -code $st $ret
-       set idx [string first "\n\n" $ret]
-       if {$idx > 0} {
-          return -code $st \
-                 -errorinfo [string range $ret [expr $idx + 2] \
-                                               [string length $ret]] \
-                 [string range $ret 0 [expr $idx - 1]]
-       } else {
-          return -code $st $ret
-       }
-    } else {
-        return $ret
-    }
-  EOL
-=end
-=begin
-  INTERP.add_tk_procs('rb_out', 'args', <<-'EOL')
-    #regsub -all {\\} $args {\\\\} args
-    #regsub -all {!} $args {\\!} args
-    #regsub -all "{" $args "\\{" args
-    regsub -all {(\\|!|\{|\})} $args {\\\1} args
+  INTERP._invoke("proc", "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
-       set idx [string first "\n\n" $ret]
-       if {$idx > 0} {
-          return -code $st \
-                 -errorinfo [string range $ret [expr $idx + 2] \
-                                               [string length $ret]] \
-                 [string range $ret 0 [expr $idx - 1]]
-       } else {
-          return -code $st $ret
-       }
-    } else {
-        return $ret
+	return -code $st $ret
+    } {
+	return $ret
     }
   EOL
-=end
-
-  at_exit{ INTERP.remove_tk_procs(TclTkLib::FINALIZE_PROC_NAME) }
 
   EventFlag = TclTkLib::EventFlag
 
@@ -1311,109 +504,17 @@ module TkCore
     fail TkCallbackContinue, "Tk callback returns 'continue' status"
   end
 
-  def callback_return
-    fail TkCallbackReturn, "Tk callback returns 'return' status"
-  end
-
-  def TkCore.callback(*arg)
-    begin
-      if TkCore::INTERP.tk_cmd_tbl.kind_of?(Hash)
-        #TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
-        normal_ret = false
-        ret = catch(:IRB_EXIT) do  # IRB hack
-          retval = TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
-          normal_ret = true
-          retval
-        end
-        unless normal_ret
-          # catch IRB_EXIT
-          exit(ret)
-        end
-        ret
-      end
-    rescue SystemExit=>e
-      exit(e.status)
-    rescue Interrupt=>e
-      fail(e)
-    rescue Exception => e
-      begin
-        msg = _toUTF8(e.class.inspect) + ': ' + 
-              _toUTF8(e.message) + "\n" + 
-              "\n---< backtrace of Ruby side >-----\n" + 
-              _toUTF8(e.backtrace.join("\n")) + 
-              "\n---< backtrace of Tk side >-------"
-        msg.instance_variable_set(:@encoding, 'utf-8')
-      rescue Exception
-        msg = e.class.inspect + ': ' + e.message + "\n" + 
-              "\n---< backtrace of Ruby side >-----\n" + 
-              e.backtrace.join("\n") + 
-              "\n---< backtrace of Tk side >-------"
-      end
-      # TkCore::INTERP._set_global_var('errorInfo', msg)
-      # fail(e)
-      fail(e, msg)
-    end
-  end
-=begin
-  def TkCore.callback(arg_str)
-    # arg = tk_split_list(arg_str)
-    arg = tk_split_simplelist(arg_str)
-    #_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))
-    # TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
-    begin
-      TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
-    rescue Exception => e
-      raise(e, e.class.inspect + ': ' + e.message + "\n" + 
-               "\n---< backtrace of Ruby side >-----\n" + 
-               e.backtrace.join("\n") + 
-               "\n---< backtrace of Tk side >-------")
-    end
-#=begin
-#    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
-  end
-=end
-
-  def load_cmd_on_ip(tk_cmd)
-    bool(tk_call('auto_load', tk_cmd))
-  end
-
   def after(ms, cmd=Proc.new)
-    crit_bup = Thread.critical
-    Thread.critical = true
-
     myid = _curr_cmd_id
-    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(myid); ret})
-
-    Thread.critical = crit_bup
-
-    tk_call_without_enc("after",ms,cmdid)  # return 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
+#	ms = Float(ms)/1000
+#	ms = 10 if ms == 0
+#	sleep ms/1000
+#	cmd.call
 #      end
 #    else
 #      cmdid = install_cmd(cmd)
@@ -1422,71 +523,80 @@ module TkCore
   end
 
   def after_idle(cmd=Proc.new)
-    crit_bup = Thread.critical
-    Thread.critical = true
-
     myid = _curr_cmd_id
-    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(myid); ret})
-
-    Thread.critical = crit_bup
+    cmdid = install_cmd(cmd)
+    tk_call('after','idle',cmdid)
+  end
 
-    tk_call_without_enc('after','idle',cmdid)
+  def clock_clicks(ms=nil)
+    if ms
+      tk_call('clock','clicks','-milliseconds').to_i
+    else
+      tk_call('clock','clicks').to_i
+    end
   end
 
-  def after_cancel(afterId)
-    tk_call_without_enc('after','cancel',afterId)
+  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 windowingsystem
-    tk_call_without_enc('tk', 'windowingsystem')
+  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 scaling(scale=nil)
-    if scale
-      tk_call_without_enc('tk', 'scaling', scale)
+  def clock_scan(str, base=nil)
+    if base
+      tk_call('clock','scan',str,'-base',base).to_i
     else
-      Float(number(tk_call_without_enc('tk', 'scaling')))
+      tk_call('clock','scan',str).to_i
     end
   end
-  def scaling_displayof(win, scale=nil)
-    if scale
-      tk_call_without_enc('tk', 'scaling', '-displayof', win, scale)
+
+  def clock_scanGMT(str, base=nil)
+    if base
+      tk_call('clock','scan',str,'-base',base,'-gmt','1').to_i
     else
-      Float(number(tk_call_without_enc('tk', '-displayof', win, 'scaling')))
+      tk_call('clock','scan',str,'-gmt','1').to_i
     end
   end
 
-  def inactive
-    Integer(tk_call_without_enc('tk', 'inactive'))
+  def clock_seconds
+    tk_call('clock','seconds').to_i
   end
-  def inactive_displayof(win)
-    Integer(tk_call_without_enc('tk', 'inactive', '-displayof', win))
+
+  def TkCore.callback(arg)
+    arg = Array(tk_split_list(arg))
+    _get_eval_string(TkUtil.eval_cmd(Tk_CMDTBL[arg.shift], *arg))
   end
-  def reset_inactive
-    tk_call_without_enc('tk', 'inactive', 'reset')
+
+  def scaling(scale=nil)
+    if scale
+      tk_call('tk', 'scaling', scale)
+    else
+      Float(number(tk_call('tk', 'scaling')))
+    end
   end
-  def reset_inactive_displayof(win)
-    tk_call_without_enc('tk', 'inactive', '-displayof', win, 'reset')
+  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
   end
 
   def appname(name=None)
     tk_call('tk', 'appname', name)
   end
 
-  def appsend_deny
-    tk_call('rename', 'send', '')
-  end
-
   def appsend(interp, async, *args)
-    if $SAFE >= 4
-      fail SecurityError, "cannot send Tk commands at level 4"
-    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Tk commands at level #{$SAFE}"
-    end
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
     if async
       tk_call('send', '-async', '--', interp, *args)
     else
@@ -1495,34 +605,13 @@ module TkCore
   end
 
   def rb_appsend(interp, async, *args)
-    if $SAFE >= 4
-      fail SecurityError, "cannot send Ruby commands at level 4"
-    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Ruby commands at level #{$SAFE}"
-    end
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
-    #args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
-    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"\\]/, '\\\\\&')}
-    # args.push(').to_s"')
-    # appsend(interp, async, 'ruby "(', *args)
-    args.push('}.call)"')
-    appsend(interp, async, 'ruby "TkComm._get_eval_string(proc{', *args)
+    args = args.collect!{|c| _get_eval_string(c).gsub(/[][$"]/, '\\\\\&')}
+    args.push(').to_s"')
+    appsend(interp, async, 'ruby "(', *args)
   end
 
   def appsend_displayof(interp, win, async, *args)
-    if $SAFE >= 4
-      fail SecurityError, "cannot send Tk commands at level 4"
-    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Tk commands at level #{$SAFE}"
-    end
     win = '.' if win == nil
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
     if async
       tk_call('send', '-async', '-displayof', win, '--', interp, *args)
     else
@@ -1531,22 +620,9 @@ module TkCore
   end
 
   def rb_appsend_displayof(interp, win, async, *args)
-    if $SAFE >= 4
-      fail SecurityError, "cannot send Ruby commands at level 4"
-    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Ruby commands at level #{$SAFE}"
-    end
-    win = '.' if win == nil
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
-    #args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
-    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"\\]/, '\\\\\&')}
-    # args.push(').to_s"')
-    # appsend_displayof(interp, win, async, 'ruby "(', *args)
-    args.push('}.call)"')
-    appsend(interp, win, async, 'ruby "TkComm._get_eval_string(proc{', *args)
+    args = args.collect!{|c| _get_eval_string(c).gsub(/[][$"]/, '\\\\\&')}
+    args.push(').to_s"')
+    appsend_displayof(interp, win, async, 'ruby "(', *args)
   end
 
   def info(*args)
@@ -1557,28 +633,11 @@ module TkCore
     TclTkLib.mainloop(check_root)
   end
 
-  def mainloop_thread?
-    # true  : current thread is mainloop
-    # nil   : there is no mainloop
-    # false : mainloop is running on the other thread
-    #         ( At then, it is dangerous to call Tk interpreter directly. )
-    TclTkLib.mainloop_thread?
-  end
-
-  def mainloop_exist?
-    TclTkLib.mainloop_thread? != nil
-  end
-
-  def is_mainloop?
-    TclTkLib.mainloop_thread? == true
-  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)
+  def do_one_event(flag = 0)
     TclTkLib.do_one_event(flag)
   end
 
@@ -1590,14 +649,6 @@ module TkCore
     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
@@ -1606,538 +657,170 @@ module TkCore
     TclTkLib.get_eventloop_weight
   end
 
-  def restart(app_name = nil, keys = {})
-    TkCore::INTERP.init_ip_internal
-
+  def restart(app_name = nil, use = nil)
     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(' '))
+    if use
+      tk_call('set', 'argc', 2)
+      tk_call('set', 'argv', "-use #{use}")
     end
-
-    INTERP.restart
+    TkCore::INTERP.restart
+    TkComm::Tk_CMDTBL.clear
+    TkComm::Tk_WINDOWS.clear
     nil
   end
 
-  def event_generate(win, context, keys=nil)
-    #win = win.path if win.kind_of?(TkObject)
-    if context.kind_of?(TkEvent::Event)
-      context.generate(win, ((keys)? keys: {}))
-    elsif keys
-      tk_call_without_enc('event', 'generate', win, 
-                          "<#{tk_event_sequence(context)}>", 
-                          *hash_kv(keys, true))
+  def event_generate(window, context, keys=nil)
+    window = window.path if window.kind_of? TkObject
+    if keys
+      tk_call('event', 'generate', window, 
+	      "<#{tk_event_sequence(context)}>", *hash_kv(keys))
     else
-      tk_call_without_enc('event', 'generate', win, 
-                          "<#{tk_event_sequence(context)}>")
+      tk_call('event', 'generate', window, "<#{tk_event_sequence(context)}>")
     end
-    nil
   end
 
   def messageBox(keys)
-    tk_call('tk_messageBox', *hash_kv(keys))
+    tk_call 'tk_messageBox', *hash_kv(keys)
   end
 
   def getOpenFile(keys = nil)
-    tk_call('tk_getOpenFile', *hash_kv(keys))
-  end
-  def getMultipleOpenFile(keys = nil)
-    simplelist(tk_call('tk_getOpenFile', '-multiple', '1', *hash_kv(keys)))
+    tk_call 'tk_getOpenFile', *hash_kv(keys)
   end
 
   def getSaveFile(keys = nil)
-    tk_call('tk_getSaveFile', *hash_kv(keys))
-  end
-  def getMultipleSaveFile(keys = nil)
-    simplelist(tk_call('tk_getSaveFile', '-multiple', '1', *hash_kv(keys)))
+    tk_call 'tk_getSaveFile', *hash_kv(keys)
   end
 
   def chooseColor(keys = nil)
-    tk_call('tk_chooseColor', *hash_kv(keys))
+    tk_call 'tk_chooseColor', *hash_kv(keys)
   end
 
   def chooseDirectory(keys = nil)
-    tk_call('tk_chooseDirectory', *hash_kv(keys))
-  end
-
-  def _ip_eval_core(enc_mode, cmd_string)
-    case enc_mode
-    when nil
-      res = INTERP._eval(cmd_string)
-    when false
-      res = INTERP._eval_without_enc(cmd_string)
-    when true
-      res = INTERP._eval_with_enc(cmd_string)
-    end
-    if  INTERP._return_value() != 0
-      fail RuntimeError, res, error_at
-    end
-    return res
-  end
-  private :_ip_eval_core
-
-  def ip_eval(cmd_string)
-    _ip_eval_core(nil, cmd_string)
-  end
-
-  def ip_eval_without_enc(cmd_string)
-    _ip_eval_core(false, cmd_string)
-  end
-
-  def ip_eval_with_enc(cmd_string)
-    _ip_eval_core(true, cmd_string)
-  end
-
-  def _ip_invoke_core(enc_mode, *args)
-    case enc_mode
-    when false
-      res = INTERP._invoke_without_enc(*args)
-    when nil
-      res = INTERP._invoke(*args)
-    when true
-      res = INTERP._invoke_with_enc(*args)
-    end
-    if  INTERP._return_value() != 0
-      fail RuntimeError, res, error_at
-    end
-    return res
+    tk_call 'tk_chooseDirectory', *hash_kv(keys)
   end
-  private :_ip_invoke_core
 
-  def ip_invoke(*args)
-    _ip_invoke_core(nil, *args)
-  end
-
-  def ip_invoke_without_enc(*args)
-    _ip_invoke_core(false, *args)
-  end
-
-  def ip_invoke_with_enc(*args)
-    _ip_invoke_core(true, *args)
-  end
-
-  def _tk_call_core(enc_mode, *args)
-    ### puts args.inspect if $DEBUG
-    #args.collect! {|x|ruby2tcl(x, enc_mode)}
-    #args.compact!
-    #args.flatten!
-    args = _conv_args([], enc_mode, *args)
-    puts 'invoke args => ' + args.inspect if $DEBUG
-    ### print "=> ", args.join(" ").inspect, "\n" if $DEBUG
+  def tk_call(*args)
+    puts args.inspect if $DEBUG
+    args.collect! {|x|ruby2tcl(x)}
+    args.compact!
+    args.flatten!
+    print "=> ", args.join(" ").inspect, "\n" if $DEBUG
     begin
-      # res = INTERP._invoke(*args).taint
-      # res = INTERP._invoke(enc_mode, *args)
-      res = _ip_invoke_core(enc_mode, *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(enc_mode, *args) 
-        res = _ip_invoke_core(enc_mode, *args) 
-        # >>>>>  _invoke returns a TAINTED string  <<<<<
-      rescue StandardError => err2
-        fail err2 unless /^invalid command/ =~ err2.message
-        fail err
+        res = INTERP._invoke(*args)
+      rescue
+	fail unless /^invalid command/ =~ $!
+	fail err
       end
     end
     if  INTERP._return_value() != 0
       fail RuntimeError, res, error_at
     end
-    ### print "==> ", res.inspect, "\n" if $DEBUG
+    print "==> ", res.inspect, "\n" if $DEBUG
     return res
   end
-  private :_tk_call_core
+end
 
-  def tk_call(*args)
-    _tk_call_core(nil, *args)
+module TkPackage
+  include TkCore
+  extend TkPackage
+
+  def add_path(path)
+    Tk::AUTO_PATH.value = Tk::AUTO_PATH.to_a << path
   end
 
-  def tk_call_without_enc(*args)
-    _tk_call_core(false, *args)
+  def forget(package)
+    tk_call('package', 'forget', package)
+    nil
   end
 
-  def tk_call_with_enc(*args)
-    _tk_call_core(true, *args)
+  def names
+    tk_split_simplelist(tk_call('package', 'names'))
   end
 
-  def _tk_call_to_list_core(depth, arg_enc, val_enc, *args)
-    args = _conv_args([], arg_enc, *args)
-    val = _tk_call_core(false, *args)
-    if !depth.kind_of?(Integer) || depth == 0
-      tk_split_simplelist(val, false, val_enc)
+  def provide(package, version=nil)
+    if version
+      tk_call('package', 'provide', package, version)
+      nil
     else
-      tk_split_list(val, depth, false, val_enc)
+      tk_call('package', 'provide', package)
     end
   end
-  #private :_tk_call_to_list_core
 
-  def tk_call_to_list(*args)
-    _tk_call_to_list_core(-1, nil, true, *args)
+  def present(package, version=None)
+    tk_call('package', 'present', package, version)
   end
 
-  def tk_call_to_list_without_enc(*args)
-    _tk_call_to_list_core(-1, false, false, *args)
+  def present_exact(package, version)
+    tk_call('package', 'present', '-exact', package, version)
   end
 
-  def tk_call_to_list_with_enc(*args)
-    _tk_call_to_list_core(-1, true, true, *args)
+  def require(package, version=None)
+    tk_call('package', 'require', package, version)
   end
 
-  def tk_call_to_simplelist(*args)
-    _tk_call_to_list_core(0, nil, true, *args)
+  def require_exact(package, version)
+    tk_call('package', 'require', '-exact', package, version)
   end
 
-  def tk_call_to_simplelist_without_enc(*args)
-    _tk_call_to_list_core(0, false, false, *args)
+  def versions(package)
+    tk_split_simplelist(tk_call('package', 'versions', package))
   end
 
-  def tk_call_to_simplelist_with_enc(*args)
-    _tk_call_to_list_core(0, true, true, *args)
+  def vcompare(version1, version2)
+    Integer(tk_call('package', 'vcompare', version1, version2))
   end
-end
 
+  def vsatisfies(version1, version2)
+    bool(tk_call('package', 'vsatisfies', version1, version2))
+  end
+end
 
 module Tk
   include TkCore
   extend Tk
 
-  TCL_VERSION = INTERP._invoke_without_enc("info", "tclversion").freeze
-  TCL_PATCHLEVEL = INTERP._invoke_without_enc("info", "patchlevel").freeze
-
-  major, minor = TCL_VERSION.split('.')
-  TCL_MAJOR_VERSION = major.to_i
-  TCL_MINOR_VERSION = minor.to_i
-
-  TK_VERSION  = INTERP._invoke_without_enc("set", "tk_version").freeze
-  TK_PATCHLEVEL  = INTERP._invoke_without_enc("set", "tk_patchLevel").freeze
-
-  major, minor = TK_VERSION.split('.')
-  TK_MAJOR_VERSION = major.to_i
-  TK_MINOR_VERSION = minor.to_i
-
-  JAPANIZED_TK = (INTERP._invoke_without_enc("info", "commands", 
-                                             "kanji") != "").freeze
-
-  def Tk.const_missing(sym)
-    case(sym)
-    when :TCL_LIBRARY
-      INTERP._invoke_without_enc('global', 'tcl_library')
-      INTERP._invoke("set", "tcl_library").freeze
-
-    when :TK_LIBRARY
-      INTERP._invoke_without_enc('global', 'tk_library')
-      INTERP._invoke("set", "tk_library").freeze
-
-    when :LIBRARY
-      INTERP._invoke("info", "library").freeze
-
-    #when :PKG_PATH, :PACKAGE_PATH, :TCL_PACKAGE_PATH
-    #  INTERP._invoke_without_enc('global', 'tcl_pkgPath')
-    #  tk_split_simplelist(INTERP._invoke('set', 'tcl_pkgPath'))
+  TCL_VERSION = INTERP._invoke("info", "tclversion")
+  TK_VERSION  = INTERP._invoke("set", "tk_version")
 
-    #when :LIB_PATH, :LIBRARY_PATH, :TCL_LIBRARY_PATH
-    #  INTERP._invoke_without_enc('global', 'tcl_libPath')
-    #  tk_split_simplelist(INTERP._invoke('set', 'tcl_libPath'))
+  TCL_PATCHLEVEL = INTERP._invoke("info", "patchlevel")
+  TK_PATCHLEVEL  = INTERP._invoke("set", "tk_patchLevel")
 
-    when :PLATFORM, :TCL_PLATFORM
-      if $SAFE >= 4
-        fail SecurityError, "can't get #{sym} when $SAFE >= 4"
-      end
-      INTERP._invoke_without_enc('global', 'tcl_platform')
-      Hash[*tk_split_simplelist(INTERP._invoke_without_enc('array', 'get', 
-                                                           'tcl_platform'))]
-
-    when :ENV
-      INTERP._invoke_without_enc('global', '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'))
+  TCL_LIBRARY = INTERP._invoke("set", "tcl_library")
+  TK_LIBRARY  = INTERP._invoke("set", "tk_library")
+  LIBRARY     = INTERP._invoke("info", "library")
 
-    when :AUTO_INDEX
-      INTERP._invoke_without_enc('global', 'auto_index')
-      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'auto_index'))]
-
-    when :PRIV, :PRIVATE, :TK_PRIV
-      priv = {}
-      if INTERP._invoke_without_enc('info', 'vars', 'tk::Priv') != ""
-        var_nam = 'tk::Priv'
-      else
-        var_nam = 'tkPriv'
-      end
-      INTERP._invoke_without_enc('global', var_nam)
-      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
+  PLATFORM = Hash[*tk_split_simplelist(INTERP._eval('array get tcl_platform'))]
 
-    else
-      raise NameError, 'uninitialized constant Tk::' + sym.id2name
-    end
-  end
-
-  def Tk.errorInfo
-    INTERP._invoke_without_enc('global', 'errorInfo')
-    INTERP._invoke_without_enc('set', 'errorInfo')
-  end
-
-  def Tk.errorCode
-    INTERP._invoke_without_enc('global', 'errorCode')
-    code = tk_split_simplelist(INTERP._invoke_without_enc('set', 'errorCode'))
-    case code[0]
-    when 'CHILDKILLED', 'CHILDSTATUS', 'CHILDSUSP'
-      begin
-        pid = Integer(code[1])
-        code[1] = pid
-      rescue
-      end
-    end
-    code
-  end
-
-  def Tk.has_mainwindow?
-    INTERP.has_mainwindow?
-  end
+  JAPANIZED_TK = (INTERP._invoke("info", "commands", "kanji") != "")
 
   def root
     TkRoot.new
   end
 
-  def Tk.load_tclscript(file, enc=nil)
-    if enc
-      # TCL_VERSION >= 8.5
-      tk_call('source', '-encoding', enc, file)
-    else
-      tk_call('source', file)
-    end
-  end
-
-  def Tk.load_tcllibrary(file, pkg_name=None, interp=None)
-    tk_call('load', file, pkg_name, interp)
-  end
-
-  def Tk.unload_tcllibrary(*args)
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-      nocomp = (keys['nocomplain'])? '-nocomplain': None
-      keeplib = (keys['keeplibrary'])? '-keeplibrary': None
-      tk_call('unload', nocomp, keeplib, '--', *args)
-    else
-      tk_call('unload', *args)
-    end
-  end
-
-  def Tk.pkgconfig_list(mod)
-    # Tk8.5 feature
-    if mod.kind_of?(Module)
-      if mod.respond_to?(:package_name)
-        pkgname = mod.package_name
-      elsif mod.const_defined?(:PACKAGE_NAME)
-        pkgname = mod::PACKAGE_NAME
-      else
-        fail NotImplementedError, 'may not be a module for a Tcl extension'
-      end
-    else
-      pkgname = mod.to_s
-    end
-
-    pkgname = '::' << pkgname unless pkgname =~ /^::/
-
-    tk_split_list(tk_call(pkgname + '::pkgconfig', 'list'))
-  end
-
-  def Tk.pkgconfig_get(mod, key)
-    # Tk8.5 feature
-    if mod.kind_of?(Module)
-      if mod.respond_to?(:package_name)
-        pkgname = mod.package_name
-      else
-        fail NotImplementedError, 'may not be a module for a Tcl extension'
-      end
-    else
-      pkgname = mod.to_s
-    end
-
-    pkgname = '::' << pkgname unless pkgname =~ /^::/
-
-    tk_call(pkgname + '::pkgconfig', 'get', key)
-  end
-
-  def Tk.tcl_pkgconfig_list
-    # Tk8.5 feature
-    Tk.pkgconfig_list('::tcl')
-  end
-
-  def Tk.tcl_pkgconfig_get(key)
-    # Tk8.5 feature
-    Tk.pkgconfig_get('::tcl', key)
-  end
-
-  def Tk.tk_pkgconfig_list
-    # Tk8.5 feature
-    Tk.pkgconfig_list('::tk')
-  end
-
-  def Tk.tk_pkgconfig_get(key)
-    # Tk8.5 feature
-    Tk.pkgconfig_get('::tk', key)
-  end
-
-  def Tk.bell(nice = false)
-    if nice
-      tk_call_without_enc('bell', '-nice')
-    else
-      tk_call_without_enc('bell')
-    end
-    nil
-  end
-
-  def Tk.bell_on_display(win, nice = false)
-    if nice
-      tk_call_without_enc('bell', '-displayof', win, '-nice')
-    else
-      tk_call_without_enc('bell', '-displayof', win)
-    end
-    nil
-  end
-
-  def Tk.destroy(*wins)
-    #tk_call_without_enc('destroy', *wins)
-    tk_call_without_enc('destroy', *(wins.collect{|win|
-                                       if win.kind_of?(TkWindow)
-                                         win.epath
-                                       else
-                                         win
-                                       end
-                                     }))
-  end
-
-  def Tk.exit
-    tk_call_without_enc('destroy', '.')
-  end
-
-  def Tk.pack(*args)
-    TkPack.configure(*args)
-  end
-  def Tk.pack_forget(*args)
-    TkPack.forget(*args)
-  end
-  def Tk.unpack(*args)
-    TkPack.forget(*args)
-  end
-
-  def Tk.grid(*args)
-    TkGrid.configure(*args)
-  end
-  def Tk.grid_forget(*args)
-    TkGrid.forget(*args)
-  end
-  def Tk.ungrid(*args)
-    TkGrid.forget(*args)
-  end
-
-  def Tk.place(*args)
-    TkPlace.configure(*args)
-  end
-  def Tk.place_forget(*args)
-    TkPlace.forget(*args)
-  end
-  def Tk.unplace(*args)
-    TkPlace.forget(*args)
-  end
-
-  def Tk.update(idle=nil)
-    if idle
-      tk_call_without_enc('update', 'idletasks')
-    else
-      tk_call_without_enc('update')
-    end
-  end
-  def Tk.update_idletasks
-    update(true)
-  end
-  def update(idle=nil)
-    # only for backward compatibility (This never be recommended to use)
-    Tk.update(idle)
-    self
-  end
-
-  # NOTE::
-  #   If no eventloop-thread is running, "thread_update" method is same 
-  #   to "update" method. Else, "thread_update" method waits to complete 
-  #   idletask operation on the eventloop-thread. 
-  def Tk.thread_update(idle=nil)
-    if idle
-      tk_call_without_enc('thread_update', 'idletasks')
-    else
-      tk_call_without_enc('thread_update')
-    end
-  end
-  def Tk.thread_update_idletasks
-    thread_update(true)
-  end
-
-  def Tk.lower_window(win, below=None)
-    tk_call('lower', _epath(win), _epath(below))
-    nil
-  end
-  def Tk.raise_window(win, above=None)
-    tk_call('raise', _epath(win), _epath(above))
-    nil
-  end
-
-  def Tk.current_grabs(win = nil)
-    if win
-      window(tk_call_without_enc('grab', 'current', win))
-    else
-      tk_split_list(tk_call_without_enc('grab', 'current'))
-    end
+  def bell
+    tk_call 'bell'
   end
 
   def Tk.focus(display=nil)
     if display == nil
-      window(tk_call_without_enc('focus'))
-    else
-      window(tk_call_without_enc('focus', '-displayof', display))
-    end
-  end
-
-  def Tk.focus_to(win, force=false)
-    if force
-      tk_call_without_enc('focus', '-force', win)
+      r = tk_call('focus')
     else
-      tk_call_without_enc('focus', win)
+      r = tk_call('focus', '-displayof', display)
     end
+    tk_tcl2ruby(r)
   end
 
   def Tk.focus_lastfor(win)
-    window(tk_call_without_enc('focus', '-lastfor', win))
+    tk_tcl2ruby(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(mode=None)
-    bool(tk_call_without_enc('set', 'tk_strictMotif', mode))
+  def Tk.strictMotif(bool=None)
+    bool(tk_call('set', 'tk_strictMotif', bool))
   end
 
   def Tk.show_kinsoku(mode='both')
@@ -2170,1703 +853,1582 @@ module Tk
     end
   end
 
-  def Tk.toUTF8(str, encoding = nil)
-    _toUTF8(str, encoding)
+  def Tk.toUTF8(str,encoding)
+    INTERP._toUTF8(str,encoding)
   end
   
-  def Tk.fromUTF8(str, encoding = nil)
-    _fromUTF8(str, encoding)
+  def Tk.fromUTF8(str,encoding)
+    INTERP._fromUTF8(str,encoding)
   end
-end
 
-###########################################
-#  string with Tcl's encoding
-###########################################
-module Tk
-  def Tk.subst_utf_backslash(str)
-    Tk::EncodedString.subst_utf_backslash(str)
-  end
-  def Tk.subst_tk_backslash(str)
-    Tk::EncodedString.subst_tk_backslash(str)
-  end
-  def Tk.utf_to_backslash_sequence(str)
-    Tk::EncodedString.utf_to_backslash_sequence(str)
-  end
-  def Tk.utf_to_backslash(str)
-    Tk::EncodedString.utf_to_backslash_sequence(str)
-  end
-  def Tk.to_backslash_sequence(str)
-    Tk::EncodedString.to_backslash_sequence(str)
+  module Scrollable
+    def xscrollcommand(cmd=Proc.new)
+      configure_cmd 'xscrollcommand', cmd
+    end
+    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
-end
-
 
-###########################################
-#  convert kanji string to/from utf-8
-###########################################
-if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
-  class TclTkIp
-    # from tkencoding.rb by ttate@jaist.ac.jp
-    attr_accessor :encoding
-
-    alias __eval _eval
-    alias __invoke _invoke
-
-    alias __toUTF8 _toUTF8
-    alias __fromUTF8 _fromUTF8
-
-=begin
-    #### --> definition is moved to TclTkIp module
-
-    def _toUTF8(str, encoding = nil)
-      # decide encoding
-      if encoding
-        encoding = encoding.to_s
-      elsif str.kind_of?(Tk::EncodedString) && str.encoding != nil
-        encoding = str.encoding.to_s
-      elsif str.instance_variable_get(:@encoding)
-        encoding = str.instance_variable_get(:@encoding).to_s
-      elsif defined?(@encoding) && @encoding != nil
-        encoding = @encoding.to_s
+  module Wm
+    include TkComm
+    def aspect(*args)
+      w = tk_call('wm', 'aspect', path, *args)
+      list(w) if args.length == 0
+    end
+    def client(name=None)
+      tk_call 'wm', 'client', path, name
+    end
+    def colormapwindows(*args)
+      list(tk_call('wm', 'colormapwindows', path, *args))
+    end
+    def wm_command(value=None)
+      string(tk_call('wm', 'command', path, value))
+    end
+    def deiconify
+      tk_call 'wm', 'deiconify', path
+    end
+    def focusmodel(*args)
+      tk_call 'wm', 'focusmodel', path, *args
+    end
+    def frame
+      tk_call('wm', 'frame', path)
+    end
+    def geometry(*args)
+      tk_call('wm', 'geometry', path, *args)
+    end
+    def grid(*args)
+      w = tk_call('wm', 'grid', path, *args)
+      list(w) if args.size == 0
+    end
+    def group(*args)
+      w = tk_call 'wm', 'group', path, *args
+      window(w) if args.size == 0
+    end
+    def iconbitmap(*args)
+      tk_call 'wm', 'iconbitmap', path, *args
+    end
+    def iconify
+      tk_call 'wm', 'iconify', path
+    end
+    def iconmask(*args)
+      tk_call 'wm', 'iconmask', path, *args
+    end
+    def iconname(*args)
+      tk_call 'wm', 'iconname', path, *args
+    end
+    def iconposition(*args)
+      w = tk_call('wm', 'iconposition', path, *args)
+      list(w) if args.size == 0
+    end
+    def iconwindow(*args)
+      w = tk_call('wm', 'iconwindow', path, *args)
+      window(w) if args.size == 0
+    end
+    def maxsize(*args)
+      w = tk_call('wm', 'maxsize', path, *args)
+      list(w) if args.size == 0
+    end
+    def minsize(*args)
+      w = tk_call('wm', 'minsize', path, *args)
+      list(w) if args.size == 0
+    end
+    def overrideredirect(bool=None)
+      if bool == None
+	bool(tk_call('wm', 'overrideredirect', path))
       else
-        encoding = __invoke('encoding', 'system')
+	tk_call 'wm', 'overrideredirect', path, bool
       end
-
-      # convert
-      case encoding
-      when 'utf-8', 'binary'
-        str
+    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)
+      elsif name
+	result = tk_call('wm', 'protocol', path, name)
+	(result == "")? nil : tk_tcl2ruby(result)
       else
-        __toUTF8(str, encoding)
+	tk_split_simplelist(tk_call('wm', 'protocol', path))
       end
     end
-
-    def _fromUTF8(str, encoding = nil)
-      unless encoding
-        if defined?(@encoding) && @encoding != nil
-          encoding = @encoding.to_s
-        else
-          encoding = __invoke('encoding', 'system')
-        end
-      end
-
-      if str.kind_of?(Tk::EncodedString)
-        if str.encoding == 'binary'
-          str
-        else
-          __fromUTF8(str, encoding)
-        end
-      elsif str.instance_variable_get(:@encoding).to_s == 'binary'
-        str
-      else
-        __fromUTF8(str, encoding)
+    def resizable(*args)
+      w = tk_call('wm', 'resizable', path, *args)
+      if args.length == 0
+	list(w).collect{|e| bool(e)}
       end
     end
-=end
-
-    def _eval(cmd)
-      _fromUTF8(__eval(_toUTF8(cmd)))
+    def sizefrom(*args)
+      tk_call('wm', 'sizefrom', path, *args)
     end
-
-    def _invoke(*cmds)
-      _fromUTF8(__invoke(*(cmds.collect{|cmd| _toUTF8(cmd)})))
+    def state(state=None)
+      tk_call 'wm', 'state', path, state
     end
+    def title(*args)
+      tk_call 'wm', 'title', path, *args
+    end
+    def transient(*args)
+      window(tk_call('wm', 'transient', path, *args))
+    end
+    def withdraw
+      tk_call 'wm', 'withdraw', path
+    end
+  end
+end
 
-    alias _eval_with_enc _eval
-    alias _invoke_with_enc _invoke
-
-=begin
+###########################################
+#  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
+    private :__eval
+    private :__invoke
+    
+    attr_accessor :encoding
+    
     def _eval(cmd)
-      if defined?(@encoding) && @encoding != 'utf-8'
-        ret = if cmd.kind_of?(Tk::EncodedString)
-                case cmd.encoding
-                when 'utf-8', 'binary'
-                  __eval(cmd)
-                else
-                  __eval(_toUTF8(cmd, cmd.encoding))
-                end
-              elsif cmd.instance_variable_get(:@encoding) == 'binary'
-                __eval(cmd)
-              else
-                __eval(_toUTF8(cmd, @encoding))
-              end
-        if ret.kind_of?(String) && ret.instance_variable_get(:@encoding) == 'binary'
-          ret
-        else
-          _fromUTF8(ret, @encoding)
-        end
+      if @encoding
+	_fromUTF8(__eval(_toUTF8(cmd, @encoding)), @encoding)
       else
-        __eval(cmd)
+	__eval(cmd)
       end
     end
-
+    
     def _invoke(*cmds)
-      if defined?(@encoding) && @encoding != 'utf-8'
-        cmds = cmds.collect{|cmd|
-          if cmd.kind_of?(Tk::EncodedString)
-            case cmd.encoding
-            when 'utf-8', 'binary'
-              cmd
-            else
-              _toUTF8(cmd, cmd.encoding)
-            end
-          elsif cmd.instance_variable_get(:@encoding) == 'binary'
-            cmd
-          else
-            _toUTF8(cmd, @encoding)
-          end
-        }
-        ret = __invoke(*cmds)
-        if ret.kind_of?(String) && ret.instance_variable_get(:@encoding) == 'binary'
-          ret
-        else
-          _fromUTF8(ret, @encoding)
-        end
+      if @encoding
+	cmds = cmds.collect{|cmd| _toUTF8(cmd, @encoding)}
+	_fromUTF8(__invoke(*cmds), @encoding)
       else
-        __invoke(*cmds)
-        end
-    end
-=end
-  end
-
-  module TclTkLib
-    class << self
-      alias _encoding encoding
-      alias _encoding= encoding=
-      def encoding=(name)
-        TkCore::INTERP.encoding = name
-      end
-      def encoding
-        TkCore::INTERP.encoding
-      end
+	__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
-        TkComm.simplelist(Tk.tk_call('encoding', 'names'))
-      end
-
-      def encoding_system
-        Tk.tk_call('encoding', 'system')
-      end
-
-      def encoding_system=(enc)
-        Tk.tk_call('encoding', 'system', enc)
-      end
+    def encoding=(name)
+      INTERP.encoding = name
+    end
 
-      def encoding_convertfrom(str, enc=nil)
-        # str is an usual enc string or a Tcl's internal string expression
-        # in enc (which is returned from 'encoding_convertto' method). 
-        # the return value is a UTF-8 string.
-        enc = encoding_system unless enc
-        ret = TkCore::INTERP.__invoke('encoding', 'convertfrom', enc, str)
-        ret.instance_variable_set('@encoding', 'utf-8')
-        ret
-      end
-      alias encoding_convert_from encoding_convertfrom
-
-      def encoding_convertto(str, enc=nil)
-        # str must be a UTF-8 string.
-        # The return value is a Tcl's internal string expression in enc. 
-        # To get an usual enc string, use Tk.fromUTF8(ret_val, enc).
-        enc = encoding_system unless enc
-        ret = TkCore::INTERP.__invoke('encoding', 'convertto', enc, str)
-        ret.instance_variable_set('@encoding', 'binary')
-        ret
-      end
-      alias encoding_convert_to encoding_convertto
+    def encoding
+      INTERP.encoding
+    end
 
-      def encoding_dirs
-        # Tcl8.5 feature
-        TkComm.simplelist(Tk.tk_call_without_enc('encoding', 'dirs'))
-      end
+    def encoding_names
+      tk_split_simplelist(tk_call('encoding', 'names'))
+    end
 
-      def encoding_dirs=(dir_list) # an array or a Tcl's list string
-        # Tcl8.5 feature
-        Tk.tk_call_without_enc('encoding', 'dirs', dir_list)
-      end
+    def encoding_system
+      tk_call('encoding', 'system')
     end
 
-    extend Encoding
+    def encoding_system=(enc)
+      tk_call('encoding', 'system', enc)
+    end
   end
 
   # estimate encoding
   case $KCODE
   when /^e/i  # EUC
     Tk.encoding = 'euc-jp'
-    Tk.encoding_system = 'euc-jp'
   when /^s/i  # SJIS
-    begin
-      if Tk.encoding_system == 'cp932'
-        Tk.encoding = 'cp932'
-      else
-        Tk.encoding = 'shiftjis'
-        Tk.encoding_system = 'shiftjis'
-      end
-    rescue StandardError, NameError
-      Tk.encoding = 'shiftjis'
-      Tk.encoding_system = 'shiftjis'
-    end
+    Tk.encoding = 'shiftjis'
   when /^u/i  # UTF8
     Tk.encoding = 'utf-8'
-    Tk.encoding_system = 'utf-8'
   else        # NONE
-    if defined? DEFAULT_TK_ENCODING
-      Tk.encoding_system = DEFAULT_TK_ENCODING
-    end
     begin
       Tk.encoding = Tk.encoding_system
     rescue StandardError, NameError
       Tk.encoding = 'utf-8'
-      Tk.encoding_system = 'utf-8'
     end
   end
 
 else
   # dummy methods
-  class TclTkIp
-    attr_accessor :encoding
-
-    alias __eval _eval
-    alias __invoke _invoke
-
-    alias _eval_with_enc _eval
-    alias _invoke_with_enc _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 encoding_dirs
-        nil
-      end
-      def encoding_dirs=(dir_array)
-        nil
-      end
+    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
-
-    extend Encoding
   end
 end
 
-
 module TkBindCore
-  #def bind(context, cmd=Proc.new, *args)
-  #  Tk.bind(self, context, cmd, *args)
-  #end
-  def bind(context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    Tk.bind(self, context, cmd, *args)
+  def bind(context, cmd=Proc.new, args=nil)
+    Tk.bind(to_eval, context, cmd, args)
   end
 
-  #def bind_append(context, cmd=Proc.new, *args)
-  #  Tk.bind_append(self, context, cmd, *args)
-  #end
-  def bind_append(context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    Tk.bind_append(self, context, cmd, *args)
+  def bind_append(context, cmd=Proc.new, args=nil)
+    Tk.bind_append(to_eval, context, cmd, args)
   end
 
   def bind_remove(context)
-    Tk.bind_remove(self, context)
+    Tk.bind_remove(to_eval, context)
   end
 
   def bindinfo(context=nil)
-    Tk.bindinfo(self, context)
+    Tk.bindinfo(to_eval, context)
   end
 end
 
+class TkBindTag
+  include TkBindCore
 
-module TkTreatFont
-  def __font_optkeys
-    ['font']
-  end
-  private :__font_optkeys
+  BTagID_TBL = {}
+  Tk_BINDTAG_ID = ["btag00000"]
 
-  def __pathname
-    self.path
+  def TkBindTag.id2obj(id)
+    BTagID_TBL[id]? BTagID_TBL[id]: id
   end
-  private :__pathname
 
-  ################################
+  ALL = self.new
+  ALL.instance_eval {
+    @id = 'all'
+    BTagID_TBL[@id] = self
+  }
 
-  def font_configinfo(key = nil)
-    optkeys = __font_optkeys
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
+  def initialize(*args)
+    @id = Tk_BINDTAG_ID[0]
+    Tk_BINDTAG_ID[0] = Tk_BINDTAG_ID[0].succ
+    BTagID_TBL[@id] = self
+    bind(*args) if args != []
+  end
 
-    win, tag = __pathname.split(':')
+  def to_eval
+    @id
+  end
 
-    if key
-      pathname = [win, tag, key].join(';')
-      TkFont.used_on(pathname) || 
-        TkFont.init_widget_font(pathname, *__confinfo_cmd)
-    elsif optkeys.size == 1
-      pathname = [win, tag, optkeys[0]].join(';')
-      TkFont.used_on(pathname) || 
-        TkFont.init_widget_font(pathname, *__confinfo_cmd)
-    else
-      fonts = {}
-      optkeys.each{|key|
-        key = key.to_s
-        pathname = [win, tag, key].join(';')
-        fonts[key] = 
-          TkFont.used_on(pathname) || 
-          TkFont.init_widget_font(pathname, *__confinfo_cmd)
-      }
-      fonts
-    end
+  def inspect
+    format "#<TkBindTag: %s>", @id
   end
-  alias fontobj font_configinfo
+end
 
-  def font_configure(slot)
-    pathname = __pathname
+class TkBindTagAll<TkBindTag
+  def TkBindTagAll.new(*args)
+    $stderr.puts "Warning: TkBindTagALL is obsolete. Use TkBindTag::ALL\n"
 
-    slot = _symbolkey2str(slot)
+    TkBindTag::ALL.bind(*args) if args != []
+    TkBindTag::ALL
+  end
+end
 
-    __font_optkeys.each{|optkey|
-      optkey = optkey.to_s
-      l_optkey = 'latin' << optkey
-      a_optkey = 'ascii' << optkey
-      k_optkey = 'kanji' << optkey
-
-      if slot.key?(optkey)
-        fnt = slot.delete(optkey)
-        if fnt.kind_of?(TkFont)
-          slot.delete(l_optkey)
-          slot.delete(a_optkey)
-          slot.delete(k_optkey)
-
-          fnt.call_font_configure([pathname, optkey], *(__config_cmd << {}))
-          next
-        else
-          if fnt
-            if (slot.key?(l_optkey) || 
-                slot.key?(a_optkey) || 
-                slot.key?(k_optkey))
-              fnt = TkFont.new(fnt)
-
-              lfnt = slot.delete(l_optkey)
-              lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
-              kfnt = slot.delete(k_optkey)
-
-              fnt.latin_replace(lfnt) if lfnt
-              fnt.kanji_replace(kfnt) if kfnt
-
-              fnt.call_font_configure([pathname, optkey], 
-                                      *(__config_cmd << {}))
-              next
-            else
-              fnt = hash_kv(fnt) if fnt.kind_of?(Hash)
-              tk_call(*(__config_cmd << "-#{optkey}" << fnt))
-            end
-          end
-          next
-        end
-      end
+class TkVariable
+  include Tk
+  extend TkCore
 
-      lfnt = slot.delete(l_optkey)
-      lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
-      kfnt = slot.delete(k_optkey)
-
-      if lfnt && kfnt
-        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey], 
-                                                   *(__config_cmd << {}))
-      elsif lfnt
-        latinfont_configure([lfnt, optkey])
-      elsif kfnt
-        kanjifont_configure([kfnt, optkey])
-      end
-    }
+  TkVar_CB_TBL = {}
+  Tk_VARIABLE_ID = ["v00000"]
 
-    # configure other (without font) options
-    tk_call(*(__config_cmd.concat(hash_kv(slot)))) if slot != {}
-    self
-  end
+  INTERP._invoke("proc", "rb_var", "args", "ruby [format \"TkVariable.callback %%Q!%s!\" $args]")
 
-  def latinfont_configure(ltn, keys=nil)
-    if ltn.kind_of?(Array)
-      key = ltn[1]
-      ltn = ltn[0]
+  def TkVariable.callback(args)
+    name1,name2,op = tk_split_list(args)
+    if TkVar_CB_TBL[name1]
+      _get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
     else
-      key = nil
+      ''
     end
+  end
 
-    optkeys = __font_optkeys
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
+  def initialize(val="")
+    @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))
+    elsif val.kind_of?(Array)
+      a = []
+      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(/[][$"]/, '\\\\\&') + '"'
+      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
 
-    win, tag = __pathname.split(':')
-
-    optkeys = [key] if key
-
-    optkeys.each{|optkey|
-      optkey = optkey.to_s
+  def wait
+    INTERP._eval("tkwait variable #{@id}")
+  end
 
-      pathname = [win, tag, optkey].join(';')
+  def id
+    @id
+  end
 
-      if (fobj = TkFont.used_on(pathname))
-        fobj = TkFont.new(fobj) # create a new TkFont object
-      elsif Tk::JAPANIZED_TK
-        fobj = fontobj          # create a new TkFont object
+  def value
+    begin
+      INTERP._eval(format('global %s; set %s', @id, @id))
+    rescue
+      if INTERP._eval(format('global %s; array exists %s', @id, @id)) != "1"
+	fail
       else
-        ltn = hash_kv(ltn) if ltn.kind_of?(Hash)
-        tk_call(*(__config_cmd << "-#{optkey}" << ltn))
-        next
+	Hash[*tk_split_simplelist(INTERP._eval(format('global %s; array get %s', 
+						      @id, @id)))]
       end
+    end
+  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
+  def value=(val)
+    begin
+      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
+      else
+	if val == []
+	  INTERP._eval(format('global %s; unset %s; set %s(0) 0; unset %s(0)', 
+			      @id, @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(/[][$"]/, '\\\\\&') + '"'
+	  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(/[][$"]/, '\\\\\&') + '"'
+	  INTERP._eval(format('global %s; unset %s; array set %s %s', 
+			      @id, @id, @id, s))
+	else
+	  fail
+	end
       end
-
-      fobj.call_font_configure([pathname, optkey], *(__config_cmd << {}))
-    }
-    self
+    end
   end
-  alias asciifont_configure latinfont_configure
 
-  def kanjifont_configure(knj, keys=nil)
-    if knj.kind_of?(Array)
-      key = knj[1]
-      knj = knj[0]
-    else
-      key = nil
-    end
+  def [](index)
+    INTERP._eval(format('global %s; set %s(%s)', 
+			@id, @id, _get_eval_string(index)))
+  end
 
-    optkeys = __font_optkeys
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
+  def []=(index,val)
+    INTERP._eval(format('global %s; set %s(%s) %s', @id, @id, 
+			_get_eval_string(index), _get_eval_string(val)))
+  end
 
-    win, tag = __pathname.split(':')
+  def to_i
+    number(value).to_i
+  end
 
-    optkeys = [key] if key
+  def to_f
+    number(value).to_f
+  end
 
-    optkeys.each{|optkey|
-      optkey = optkey.to_s
+  def to_s
+    string(value).to_s
+  end
 
-      pathname = [win, tag, optkey].join(';')
+  def inspect
+    format "#<TkVariable: %s>", @id
+  end
 
-      if (fobj = TkFont.used_on(pathname))
-        fobj = TkFont.new(fobj) # create a new TkFont object
-      elsif Tk::JAPANIZED_TK
-        fobj = fontobj          # create a new TkFont object
-      else
-        knj = hash_kv(knj) if knj.kind_of?(Hash)
-        tk_call(*(__config_cmd << "-#{optkey}" << knj))
-        next
-      end
+  def ==(other)
+    case other
+    when TkVariable
+      self.equal(self)
+    when String
+      self.to_s == other
+    when Integer
+      self.to_i == other
+    when Float
+      self.to_f == other
+    when Array
+      self.to_a == other
+    else
+      false
+    end
+  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
+  def to_a
+    list(value)
+  end
 
-      fobj.call_font_configure([pathname, optkey], *(__config_cmd << {}))
-    }
-    self
+  def to_eval
+    @id
   end
 
-  def font_copy(win, wintag=nil, winkey=nil, targetkey=nil)
-    if wintag
-      if winkey
-        fnt = win.tagfontobj(wintag, winkey).dup
-      else
-        fnt = win.tagfontobj(wintag).dup
-      end
+  def unset(elem=nil)
+    if elem
+      INTERP._eval(format('global %s; unset %s(%s)', 
+			  @id, @id, tk_tcl2ruby(elem)))
     else
-      if winkey
-        fnt = win.fontobj(winkey).dup
-      else
-        fnt = win.fontobj.dup
+      INTERP._eval(format('global %s; unset %s', @id, @id))
+    end
+  end
+  alias remove unset
+
+  def trace_callback(elem, op)
+    if @trace_var.kind_of? Array
+      @trace_var.each{|m,e| e.call(self,elem,op) if m.index(op)}
+    end
+    if elem.kind_of? String
+      if @trace_elem[elem].kind_of? Array
+	@trace_elem[elem].each{|m,e| e.call(self,elem,op) if m.index(op)}
       end
     end
+  end
 
-    if targetkey
-      fnt.call_font_configure([__pathname, targetkey], *(__config_cmd << {}))
+  def trace(opts, cmd)
+    @trace_var = [] if @trace_var == nil
+    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
+    @trace_var.unshift([opts,cmd])
+    if @trace_opts == nil
+      TkVar_CB_TBL[@id] = self
+      @trace_opts = opts
+      Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
     else
-      fnt.call_font_configure(__pathname, *(__config_cmd << {}))
+      newopts = @trace_opts.dup
+      opts.each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      if newopts != @trace_opts
+	Tk.tk_call('trace', 'vdelete', @id, @trace_opts, 'rb_var')
+	@trace_opts.replace(newopts)
+	Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
+      end
     end
-    self
   end
 
-  def latinfont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
-    if targetkey
-      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey], 
-                                                 *(__config_cmd << {}))
+  def trace_element(elem, opts, cmd)
+    @trace_elem = {} if @trace_elem == nil
+    @trace_elem[elem] = [] if @trace_elem[elem] == nil
+    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
+    @trace_elem[elem].unshift([opts,cmd])
+    if @trace_opts == nil
+      TkVar_CB_TBL[@id] = self
+      @trace_opts = opts
+      Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
     else
-      fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
+      newopts = @trace_opts.dup
+      opts.each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      if newopts != @trace_opts
+	Tk.tk_call('trace', 'vdelete', @id, @trace_opts, 'rb_var')
+	@trace_opts.replace(newopts)
+	Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
+      end
     end
+  end
 
-    if wintag
-      if winkey
-        fontobj.latin_replace(win.tagfontobj(wintag, winkey).latin_font_id)
-      else
-        fontobj.latin_replace(win.tagfontobj(wintag).latin_font_id)
+  def trace_vinfo
+    return [] unless @trace_var
+    @trace_var.dup
+  end
+  def trace_vinfo_for_element(elem)
+    return [] unless @trace_elem
+    return [] unless @trace_elem[elem]
+    @trace_elem[elem].dup
+  end
+
+  def trace_vdelete(opts,cmd)
+    return unless @trace_var.kind_of? Array
+    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
+    idx = -1
+    newopts = ''
+    @trace_var.each_with_index{|e,i| 
+      if idx < 0 && e[0] == opts && e[1] == cmd
+	idx = i
+	next
       end
+      e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
+    }
+    if idx >= 0
+      @trace_var.delete_at(idx) 
     else
-      if winkey
-        fontobj.latin_replace(win.fontobj(winkey).latin_font_id)
-      else
-        fontobj.latin_replace(win.fontobj.latin_font_id)
+      return
+    end
+
+    @trace_elem.each{|elem|
+      @trace_elem[elem].each{|e|
+	e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      }
+    }
+
+    newopts = ['r','w','u'].find_all{|c| newopts.index(c)}.join('')
+    if newopts != @trace_opts
+      Tk.tk_call('trace', 'vdelete', @id, @trace_opts, 'rb_var')
+      @trace_opts.replace(newopts)
+      if @trace_opts != ''
+	Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
       end
     end
-    self
   end
-  alias asciifont_copy latinfont_copy
 
-  def kanjifont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
-    if targetkey
-      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey], 
-                                                 *(__config_cmd << {}))
+  def trace_vdelete_for_element(elem,opts,cmd)
+    return unless @trace_elem.kind_of? Hash
+    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| 
+      if idx < 0 && e[0] == opts && e[1] == cmd
+	idx = i
+	next
+      end
+    }
+    if idx >= 0
+      @trace_elem[elem].delete_at(idx)
     else
-        fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
+      return
     end
 
-    if wintag
-      if winkey
-        fontobj.kanji_replace(win.tagfontobj(wintag, winkey).kanji_font_id)
-      else
-        fontobj.kanji_replace(win.tagfontobj(wintag).kanji_font_id)
-      end
-    else
-      if winkey
-        fontobj.kanji_replace(win.fontobj(winkey).kanji_font_id)
-      else
-        fontobj.kanji_replace(win.fontobj.kanji_font_id)
+    newopts = ''
+    @trace_var.each{|e| 
+      e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
+    }
+    @trace_elem.each{|elem|
+      @trace_elem[elem].each{|e|
+	e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      }
+    }
+
+    newopts = ['r','w','u'].find_all{|c| newopts.index(c)}.join('')
+    if newopts != @trace_opts
+      Tk.tk_call('trace', 'vdelete', @id, @trace_opts, 'rb_var')
+      @trace_opts.replace(newopts)
+      if @trace_opts != ''
+	Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
       end
     end
-    self
   end
 end
 
-
-module TkConfigMethod
-  include TkUtil
-  include TkTreatFont
-
-  def __cget_cmd
-    [self.path, 'cget']
+class TkVarAccess<TkVariable
+  def initialize(varname, val=nil)
+    @id = varname
+    if val
+      s = '"' + _get_eval_string(val).gsub(/[][$"]/, '\\\\\&') + '"' #"
+      INTERP._eval(format('global %s; set %s %s', @id, @id, s))
+    end
   end
-  private :__cget_cmd
+end
 
-  def __config_cmd
-    [self.path, 'configure']
+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
-  private :__config_cmd
+  AUTO_PATH = TkVarAccess.new('auto_path', auto_path)
 
-  def __confinfo_cmd
-    __config_cmd
-  end
-  private :__config_cmd
+  TCL_PACKAGE_PATH = TkVarAccess.new('tcl_pkgPath')
+end
 
-  def __configinfo_struct
-    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2, 
-      :default_value=>3, :current_value=>4}
+module TkSelection
+  include Tk
+  extend Tk
+  def clear(win=Tk.root)
+    tk_call 'selection', 'clear', win.path
   end
-  private :__configinfo_struct
-
-  def __numval_optkeys
-    []
+  def get(type=None)
+    tk_call 'selection', 'get', type
   end
-  private :__numval_optkeys
-
-  def __numstrval_optkeys
-    []
+  def TkSelection.handle(win, func, type=None, format=None)
+    tk_call 'selection', 'handle', win.path, func, type, format
   end
-  private :__numstrval_optkeys
-
-  def __boolval_optkeys
-    ['exportselection', 'jump', 'setgrid', 'takefocus']
+  def handle(func, type=None, format=None)
+    TkSelection.handle self, func, type, format
+  end
+  def TkSelection.own(win=None, func=None)
+    window(tk_call('selection', 'own', win, func))
+  end
+  def own(func=None)
+    TkSelection.own self, func
   end
-  private :__boolval_optkeys
 
-  def __strval_optkeys
-    [
-      'text', 'label', 'show', 'data', 'file', 
-      'activebackground', 'activeforeground', 'background', 
-      'disabledforeground', 'disabledbackground', 'foreground', 
-      'highlightbackground', 'highlightcolor', 'insertbackground', 
-      'selectbackground', 'selectforeground', 'troughcolor'
-    ]
+  module_function :clear, :get
+end
+
+module TkKinput
+  include Tk
+  extend Tk
+
+  def TkKinput.start(window, style=None)
+    tk_call 'kinput_start', window.path, style
+  end
+  def kinput_start(style=None)
+    TkKinput.start(self, style)
   end
-  private :__strval_optkeys
 
-  def __listval_optkeys
-    []
+  def TkKinput.send_spot(window)
+    tk_call 'kinput_send_spot', window.path
+  end
+  def kinput_send_spot
+    TkKinput.send_spot(self)
   end
-  private :__listval_optkeys
 
-  def __numlistval_optkeys
-    []
+  def TkKinput.input_start(window, keys=nil)
+    tk_call 'kanjiInput', 'start', window.path, *hash_kv(keys)
+  end
+  def kanji_input_start(keys=nil)
+    TkKinput.input_start(self, keys)
   end
-  private :__numlistval_optkeys
 
-  def __tkvariable_optkeys
-    ['variable', 'textvariable']
+  def TkKinput.attribute_config(window, slot, value=None)
+    if slot.kind_of? Hash
+      tk_call 'kanjiInput', 'attribute', window.path, *hash_kv(slot)
+    else
+      tk_call 'kanjiInput', 'attribute', window.path, "-#{slot}", value
+    end
+  end
+  def kinput_attribute_config(slot, value=None)
+    TkKinput.attribute_config(self, slot, value)
   end
-  private :__tkvariable_optkeys
 
-  def __val2ruby_optkeys  # { key=>proc, ... }
-    # The method is used to convert a opt-value to a ruby's object.
-    # When get the value of the option "key", "proc.call(value)" is called.
-    {}
+  def TkKinput.attribute_info(window, slot=nil)
+    if slot
+      conf = tk_split_list(tk_call('kanjiInput', 'attribute', 
+				   window.path, "-#{slot}"))
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_list(tk_call('kanjiInput', 'attribute', 
+			    window.path)).collect{|conf|
+	conf[0] = conf[0][1..-1]
+	conf
+      }
+    end
+  end
+  def kinput_attribute_info(slot=nil)
+    TkKinput.attribute_info(self, slot)
   end
-  private :__val2ruby_optkeys
 
-  def __ruby2val_optkeys  # { key=>proc, ... }
-    # The method is used to convert a ruby's object to a opt-value.
-    # When set the value of the option "key", "proc.call(value)" is called.
-    # That is, "-#{key} #{proc.call(value)}".
-    {}
+  def TkKinput.input_end(window)
+    tk_call 'kanjiInput', 'end', window.path
+  end
+  def kanji_input_end
+    TkKinput.input_end(self)
   end
-  private :__ruby2val_optkeys
+end
 
-  def __methodcall_optkeys  # { key=>method, ... }
-    # The method is used to both of get and set.
-    # Usually, the 'key' will not be a widget option.
-    {}
+module TkXIM
+  include Tk
+  extend Tk
+
+  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
-  private :__methodcall_optkeys
 
-  def __keyonly_optkeys  # { def_key=>undef_key or nil, ... }
-    {}
+  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
-  private :__keyonly_optkeys
 
-  def __conv_keyonly_opts(keys)
-    return keys unless keys.kind_of?(Hash)
-    keyonly = __keyonly_optkeys
-    keys2 = {}
-    keys.each{|k, v|
-      optkey = keyonly.find{|kk,vv| kk.to_s == k.to_s}
-      if optkey
-        defkey, undefkey = optkey
-        if v
-          keys2[defkey.to_s] = None
-        elsif undefkey
-          keys2[undefkey.to_s] = None
+  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
-          # remove key
+          tk_split_list(tk_call('imconfigure', window.path)).collect{|conf|
+            conf[0] = conf[0][1..-1]
+            conf
+          }
         end
       else
-        keys2[k.to_s] = v
+        []
       end
-    }
-    keys2
+    rescue
+      []
+    end
   end
 
-  def config_hash_kv(keys, enc_mode = nil, conf = nil)
-    hash_kv(__conv_keyonly_opts(keys), enc_mode, conf)
+  def useinputmethods(value=nil)
+    TkXIM.useinputmethods(self, value)
   end
 
-  ################################
-
-  def [](id)
-    cget(id)
+  def imconfigure(window, slot, value=None)
+    TkXIM.configinfo(window, slot, value)
   end
 
-  def []=(id, val)
-    configure(id, val)
-    val
+  def imconfiginfo(slot=nil)
+    TkXIM.configinfo(window, slot)
   end
+end
 
-  def cget(slot)
-    orig_slot = slot
-    slot = slot.to_s
- 
-   if slot.length == 0
-      fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
+module TkWinfo
+  include Tk
+  extend Tk
+  def TkWinfo.atom(name)
+    number(tk_call('winfo', 'atom', name))
+  end
+  def winfo_atom(name)
+    TkWinfo.atom name
+  end
+  def TkWinfo.atomname(id)
+    tk_call 'winfo', 'atomname', id
+  end
+  def winfo_atomname(id)
+    TkWinfo.atomname id
+  end
+  def TkWinfo.cells(window)
+    number(tk_call('winfo', 'cells', window.path))
+  end
+  def winfo_cells
+    TkWinfo.cells self
+  end
+  def TkWinfo.children(window)
+    c = tk_call('winfo', 'children', window.path)
+    list(c)
+  end
+  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
+  def TkWinfo.colormapfull(window)
+     bool(tk_call('winfo', 'colormapfull', window.path))
+  end
+  def winfo_colormapfull
+    TkWinfo.colormapfull self
+  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
+  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, number)
+    number(tk_call('winfo', 'fpixels', window.path, number))
+  end
+  def winfo_fpixels(number)
+    TkWinfo.fpixels self, number
+  end
+  def TkWinfo.geometry(window)
+    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)
+  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))
+    else
+      tk_split_simplelist(tk_call('winfo', 'interps'))
+    end
+  end
+  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)
+  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)
+    window(tk_call('winfo', 'pathname', id))
+  end
+  def winfo_widget(id)
+    TkWinfo.widget id
+  end
+  def TkWinfo.pixels(window, number)
+    number(tk_call('winfo', 'pixels', window.path, number))
+  end
+  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
+  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
+  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
+      v = tk_call('winfo', 'visualsavailable', window.path, "includeids")
+    else
+      v = tk_call('winfo', 'visualsavailable', window.path)
     end
+    list(v)
+  end
+  def winfo_visualsavailable(includeids=false)
+    TkWinfo.visualsavailable self, includeids
+  end
+  def TkWinfo.vrootheight(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))
+  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
+  def winfo_pointerxy
+    TkWinfo.pointerxy self
+  end
+end
 
-    if ( method = _symbolkey2str(__val2ruby_optkeys())[slot] )
-      optval = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
-      begin
-        return method.call(optval)
-      rescue => e
-        warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-        return optval
-      end
+module TkPack
+  include Tk
+  extend Tk
+  def configure(win, *args)
+    if args[-1].kind_of?(Hash)
+      keys = args.pop
+    end
+    wins = [win.epath]
+    for i in args
+      wins.push i.epath
     end
+    tk_call "pack", 'configure', *(wins+hash_kv(keys))
+  end
 
-    if ( method = _symbolkey2str(__methodcall_optkeys)[slot] )
-      return self.__send__(method)
+  def forget(*args)
+    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
 
-    case slot
-    when /^(#{__numval_optkeys.join('|')})$/
-      begin
-        number(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
-      rescue
-        nil
-      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
+  end
 
-    when /^(#{__numstrval_optkeys.join('|')})$/
-      num_or_str(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+  def slaves(master)
+    list(tk_call('pack', 'slaves', master.epath))
+  end
 
-    when /^(#{__boolval_optkeys.join('|')})$/
-      begin
-        bool(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
-      rescue
-        nil
-      end
+  module_function :configure, :forget, :info, :propagate, :slaves
+end
 
-    when /^(#{__listval_optkeys.join('|')})$/
-      simplelist(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+module TkGrid
+  include Tk
+  extend Tk
 
-    when /^(#{__numlistval_optkeys.join('|')})$/
-      conf = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
-      if conf =~ /^[0-9+-]/
-        list(conf)
-      else
-        conf
-      end
+  def bbox(*args)
+    list(tk_call('grid', 'bbox', *args))
+  end
 
-    when /^(#{__strval_optkeys.join('|')})$/
-      _fromUTF8(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+  def configure(widget, *args)
+    if args[-1].kind_of?(Hash)
+      keys = args.pop
+    end
+    wins = [widget.epath]
+    for i in args
+      wins.push i.epath
+    end
+    tk_call "grid", 'configure', *(wins+hash_kv(keys))
+  end
 
-    when /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/
-      fontcode = $1
-      fontkey  = $2
-      fnt = tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{fontkey}")), true)
-      unless fnt.kind_of?(TkFont)
-        fnt = fontobj(fontkey)
-      end
-      if fontcode == 'kanji' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-        # obsolete; just for compatibility
-        fnt.kanji_font
-      else
-        fnt
-      end
+  def columnconfigure(master, index, args)
+    tk_call "grid", 'columnconfigure', master, index, *hash_kv(args)
+  end
 
-    when /^(#{__tkvariable_optkeys.join('|')})$/
-      v = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
-      (v.empty?)? nil: TkVarAccess.new(v)
+  def rowconfigure(master, index, args)
+    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}"
     else
-      tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{slot}")), true)
+      ilist = list(tk_call('grid', 'columnconfigure', master, index))
+      info = {}
+      while key = ilist.shift
+	info[key[1..-1]] = ilist.shift
+      end
+      info
     end
   end
 
-  def configure(slot, value=None)
-    if slot.kind_of? Hash
-      slot = _symbolkey2str(slot)
+  def rowconfiginfo(master, index, slot=nil)
+    if slot
+      tk_call 'grid', 'rowconfigure', master, index, "-#{slot}"
+    else
+      ilist = list(tk_call('grid', 'rowconfigure', master, index))
+      info = {}
+      while key = ilist.shift
+	info[key[1..-1]] = ilist.shift
+      end
+      info
+    end
+  end
 
-      __methodcall_optkeys.each{|key, method|
-        value = slot.delete(key.to_s)
-        self.__send__(method, value) if value
-      }
+  def add(widget, *args)
+    configure(widget, *args)
+  end
 
-      __ruby2val_optkeys.each{|key, method|
-        key = key.to_s
-        slot[key] = method.call(slot[key]) if slot.has_key?(key)
-      }
+  def forget(*args)
+    tk_call 'grid', 'forget', *args
+  end
 
-      __keyonly_optkeys.each{|defkey, undefkey|
-        conf = slot.find{|kk, vv| kk == defkey.to_s}
-        if conf
-          k, v = conf
-          if v
-            slot[k] = None
-          else
-            slot[undefkey.to_s] = None if undefkey
-            slot.delete(k)
-          end
-        end
-      }
+  def info(slave)
+    list(tk_call('grid', 'info', slave))
+  end
 
-      if (slot.find{|k, v| k =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/})
-        font_configure(slot)
-      elsif slot.size > 0
-        tk_call(*(__config_cmd.concat(hash_kv(slot))))
-      end
+  def location(master, x, y)
+    list(tk_call('grid', 'location', master, x, y))
+  end
 
+  def propagate(master, bool=None)
+    if bool == None
+      bool(tk_call('grid', 'propagate', master.epath))
     else
-      orig_slot = slot
-      slot = slot.to_s
-      if slot.length == 0
-        fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
-      end
-
-      if ( conf = __keyonly_optkeys.find{|k, v| k.to_s == slot} )
-        defkey, undefkey = conf
-        if value
-          tk_call(*(__config_cmd << "-#{defkey}"))
-        elsif undefkey
-          tk_call(*(__config_cmd << "-#{undefkey}"))
-        end
-      elsif ( method = _symbolkey2str(__ruby2val_optkeys)[slot] )
-        tk_call(*(__config_cmd << "-#{slot}" << method.call(value)))
-      elsif ( method = _symbolkey2str(__methodcall_optkeys)[slot] )
-        self.__send__(method, value)
-      elsif (slot =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
-        if value == None
-          fontobj($2)
-        else
-          font_configure({slot=>value})
-        end
-      else
-        tk_call(*(__config_cmd << "-#{slot}" << value))
-      end
+      tk_call('grid', 'propagate', master.epath, bool)
     end
-    self
   end
 
-  def configure_cmd(slot, value)
-    configure(slot, install_cmd(value))
+  def remove(*args)
+    tk_call 'grid', 'remove', *args
   end
 
-  def configinfo(slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot && 
-          slot.to_s =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
-        fontkey  = $2
-        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}"))))
-        conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}")), false, true)
-        conf[__configinfo_struct[:key]] = 
-          conf[__configinfo_struct[:key]][1..-1]
-        if ( ! __configinfo_struct[:alias] \
-            || conf.size > __configinfo_struct[:alias] + 1 )
-          conf[__configinfo_struct[:current_value]] = fontobj(fontkey)
-        elsif ( __configinfo_struct[:alias] \
-               && conf.size == __configinfo_struct[:alias] + 1 \
-               && conf[__configinfo_struct[:alias]][0] == ?- )
-          conf[__configinfo_struct[:alias]] = 
-            conf[__configinfo_struct[:alias]][1..-1]
-        end
-        conf
-      else
-        if slot
-          slot = slot.to_s
-          case slot
-          when /^(#{__val2ruby_optkeys().keys.join('|')})$/
-            method = _symbolkey2str(__val2ruby_optkeys())[slot]
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd() << "-#{slot}")), false, true)
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              optval = conf[__configinfo_struct[:default_value]]
-              begin
-                val = method.call(optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__configinfo_struct[:default_value]] = val
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              optval = conf[__configinfo_struct[:current_value]]
-              begin
-                val = method.call(optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__configinfo_struct[:current_value]] = val
-            end
-
-          when /^(#{__methodcall_optkeys.keys.join('|')})$/
-            method = _symbolkey2str(__methodcall_optkeys)[slot]
-            return [slot, '', '', '', self.__send__(method)]
-
-          when /^(#{__numval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]])
-              begin
-                conf[__configinfo_struct[:default_value]] = 
-                  number(conf[__configinfo_struct[:default_value]])
-              rescue
-                conf[__configinfo_struct[:default_value]] = nil
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              begin
-                conf[__configinfo_struct[:current_value]] = 
-                  number(conf[__configinfo_struct[:current_value]])
-              rescue
-                conf[__configinfo_struct[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__numstrval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]])
-              conf[__configinfo_struct[:default_value]] = 
-                num_or_str(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] = 
-                num_or_str(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__boolval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]])
-              begin
-                conf[__configinfo_struct[:default_value]] = 
-                  bool(conf[__configinfo_struct[:default_value]])
-              rescue
-                conf[__configinfo_struct[:default_value]] = nil
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              begin
-                conf[__configinfo_struct[:current_value]] = 
-                  bool(conf[__configinfo_struct[:current_value]])
-              rescue
-                conf[__configinfo_struct[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__listval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]])
-              conf[__configinfo_struct[:default_value]] = 
-                simplelist(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] = 
-                simplelist(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__numlistval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] \
-                && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:default_value]] = 
-                list(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] \
-                && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:current_value]] = 
-                list(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__strval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-          when /^(#{__tkvariable_optkeys.join('|')})$/
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]])
-              v = conf[__configinfo_struct[:default_value]]
-              if v.empty?
-                conf[__configinfo_struct[:default_value]] = nil
-              else
-                conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              v = conf[__configinfo_struct[:current_value]]
-              if v.empty?
-                conf[__configinfo_struct[:current_value]] = nil
-              else
-                conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
-              end
-            end
-
-          else
-            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
-          end
-          conf[__configinfo_struct[:key]] = 
-            conf[__configinfo_struct[:key]][1..-1]
-
-          if ( __configinfo_struct[:alias] \
-              && conf.size == __configinfo_struct[:alias] + 1 \
-              && conf[__configinfo_struct[:alias]][0] == ?- )
-            conf[__configinfo_struct[:alias]] = 
-              conf[__configinfo_struct[:alias]][1..-1]
-          end
+  def size(master)
+    tk_call 'grid', 'size', master
+  end
 
-          conf
+  def slaves(master, args)
+    list(tk_call('grid', 'slaves', master, *hash_kv(args)))
+  end
 
-        else
-          # ret = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*__confinfo_cmd))).collect{|conflist|
-          #  conf = tk_split_simplelist(conflist)
-          ret = tk_split_simplelist(tk_call_without_enc(*__confinfo_cmd), false, false).collect{|conflist|
-            conf = tk_split_simplelist(conflist, false, true)
-            conf[__configinfo_struct[:key]] = 
-              conf[__configinfo_struct[:key]][1..-1]
-
-            optkey = conf[__configinfo_struct[:key]]
-            case optkey
-            when /^(#{__val2ruby_optkeys().keys.join('|')})$/
-              method = _symbolkey2str(__val2ruby_optkeys())[optkey]
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                optval = conf[__configinfo_struct[:default_value]]
-                begin
-                  val = method.call(optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__configinfo_struct[:default_value]] = val
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                optval = conf[__configinfo_struct[:current_value]]
-                begin
-                  val = method.call(optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__configinfo_struct[:current_value]] = val
-              end
+  module_function :bbox, :forget, :propagate, :info
+  module_function :remove, :size, :slaves, :location
+  module_function :configure, :columnconfigure, :rowconfigure
+  module_function :columnconfiginfo, :rowconfiginfo
+end
 
-            when /^(#{__strval_optkeys.join('|')})$/
-              # do nothing
-
-            when /^(#{__numval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                begin
-                  conf[__configinfo_struct[:default_value]] = 
-                    number(conf[__configinfo_struct[:default_value]])
-                rescue
-                  conf[__configinfo_struct[:default_value]] = nil
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                begin
-                  conf[__configinfo_struct[:current_value]] = 
-                    number(conf[__configinfo_struct[:current_value]])
-                rescue
-                  conf[__configinfo_struct[:current_value]] = nil
-                end
-              end
+module TkPlace
+  include Tk
+  extend Tk
 
-            when /^(#{__numstrval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] = 
-                  num_or_str(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] = 
-                  num_or_str(conf[__configinfo_struct[:current_value]])
-              end
+  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
 
-            when /^(#{__boolval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                begin
-                  conf[__configinfo_struct[:default_value]] = 
-                    bool(conf[__configinfo_struct[:default_value]])
-                rescue
-                  conf[__configinfo_struct[:default_value]] = nil
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                begin
-                  conf[__configinfo_struct[:current_value]] = 
-                    bool(conf[__configinfo_struct[:current_value]])
-                rescue
-                  conf[__configinfo_struct[:current_value]] = nil
-                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
 
-            when /^(#{__listval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] = 
-                  simplelist(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] = 
-                  simplelist(conf[__configinfo_struct[:current_value]])
-              end
+  def forget(win)
+    tk_call 'place', 'forget', win
+  end
 
-            when /^(#{__numlistval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] \
-                  && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:default_value]] = 
-                  list(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] \
-                  && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:current_value]] = 
-                  list(conf[__configinfo_struct[:current_value]])
-              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
 
-            when /^(#{__tkvariable_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                v = conf[__configinfo_struct[:default_value]]
-                if v.empty?
-                  conf[__configinfo_struct[:default_value]] = nil
-                else
-                  conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                v = conf[__configinfo_struct[:current_value]]
-                if v.empty?
-                  conf[__configinfo_struct[:current_value]] = nil
-                else
-                  conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
-                end
-              end
+  def slaves(master)
+    list(tk_call('place', 'slaves', master.epath))
+  end
 
-            else
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                if conf[__configinfo_struct[:default_value]].index('{')
-                  conf[__configinfo_struct[:default_value]] = 
-                    tk_split_list(conf[__configinfo_struct[:default_value]]) 
-                else
-                  conf[__configinfo_struct[:default_value]] = 
-                    tk_tcl2ruby(conf[__configinfo_struct[:default_value]]) 
-                end
-              end
-              if conf[__configinfo_struct[:current_value]]
-                if conf[__configinfo_struct[:current_value]].index('{')
-                  conf[__configinfo_struct[:current_value]] = 
-                    tk_split_list(conf[__configinfo_struct[:current_value]]) 
-                else
-                  conf[__configinfo_struct[:current_value]] = 
-                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]]) 
-                end
-              end
-            end
+  module_function :configure, :configinfo, :forget, :info, :slaves
+end
 
-            if ( __configinfo_struct[:alias] \
-                && conf.size == __configinfo_struct[:alias] + 1 \
-                && conf[__configinfo_struct[:alias]][0] == ?- )
-              conf[__configinfo_struct[:alias]] = 
-                conf[__configinfo_struct[:alias]][1..-1]
-            end
+module TkOption
+  include Tk
+  extend Tk
+  def add pat, value, pri=None
+    tk_call 'option', 'add', pat, value, pri
+  end
+  def clear
+    tk_call 'option', 'clear'
+  end
+  def get win, name, klass
+    tk_call('option', 'get', win ,name, klass).taint
+  end
+  def readfile file, pri=None
+    tk_call 'option', 'readfile', file, pri
+  end
+  module_function :add, :clear, :get, :readfile
 
-            conf
-          }
+  # support procs on the resource database
+  @@resource_proc_class = Class.new
+  class << @@resource_proc_class
+    private :new
 
-          __font_optkeys.each{|optkey|
-            optkey = optkey.to_s
-            fontconf = ret.assoc(optkey)
-            if fontconf && fontconf.size > 2
-              ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
-              fontconf[__configinfo_struct[:current_value]] = fontobj(optkey)
-              ret.push(fontconf)
-            end
-          }
+    CARRIER    = '.'.freeze
+    METHOD_TBL = {}
+    ADD_METHOD = false
+    SAFE_MODE  = 4
 
-          __methodcall_optkeys.each{|optkey, method|
-            ret << [optkey.to_s, '', '', '', self.__send__(method)]
-          }
+    def __check_proc_string__(str)
+      # If you want to check the proc_string, do it in this method.
+      str
+    end
 
-          ret
+    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 = TkOption.get(self::CARRIER, id.id2name, '')
+        proc_str = '{' + proc_str + '}' unless /\A\{.*\}\Z/ =~ 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
 
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot && 
-          slot.to_s =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
-        fontkey  = $2
-        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}"))))
-        conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}")), false, true)
-        conf[__configinfo_struct[:key]] = 
-          conf[__configinfo_struct[:key]][1..-1]
-
-        if ( ! __configinfo_struct[:alias] \
-            || conf.size > __configinfo_struct[:alias] + 1 )
-          conf[__configinfo_struct[:current_value]] = fontobj(fontkey)
-          { conf.shift => conf }
-        elsif ( __configinfo_struct[:alias] \
-               && conf.size == __configinfo_struct[:alias] + 1 )
-          if conf[__configinfo_struct[:alias]][0] == ?-
-            conf[__configinfo_struct[:alias]] = 
-              conf[__configinfo_struct[:alias]][1..-1]
-          end
-          { conf[0] => conf[1] }
-        else
-          { conf.shift => conf }
-        end
-      else
-        if slot
-          slot = slot.to_s
-          case slot
-          when /^(#{__val2ruby_optkeys().keys.join('|')})$/
-            method = _symbolkey2str(__val2ruby_optkeys())[slot]
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              optval = conf[__configinfo_struct[:default_value]]
-              begin
-                val = method.call(optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__configinfo_struct[:default_value]] = val
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              optval = conf[__configinfo_struct[:current_value]]
-              begin
-                val = method.call(optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__configinfo_struct[:current_value]] = val
-            end
-
-          when /^(#{__methodcall_optkeys.keys.join('|')})$/
-            method = _symbolkey2str(__methodcall_optkeys)[slot]
-            return {slot => ['', '', '', self.__send__(method)]}
-
-          when /^(#{__numval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              begin
-                conf[__configinfo_struct[:default_value]] = 
-                  number(conf[__configinfo_struct[:default_value]])
-              rescue
-                conf[__configinfo_struct[:default_value]] = nil
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              begin
-                conf[__configinfo_struct[:current_value]] = 
-                  number(conf[__configinfo_struct[:current_value]])
-              rescue
-                conf[__configinfo_struct[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__numstrval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              conf[__configinfo_struct[:default_value]] = 
-                num_or_str(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] = 
-                num_or_str(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__boolval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              begin
-                conf[__configinfo_struct[:default_value]] = 
-                  bool(conf[__configinfo_struct[:default_value]])
-              rescue
-                conf[__configinfo_struct[:default_value]] = nil
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              begin
-                conf[__configinfo_struct[:current_value]] = 
-                  bool(conf[__configinfo_struct[:current_value]])
-              rescue
-                conf[__configinfo_struct[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__listval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              conf[__configinfo_struct[:default_value]] = 
-                simplelist(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] = 
-                simplelist(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__numlistval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] \
-                && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:default_value]] = 
-                list(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] \
-                && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:current_value]] = 
-                list(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__tkvariable_optkeys.join('|')})$/
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              v = conf[__configinfo_struct[:default_value]]
-              if v.empty?
-                conf[__configinfo_struct[:default_value]] = nil
-              else
-                conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              v = conf[__configinfo_struct[:current_value]]
-              if v.empty?
-                conf[__configinfo_struct[:current_value]] = nil
-              else
-                conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
-              end
-            end
-
-          when /^(#{__strval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-          else
-            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
-          end
-          conf[__configinfo_struct[:key]] = 
-            conf[__configinfo_struct[:key]][1..-1]
-
-          if ( __configinfo_struct[:alias] \
-              && conf.size == __configinfo_struct[:alias] + 1 )
-            if conf[__configinfo_struct[:alias]][0] == ?-
-              conf[__configinfo_struct[:alias]] = 
-                conf[__configinfo_struct[:alias]][1..-1]
-            end
-            { conf[0] => conf[1] }
-          else
-            { conf.shift => conf }
-          end
+    private :__check_proc_string__, :method_missing
+  end
 
-        else
-          ret = {}
-          # tk_split_simplelist(_fromUTF8(tk_call_without_enc(*__confinfo_cmd))).each{|conflist|
-          #  conf = tk_split_simplelist(conflist)
-          tk_split_simplelist(tk_call_without_enc(*__confinfo_cmd), false, false).each{|conflist|
-            conf = tk_split_simplelist(conflist, false, true)
-            conf[__configinfo_struct[:key]] = 
-              conf[__configinfo_struct[:key]][1..-1]
-
-            optkey = conf[__configinfo_struct[:key]]
-            case optkey
-            when /^(#{__val2ruby_optkeys().keys.join('|')})$/
-              method = _symbolkey2str(__val2ruby_optkeys())[optkey]
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                optval = conf[__configinfo_struct[:default_value]]
-                begin
-                  val = method.call(optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__configinfo_struct[:default_value]] = val
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                optval = conf[__configinfo_struct[:current_value]]
-                begin
-                  val = method.call(optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__configinfo_struct[:current_value]] = val
-              end
+  def new_proc_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)
 
-            when /^(#{__strval_optkeys.join('|')})$/
-              # do nothing
-
-            when /^(#{__numval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                begin
-                  conf[__configinfo_struct[:default_value]] = 
-                    number(conf[__configinfo_struct[:default_value]])
-                rescue
-                  conf[__configinfo_struct[:default_value]] = nil
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                begin
-                  conf[__configinfo_struct[:current_value]] = 
-                    number(conf[__configinfo_struct[:current_value]])
-                rescue
-                  conf[__configinfo_struct[:current_value]] = nil
-                end
-              end
+    body = <<-"EOD"
+      class #{klass} < TkOption.module_eval('@@resource_proc_class')
+        CARRIER    = '#{carrier}'.freeze
+        METHOD_TBL = {}
+        ADD_METHOD = #{add}
+        SAFE_MODE  = #{safe}
+        %w(#{func_str}).each{|f| METHOD_TBL.delete(f.intern) }
+      end
+    EOD
 
-            when /^(#{__numstrval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] = 
-                  num_or_str(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] = 
-                  num_or_str(conf[__configinfo_struct[:current_value]])
-              end
+    if parent.kind_of?(Class) && parent <= @@resource_proc_class
+      parent.class_eval body
+      eval parent.name + '::' + klass
+    else
+      eval body
+      eval 'TkOption::' + klass
+    end
+  end
+  module_function :new_proc_class
+end
 
-            when /^(#{__boolval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                begin
-                  conf[__configinfo_struct[:default_value]] = 
-                    bool(conf[__configinfo_struct[:default_value]])
-                rescue
-                  conf[__configinfo_struct[:default_value]] = nil
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                begin
-                  conf[__configinfo_struct[:current_value]] = 
-                    bool(conf[__configinfo_struct[:current_value]])
-                rescue
-                  conf[__configinfo_struct[:current_value]] = nil
-                end
-              end
+module TkTreatFont
+  def font_configinfo
+    ret = TkFont.used_on(self.path)
+    if ret == nil
+      ret = TkFont.init_widget_font(self.path, self.path, 'configure')
+    end
+    ret
+  end
+  alias fontobj font_configinfo
 
-            when /^(#{__listval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] = 
-                  simplelist(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] = 
-                  simplelist(conf[__configinfo_struct[:current_value]])
-              end
+  def font_configure(slot)
+    slot = _symbolkey2str(slot)
+    if (fnt = slot.delete('font'))
+      if fnt.kind_of? TkFont
+	return fnt.call_font_configure(self.path, self.path,'configure',slot)
+      else
+	latinfont_configure(fnt) if fnt
+      end
+    end
+    if (ltn = slot.delete('latinfont'))
+      latinfont_configure(ltn) if ltn
+    end
+    if (ltn = slot.delete('asciifont'))
+      latinfont_configure(ltn) if ltn
+    end
+    if (knj = slot.delete('kanjifont'))
+      kanjifont_configure(knj) if knj
+    end
 
-            when /^(#{__numlistval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] \
-                  && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:default_value]] = 
-                  list(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] \
-                  && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:current_value]] = 
-                  list(conf[__configinfo_struct[:current_value]])
-              end
+    tk_call(self.path, 'configure', *hash_kv(slot)) if slot != {}
+    self
+  end
 
-            when /^(#{__tkvariable_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                v = conf[__configinfo_struct[:default_value]]
-                if v.empty?
-                  conf[__configinfo_struct[:default_value]] = nil
-                else
-                  conf[__configinfo_struct[:default_value]] = TkVarAccess.new
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                v = conf[__configinfo_struct[:current_value]]
-                if v.empty?
-                  conf[__configinfo_struct[:current_value]] = nil
-                else
-                  conf[__configinfo_struct[:current_value]] = TkVarAccess.new
-                end
-              end
+  def latinfont_configure(ltn, keys=nil)
+    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_configure(conf)
+      end
+    else
+      fobj.latin_replace(ltn)
+    end
+  end
+  alias asciifont_configure latinfont_configure
 
-            else
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                if conf[__configinfo_struct[:default_value]].index('{')
-                  conf[__configinfo_struct[:default_value]] = 
-                    tk_split_list(conf[__configinfo_struct[:default_value]]) 
-                else
-                  conf[__configinfo_struct[:default_value]] = 
-                    tk_tcl2ruby(conf[__configinfo_struct[:default_value]]) 
-                end
-              end
-              if conf[__configinfo_struct[:current_value]]
-                if conf[__configinfo_struct[:current_value]].index('{')
-                  conf[__configinfo_struct[:current_value]] = 
-                    tk_split_list(conf[__configinfo_struct[:current_value]]) 
-                else
-                  conf[__configinfo_struct[:current_value]] = 
-                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]]) 
-                end
-              end
-            end
+  def kanjifont_configure(knj, keys=nil)
+    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_configure(cond)
+      end
+    else
+      fobj.kanji_replace(knj)
+    end
+  end
 
-            if ( __configinfo_struct[:alias] \
-                && conf.size == __configinfo_struct[:alias] + 1 )
-              if conf[__configinfo_struct[:alias]][0] == ?-
-                conf[__configinfo_struct[:alias]] = 
-                  conf[__configinfo_struct[:alias]][1..-1]
-              end
-              ret[conf[0]] = conf[1]
-            else
-              ret[conf.shift] = conf
-            end
-          }
+  def font_copy(window, tag=nil)
+    if tag
+      window.tagfontobj(tag).configinfo.each{|key,value|
+	fontobj.configure(key,value)
+      }
+      fontobj.replace(window.tagfontobj(tag).latin_font, 
+		      window.tagfontobj(tag).kanji_font)
+    else
+      window.fontobj.configinfo.each{|key,value|
+	fontobj.configure(key,value)
+      }
+      fontobj.replace(window.fontobj.latin_font, window.fontobj.kanji_font)
+    end
+  end
 
-          __font_optkeys.each{|optkey|
-            optkey = optkey.to_s
-            fontconf = ret[optkey]
-            if fontconf.kind_of?(Array)
-              ret.delete(optkey)
-              ret.delete('latin' << optkey)
-              ret.delete('ascii' << optkey)
-              ret.delete('kanji' << optkey)
-              fontconf[__configinfo_struct[:current_value]] = fontobj(optkey)
-              ret[optkey] = fontconf
-            end
-          }
+  def latinfont_copy(window, tag=nil)
+    if tag
+      fontobj.latin_replace(window.tagfontobj(tag).latin_font)
+    else
+      fontobj.latin_replace(window.fontobj.latin_font)
+    end
+  end
+  alias asciifont_copy latinfont_copy
 
-          __methodcall_optkeys.each{|optkey, method|
-            ret[optkey.to_s] = ['', '', '', self.__send__(method)]
-          }
+  def kanjifont_copy(window, tag=nil)
+    if tag
+      fontobj.kanji_replace(window.tagfontobj(tag).kanji_font)
+    else
+      fontobj.kanji_replace(window.fontobj.kanji_font)
+    end
+  end
+end
 
-          ret
-        end
+module TkTreatItemFont
+  def __conf_cmd(idx)
+    raise NotImplementError, "need to define `__conf_cmd'"
+  end
+  def __item_pathname(tagOrId)
+    raise NotImplementError, "need to define `__item_pathname'"
+  end
+  private :__conf_cmd, :__item_pathname
+
+  def tagfont_configinfo(tagOrId)
+    pathname = __item_pathname(tagOrId)
+    ret = TkFont.used_on(pathname)
+    if ret == nil
+      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 (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
+	latintagfont_configure(tagOrId, fnt) if fnt
       end
     end
+    if (ltn = slot.delete('latinfont'))
+      latintagfont_configure(tagOrId, ltn) if ltn
+    end
+    if (ltn = slot.delete('asciifont'))
+      latintagfont_configure(tagOrId, ltn) if ltn
+    end
+    if (knj = slot.delete('kanjifont'))
+      kanjitagfont_configure(tagOrId, knj) if knj
+    end
+
+    tk_call(self.path, __conf_cmd(0), __conf_cmd(1), 
+	    tagOrId, *hash_kv(slot)) if slot != {}
+    self
   end
 
-  def current_configinfo(slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        org_slot = slot
-        begin
-          conf = configinfo(slot)
-          if ( ! __configinfo_struct[:alias] \
-              || conf.size > __configinfo_struct[:alias] + 1 )
-            return {conf[0] => conf[-1]}
-          end
-          slot = conf[__configinfo_struct[:alias]]
-        end while(org_slot != slot)
-        fail RuntimeError, 
-          "there is a configure alias loop about '#{org_slot}'"
+  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
-        ret = {}
-        configinfo().each{|conf|
-          if ( ! __configinfo_struct[:alias] \
-              || conf.size > __configinfo_struct[:alias] + 1 )
-            ret[conf[0]] = conf[-1]
-          end
-        }
-        ret
+	fobj.latin_configure(conf)
       end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      configinfo(slot).each{|key, conf| 
-        ret[key] = conf[-1] if conf.kind_of?(Array)
+    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)
       }
-      ret
+      tagfontobj(tagOrId).replace(window.tagfontobj(wintag).latin_font, 
+				window.tagfontobj(wintag).kanji_font)
+    else
+      window.tagfont(wintag).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 TkObject<TkKernel
-  extend  TkCore
   include Tk
-  include TkConfigMethod
+  include TkTreatFont
   include TkBindCore
 
-### --> definition is moved to TkUtil module
-#  def path
-#    @path
-#  end
+  def path
+    return @path
+  end
 
   def epath
-    @path
+    return @path
   end
 
   def to_eval
@@ -3874,742 +2436,1346 @@ class TkObject<TkKernel
   end
 
   def tk_send(cmd, *rest)
-    tk_call(path, cmd, *rest)
-  end
-  def tk_send_without_enc(cmd, *rest)
-    tk_call_without_enc(path, cmd, *rest)
-  end
-  def tk_send_with_enc(cmd, *rest)
-    tk_call_with_enc(path, cmd, *rest)
-  end
-  # private :tk_send, :tk_send_without_enc, :tk_send_with_enc
-
-  def tk_send_to_list(cmd, *rest)
-    tk_call_to_list(path, cmd, *rest)
-  end
-  def tk_send_to_list_without_enc(cmd, *rest)
-    tk_call_to_list_without_enc(path, cmd, *rest)
-  end
-  def tk_send_to_list_with_enc(cmd, *rest)
-    tk_call_to_list_with_enc(path, cmd, *rest)
-  end
-  def tk_send_to_simplelist(cmd, *rest)
-    tk_call_to_simplelist(path, cmd, *rest)
-  end
-  def tk_send_to_simplelist_without_enc(cmd, *rest)
-    tk_call_to_simplelist_without_enc(path, cmd, *rest)
-  end
-  def tk_send_to_simplelist_with_enc(cmd, *rest)
-    tk_call_to_simplelist_with_enc(path, cmd, *rest)
+    tk_call path, cmd, *rest
   end
+  private :tk_send
 
   def method_missing(id, *args)
     name = id.id2name
     case args.length
     when 1
-      if name[-1] == ?=
-        configure name[0..-2], args[0]
-        args[0]
-      else
-        configure name, args[0]
-        self
-      end
+      configure name, args[0]
     when 0
       begin
-        cget(name)
+	cget name
       rescue
-        super(id, *args)
-#        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
-      super(id, *args)
-#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
+      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
     end
   end
 
-=begin
   def [](id)
-    cget(id)
+    cget id
   end
 
   def []=(id, val)
-    configure(id, val)
-    val
+    configure id, val
+  end
+
+  def cget(slot)
+    case slot.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      tk_call path, 'cget', "-#{slot}"
+    else
+      tk_tcl2ruby tk_call(path, 'cget', "-#{slot}")
+    end
+  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)
+      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 value == None
+	  fontobj
+	else
+	  font_configure({slot=>value})
+	end
+      else
+	tk_call path, 'configure', "-#{slot}", value
+      end
+    end
+  end
+
+  def configure_cmd(slot, value)
+    configure slot, install_cmd(value)
+  end
+
+  def configinfo(slot = nil)
+    if slot == 'font' || slot == :font || 
+       slot == 'kanjifont' || 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[0] = conf[0][1..-1]
+	conf
+      else
+	ret = tk_split_simplelist(tk_send('configure') ).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
+	}
+	fontconf = ret.assoc('font')
+	if fontconf
+	  ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
+	  fontconf[4] = fontobj
+	  ret.push(fontconf)
+	else
+	  ret
+	end
+      end
+    end
   end
-=end
 
   def event_generate(context, keys=nil)
-    if context.kind_of?(TkEvent::Event)
-      context.generate(self, ((keys)? keys: {}))
-    elsif keys
-      #tk_call('event', 'generate', path, 
-      #       "<#{tk_event_sequence(context)}>", *hash_kv(keys))
-      tk_call_without_enc('event', 'generate', path, 
-                          "<#{tk_event_sequence(context)}>", 
-                          *hash_kv(keys, true))
+    if keys
+      tk_call('event', 'generate', path, 
+	      "<#{tk_event_sequence(context)}>", *hash_kv(keys))
     else
-      #tk_call('event', 'generate', path, "<#{tk_event_sequence(context)}>")
-      tk_call_without_enc('event', 'generate', path, 
-                          "<#{tk_event_sequence(context)}>")
+      tk_call('event', 'generate', path, "<#{tk_event_sequence(context)}>")
     end
   end
 
   def tk_trace_variable(v)
-    #unless v.kind_of?(TkVariable)
-    #  fail(ArgumentError, "type error (#{v.class}); must be TkVariable object")
-    #end
+    unless v.kind_of?(TkVariable)
+      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
 
-  TkCommandNames = [].freeze
-  ## ==> If TkCommandNames[0] is a string (not a null string), 
-  ##     assume the string is a Tcl/Tk's create command of the widget class. 
-  WidgetClassName = ''.freeze
-  # WidgetClassNames[WidgetClassName] = self  
-  ## ==> If self is a widget class, entry to the WidgetClassNames table.
-  def self.to_eval
-    self::WidgetClassName
-  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
+      create_self
       if keys
-        # tk_call @path, 'configure', *hash_kv(keys)
-        configure(keys)
+	# tk_call @path, 'configure', *hash_kv(keys)
+	configure(keys)
       end
     else
       p 'create_self has args' if $DEBUG
       fontkeys = {}
-      methodkeys = {}
       if keys
-        #['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
-        #  fontkeys[key] = keys.delete(key) if keys.key?(key)
-        #}
-        __font_optkeys.each{|key|
-          fkey = key.to_s
-          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-          fkey = "kanji#{key}"
-          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-          fkey = "latin#{key}"
-          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-          fkey = "ascii#{key}"
-          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-        }
-
-        __methodcall_optkeys.each{|key|
-          key = key.to_s
-          methodkeys[key] = keys.delete(key) if keys.key?(key)
-        }
-
-        __ruby2val_optkeys.each{|key, method|
-          key = key.to_s
-          keys[key] = method.call(keys[key]) if keys.has_key?(key)
-        }
-      end
-      if without_creating && keys
-        #configure(keys)
-        configure(__conv_keyonly_opts(keys))
-      else
-        #create_self(keys)
-        create_self(__conv_keyonly_opts(keys))
+	['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
+	  fontkeys[key] = keys.delete(key) if keys.key?(key)
+	}
       end
+      create_self(keys)
       font_configure(fontkeys) unless fontkeys.empty?
-      configure(methodkeys) unless methodkeys.empty?
     end
   end
 
-  def create_self(keys)
-    # may need to override
-    begin
-      cmd = self.class::TkCommandNames[0]
-      fail unless (cmd.kind_of?(String) && cmd.length > 0)
-    rescue
-      fail RuntimeError, "class #{self.class} may be an abstract class"
+  def create_self
+  end
+  private :create_self
+
+  def pack(keys = nil)
+    tk_call 'pack', epath, *hash_kv(keys)
+    self
+  end
+
+  def unpack
+    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
 
-    if keys and keys != None
-      tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
+  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
-      tk_call_without_enc(cmd, @path)
+      bool(tk_call('pack', 'propagate', epath))
     end
   end
-  private :create_self
 
-  def exist?
-    TkWinfo.exist?(self)
+  def pack_slaves()
+    list(tk_call('pack', 'slaves', epath))
   end
 
-  def bind_class
-    @db_class || self.class()
+  def grid(keys = nil)
+    tk_call 'grid', epath, *hash_kv(keys)
+    self
   end
 
-  def database_classname
-    TkWinfo.classname(self)
+  def ungrid
+    tk_call 'grid', 'forget', epath
+    self
   end
-  def database_class
-    name = database_classname()
-    if WidgetClassNames[name]
-      WidgetClassNames[name]
+  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
-      TkDatabaseClass.new(name)
+      tk_call 'grid', 'configure', epath, "-#{slot}", value
     end
   end
-  def self.database_classname
-    self::WidgetClassName
+
+  def grid_columnconfig(index, keys)
+    tk_call('grid', 'columnconfigure', epath, index, *hash_kv(keys))
   end
-  def self.database_class
-    WidgetClassNames[self::WidgetClassName]
+
+  def grid_rowconfig(index, keys)
+    tk_call('grid', 'rowconfigure', epath, index, *hash_kv(keys))
   end
 
-  def pack(keys = nil)
-    #tk_call_without_enc('pack', epath, *hash_kv(keys, true))
-    if keys
-      TkPack.configure(self, keys)
+  def grid_columnconfiginfo(index, slot=nil)
+    if slot
+      tk_call('grid', 'columnconfigure', epath, index, "-#{slot}")
     else
-      TkPack.configure(self)
+      ilist = list(tk_call('grid', 'columnconfigure', epath, index))
+      info = {}
+      while key = ilist.shift
+	info[key[1..-1]] = ilist.shift
+      end
+      info
     end
-    self
   end
 
-  def pack_in(target, keys = nil)
-    if keys
-      keys = keys.dup
-      keys['in'] = target
+  def grid_rowconfiginfo(index, slot=nil)
+    if slot
+      tk_call('grid', 'rowconfigure', epath, index, "-#{slot}")
+    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
-      keys = {'in'=>target}
+      bool(tk_call('grid', 'propagate', epath))
     end
-    #tk_call 'pack', epath, *hash_kv(keys)
-    TkPack.configure(self, keys)
+  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 pack_forget
-    #tk_call_without_enc('pack', 'forget', epath)
-    TkPack.forget(self)
+  def unplace
+    tk_call 'place', 'forget', epath
     self
   end
-  alias unpack pack_forget
+  alias place_forget unplace
 
-  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
+  def place_config(slot, value=None)
     if slot.kind_of? Hash
-      TkPack.configure(self, slot)
+      tk_call 'place', 'configure', epath, *hash_kv(slot)
     else
-      TkPack.configure(self, slot=>value)
+      tk_call 'place', 'configure', epath, "-#{slot}", value
     end
   end
-  alias pack_configure pack_config
 
-  def pack_info()
-    #ilist = list(tk_call('pack', 'info', epath))
-    #info = {}
-    #while key = ilist.shift
-    #  info[key[1..-1]] = ilist.shift
-    #end
-    #return info
-    TkPack.info(self)
-  end
-
-  def pack_propagate(mode=None)
-    #if mode == None
-    #  bool(tk_call('pack', 'propagate', epath))
-    #else
-    #  tk_call('pack', 'propagate', epath, mode)
-    #  self
-    #end
-    if mode == None
-      TkPack.propagate(self)
-    else
-      TkPack.propagate(self, mode)
-      self
+  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
   end
 
-  def pack_slaves()
-    #list(tk_call('pack', 'slaves', epath))
-    TkPack.slaves(self)
+  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 grid(keys = nil)
-    #tk_call 'grid', epath, *hash_kv(keys)
-    if keys
-      TkGrid.configure(self, keys)
+  def place_slaves()
+    list(tk_call('place', 'slaves', epath))
+  end
+
+  def focus(force=false)
+    if force
+      tk_call 'focus', '-force', path
     else
-      TkGrid.configure(self)
+      tk_call 'focus', path
     end
     self
   end
 
-  def grid_in(target, keys = nil)
-    if keys
-      keys = keys.dup
-      keys['in'] = target
+  def grab(*args)
+    if !args or args.length == 0
+      tk_call 'grab', 'set', path
+    elsif args.length == 1
+      case args[0]
+      when 'global', :global
+	return(tk_call('grab', 'set', '-global', path))
+      when 'release', :release
+	return tk_call('grab', 'release', path)
+      else
+	val = tk_call('grab', args[0], path)
+      end
+      case args[0]
+      when 'current', :current
+	return window(val)
+      when 'status', :status
+	return val
+      end
     else
-      keys = {'in'=>target}
+      fail ArgumentError, 'wrong # of args'
     end
-    #tk_call 'grid', epath, *hash_kv(keys)
-    TkGrid.configure(self, keys)
+  end
+
+  def lower(below=None)
+    tk_call 'lower', epath, below
+    self
+  end
+  def raise(above=None)
+    tk_call 'raise', epath, above
     self
   end
 
-  def grid_forget
-    #tk_call('grid', 'forget', epath)
-    TkGrid.forget(self)
+  def command(cmd=Proc.new)
+    configure_cmd 'command', cmd
+  end
+
+  def colormodel model=None
+    tk_call 'tk', 'colormodel', path, model
     self
   end
-  alias ungrid grid_forget
 
-  def grid_bbox(*args)
-    #list(tk_call('grid', 'bbox', epath, *args))
-    TkGrid.bbox(self, *args)
+  def destroy
+    super
+    tk_call 'destroy', epath
+    if @cmdtbl
+      for id in @cmdtbl
+	uninstall_cmd id
+      end
+    end
+    uninstall_win
   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
-    if slot.kind_of? Hash
-      TkGrid.configure(self, slot)
+  def wait_visibility
+    tk_call 'tkwait', 'visibility', path
+  end
+  alias wait wait_visibility
+
+  def wait_destroy
+    tk_call 'tkwait', 'window', epath
+  end
+
+  def bindtags(taglist=nil)
+    if taglist
+      fail ArgumentError unless taglist.kind_of? Array
+      tk_call('bindtags', path, taglist)
     else
-      TkGrid.configure(self, slot=>value)
+      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
+	else
+	  tag
+	end
+      }
     end
   end
-  alias grid_configure grid_config
+end
 
-  def grid_columnconfig(index, keys)
-    #tk_call('grid', 'columnconfigure', epath, index, *hash_kv(keys))
-    TkGrid.columnconfigure(self, index, keys)
+class TkRoot<TkWindow
+  include Wm
+  ROOT = []
+  def TkRoot.new
+    return ROOT[0] if ROOT[0]
+    new = super
+    ROOT[0] = new
+    Tk_WINDOWS["."] = new
   end
-  alias grid_columnconfigure grid_columnconfig
 
-  def grid_rowconfig(index, keys)
-    #tk_call('grid', 'rowconfigure', epath, index, *hash_kv(keys))
-    TkGrid.rowconfigure(self, index, keys)
+  WidgetClassName = 'Tk'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
   end
-  alias grid_rowconfigure grid_rowconfig
 
-  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
-    TkGrid.columnconfiginfo(self, index, slot)
+  def create_self
+    @path = '.'
+  end
+  def path
+    "."
   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
-    TkGrid.rowconfiginfo(self, index, slot)
+class TkToplevel<TkWindow
+  include Wm
+
+  WidgetClassName = 'Toplevel'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
   end
 
-  def grid_info()
-    #list(tk_call('grid', 'info', epath))
-    TkGrid.info(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 initialize(parent=nil, screen=nil, classname=nil, keys=nil)
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      @screen    = keys['screen']
+      @classname = keys['class']
+      @colormap  = keys['colormap']
+      @container = keys['container']
+      @screen    = keys['screen']
+      @use       = keys['use']
+      @visual    = keys['visual']
+      super(keys)
+      return
+    end
+    if screen.kind_of? Hash
+      keys = _symbolkey2str(screen)
+    else
+      @screen = screen
+    end
+    @classname = classname
+    if keys.kind_of? Hash
+      keys = _symbolkey2str(keys)
+      if keys.key?(:classname) || 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']
+    end
+    super(parent, keys)
   end
 
-  def grid_location(x, y)
-    #list(tk_call('grid', 'location', epath, x, y))
-    TkGrid.location(self, x, y)
-  end
-
-  def grid_propagate(mode=None)
-    #if mode == None
-    #  bool(tk_call('grid', 'propagate', epath))
-    #else
-    #  tk_call('grid', 'propagate', epath, mode)
-    #  self
-    #end
-    if mode == None
-      TkGrid.propagate(self)
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'toplevel', @path, *hash_kv(keys)
     else
-      TkGrid.propagate(self, mode)
-      self
+      tk_call 'toplevel', @path
     end
   end
 
-  def grid_remove()
-    #tk_call 'grid', 'remove', epath
-    TkGrid.remove(self)
-    self
+  def specific_class
+    @classname
   end
+end
 
-  def grid_size()
-    #list(tk_call('grid', 'size', epath))
-    TkGrid.size(self)
+class TkFrame<TkWindow
+  WidgetClassName = 'Frame'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
   end
 
-  def grid_slaves(args)
-    #list(tk_call('grid', 'slaves', epath, *hash_kv(args)))
-    TkGrid.slaves(self, args)
+################# 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
+#################
+
+  def initialize(parent=nil, keys=nil)
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+    else
+      if keys
+        keys = _symbolkey2str(keys)
+        keys['parent'] = parent
+      else
+        keys = {'parent'=>parent}
+      end
+    end
+    if keys.key?('classname')
+       keys['class'] = keys.delete('classname')
+    end
+    @classname = keys['class']
+    @colormap  = keys['colormap']
+    @container = keys['container']
+    @visual    = keys['visual']
+    super(keys)
   end
 
-  def place(keys)
-    #tk_call 'place', epath, *hash_kv(keys)
-    TkPlace.configure(self, keys)
-    self
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'frame', @path, *hash_kv(keys)
+    else
+      tk_call 'frame', @path
+    end
   end
+end
 
-  def place_in(target, keys = nil)
-    if keys
-      keys = keys.dup
-      keys['in'] = target
+class TkLabel<TkWindow
+  WidgetClassName = 'Label'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
+  end
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'label', @path, *hash_kv(keys)
     else
-      keys = {'in'=>target}
+      tk_call 'label', @path
     end
-    #tk_call 'place', epath, *hash_kv(keys)
-    TkPlace.configure(self, keys)
-    self
   end
+  def textvariable(v)
+    configure 'textvariable', tk_trace_variable(v)
+  end
+end
 
-  def  place_forget
-    #tk_call 'place', 'forget', epath
-    TkPlace.forget(self)
-    self
+class TkButton<TkLabel
+  WidgetClassNames['Button'] = self
+  def TkButton.to_eval
+    'Button'
+  end
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'button', @path, *hash_kv(keys)
+    else
+      tk_call 'button', @path
+    end
   end
-  alias unplace place_forget
+  def invoke
+    tk_send 'invoke'
+  end
+  def flash
+    tk_send 'flash'
+  end
+end
 
-  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
-    #end
-    TkPlace.configure(self, slot, value)
+class TkRadioButton<TkButton
+  WidgetClassNames['Radiobutton'] = self
+  def TkRadioButton.to_eval
+    'Radiobutton'
+  end
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'radiobutton', @path, *hash_kv(keys)
+    else
+      tk_call 'radiobutton', @path
+    end
+  end
+  def deselect
+    tk_send 'deselect'
   end
-  alias place_configure place_config
+  def select
+    tk_send 'select'
+  end
+  def variable(v)
+    configure 'variable', tk_trace_variable(v)
+  end
+end
+TkRadiobutton = TkRadioButton
 
-  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
-    TkPlace.configinfo(self, slot)
+class TkCheckButton<TkRadioButton
+  WidgetClassNames['Checkbutton'] = self
+  def TkCheckButton.to_eval
+    'Checkbutton'
+  end
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'checkbutton', @path, *hash_kv(keys)
+    else
+      tk_call 'checkbutton', @path
+    end
+  end
+  def toggle
+    tk_send 'toggle'
   end
+end
+TkCheckbutton = TkCheckButton
 
-  def place_info()
-    #ilist = list(tk_call('place', 'info', epath))
-    #info = {}
-    #while key = ilist.shift
-    #  info[key[1..-1]] = ilist.shift
-    #end
-    #return info
-    TkPlace.info(self)
+class TkMessage<TkLabel
+  WidgetClassNames['Message'] = self
+  def TkMessage.to_eval
+    'Message'
   end
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'message', @path, *hash_kv(keys)
+    else
+      tk_call 'message', @path
+    end
+  end
+end
 
-  def place_slaves()
-    #list(tk_call('place', 'slaves', epath))
-    TkPlace.slaves(self)
+class TkScale<TkWindow
+  WidgetClassName = 'Scale'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
   end
 
-  def set_focus(force=false)
-    if force
-      tk_call_without_enc('focus', '-force', path)
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'scale', @path, *hash_kv(keys)
     else
-      tk_call_without_enc('focus', path)
+      tk_call 'scale', @path
     end
-    self
   end
-  alias focus set_focus
-
-  def grab(opt = nil)
-    unless opt
-      tk_call_without_enc('grab', 'set', path)
-      return self
-    end
-
-    case opt
-    when 'set', :set
-      tk_call_without_enc('grab', 'set', path)
-      return self
-    when 'global', :global
-      #return(tk_call('grab', 'set', '-global', path))
-      tk_call_without_enc('grab', 'set', '-global', path)
-      return self
-    when 'release', :release
-      #return tk_call('grab', 'release', path)
-      tk_call_without_enc('grab', 'release', path)
-      return self
-    when 'current', :current
-      return window(tk_call_without_enc('grab', 'current', path))
-    when 'status', :status
-      return tk_call_without_enc('grab', 'status', path)
+
+  def get(x=None, y=None)
+    number(tk_send('get', x, y))
+  end
+
+  def coords(val=None)
+    tk_split_list(tk_send('coords', val))
+  end
+
+  def identify(x, y)
+    tk_send('identify', x, y)
+  end
+
+  def set(val)
+    tk_send "set", val
+  end
+
+  def value
+    get
+  end
+
+  def value= (val)
+    set val
+  end
+end
+
+class TkScrollbar<TkWindow
+  WidgetClassName = 'Scrollbar'.freeze
+  WidgetClassNames[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
-      return tk_call_without_enc('grab', opt, path)
+      tk_call 'scrollbar', @path
     end
   end
 
-  def grab_current
-    grab('current')
+  def delta(deltax=None, deltay=None)
+    number(tk_send('delta', deltax, deltay))
   end
-  alias current_grab grab_current
-  def grab_release
-    grab('release')
+
+  def fraction(x=None, y=None)
+    number(tk_send('fraction', x, y))
   end
-  alias release_grab grab_release
-  def grab_set
-    grab('set')
+
+  def identify(x, y)
+    tk_send('identify', x, y)
   end
-  alias set_grab grab_set
-  def grab_set_global
-    grab('global')
+
+  def get
+    ary1 = tk_send('get').split
+    ary2 = []
+    for i in ary1
+      ary2.push number(i)
+    end
+    ary2
   end
-  alias set_global_grab grab_set_global
-  def grab_status
-    grab('status')
+
+  def set(first, last)
+    tk_send "set", first, last
   end
 
-  def lower(below=None)
-    # below = below.epath if below.kind_of?(TkObject)
-    below = _epath(below)
-    tk_call 'lower', epath, below
-    self
+  def activate(element=None)
+    tk_send('activate', element)
   end
-  alias lower_window lower
-  def raise(above=None)
-    #above = above.epath if above.kind_of?(TkObject)
-    above = _epath(above)
-    tk_call 'raise', epath, above
-    self
+end
+
+class TkTextWin<TkWindow
+  def create_self
+    fail TypeError, "TkTextWin is abstract class"
+  end
+
+  def bbox(index)
+    tk_send 'bbox', index
+  end
+  def delete(first, last=None)
+    tk_send 'delete', first, last
+  end
+  def get(*index)
+    tk_send 'get', *index
+  end
+  def index(index)
+    tk_send 'index', index
   end
-  alias raise_window raise
+  def insert(index, chars, *args)
+    tk_send 'insert', index, chars, *args
+  end
+  def scan_mark(x, y)
+    tk_send 'scan', 'mark', x, y
+  end
+  def scan_dragto(x, y)
+    tk_send 'scan', 'dragto', x, y
+  end
+  def see(index)
+    tk_send 'see', index
+  end
+end
+
+module TkTreatListItemFont
+  include TkTreatItemFont
 
-  def command(cmd=nil, &b)
-    if cmd
-      configure_cmd('command', cmd)
-    elsif b
-      configure_cmd('command', Proc.new(&b))
+  ItemCMD = ['itemconfigure', TkComm::None]
+  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
+
+  WidgetClassNames['Listbox'] = self
+  def TkListbox.to_eval
+    'Listbox'
+  end
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'listbox', @path, *hash_kv(keys)
     else
-      cget('command')
+      tk_call 'listbox', @path
     end
   end
 
-  def colormodel(model=None)
-    tk_call('tk', 'colormodel', path, model)
-    self
+  def activate(y)
+    tk_send 'activate', y
+  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
+    tk_send('size').to_i
+  end
+  def selection_anchor(index)
+    tk_send 'selection', 'anchor', index
+  end
+  def selection_clear(first, last=None)
+    tk_send 'selection', 'clear', first, last
+  end
+  def selection_includes(index)
+    bool(tk_send('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send 'selection', 'set', first, last
   end
 
-  def caret(keys=nil)
-    TkXIM.caret(path, keys)
+  def itemcget(index, key)
+    case key.to_s
+    when 'text', 'label', 'show'
+      tk_send 'itemcget', index, "-#{key}"
+    else
+      tk_tcl2ruby tk_send('itemcget', index, "-#{key}")
+    end
   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
 
-  def destroy
-    super
-    children = []
-    rexp = /^#{self.path}\.[^.]+$/
-    TkCore::INTERP.tk_windows.each{|path, obj|
-      children << [path, obj] if path =~ rexp
-    }
-    if defined?(@cmdtbl)
-      for id in @cmdtbl
-        uninstall_cmd id
+    else
+      if (key == 'font' || key == :font || 
+          key == 'kanjifont' || key == :kanjifont || 
+	  key == 'latinfont' || key == :latinfont || 
+          key == 'asciifont' || key == :asciifont )
+	tagfont_configure(index, {key=>val})
+      else
+	tk_call 'itemconfigure', index, "-#{key}", val
       end
     end
+  end
 
-    children.each{|path, obj|
-      if defined?(@cmdtbl)
-        for id in @cmdtbl
-          uninstall_cmd id
-        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}"))
+      else
+	conf = tk_split_list(tk_send('itemconfigure',index,"-#{key}"))
+      end
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      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
+      }
+    end
+  end
+end
+
+module TkTreatMenuEntryFont
+  include TkTreatItemFont
+
+  ItemCMD = ['entryconfigure', TkComm::None]
+  def __conf_cmd(idx)
+    ItemCMD[idx]
+  end
+  
+  def __item_pathname(tagOrId)
+    self.path + ';' + tagOrId.to_s
+  end
+end
+
+class TkMenu<TkWindow
+  include TkTreatMenuEntryFont
+
+  WidgetClassName = 'Menu'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def self.to_eval
+    WidgetClassName
+  end
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'menu', @path, *hash_kv(keys)
+    else
+      tk_call 'menu', @path
+    end
+  end
+  def activate(index)
+    tk_send 'activate', index
+  end
+  def add(type, keys=nil)
+    tk_send 'add', type, *hash_kv(keys)
+  end
+  def index(index)
+    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)
+  end
+  def delete(index, last=None)
+    tk_send 'delete', index, last
+  end
+  def popup(x, y, index=None)
+    tk_call 'tk_popup', path, x, y, index
+  end
+  def post(x, y)
+    tk_send 'post', x, y
+  end
+  def postcascade(index)
+    tk_send 'postcascade', index
+  end
+  def postcommand(cmd=Proc.new)
+    configure_cmd 'postcommand', cmd
+  end
+  def tearoffcommand(cmd=Proc.new)
+    configure_cmd 'tearoffcommand', cmd
+  end
+  def menutype(index)
+    tk_send 'type', index
+  end
+  def unpost
+    tk_send 'unpost'
+  end
+  def yposition(index)
+    number(tk_send('yposition', index))
+  end
+  def entrycget(index, key)
+    case key.to_s
+    when 'text', 'label', 'show'
+      tk_send 'entrycget', index, "-#{key}"
+    else
+      tk_tcl2ruby tk_send('entrycget', index, "-#{key}")
+    end
+  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))
+      else
+	tk_send 'entryconfigure', index, *hash_kv(key)
       end
-      TkCore::INTERP.tk_windows.delete(path)
-    }
 
-    begin
-      tk_call_without_enc('destroy', epath)
-    rescue
+    else
+      if (key == 'font' || key == :font || 
+          key == 'kanjifont' || key == :kanjifont || 
+	  key == 'latinfont' || key == :latinfont || 
+          key == 'asciifont' || key == :asciifont )
+	tagfont_configure({key=>val})
+      else
+	tk_call 'entryconfigure', index, "-#{key}", val
+      end
     end
-    uninstall_win
   end
 
-  def wait_visibility(on_thread = true)
-    if $SAFE >= 4
-      fail SecurityError, "can't wait visibility at $SAFE >= 4"
+  def entryconfiginfo(index, key=nil)
+    if key
+      case key.to_s
+      when 'text', 'label', 'show'
+	conf = tk_split_simplelist(tk_send('entryconfigure',index,"-#{key}"))
+      else
+	conf = tk_split_list(tk_send('entryconfigure',index,"-#{key}"))
+      end
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_simplelist(tk_send('entryconfigure', 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
+      }
     end
-    on_thread &= (Thread.list.size != 1)
-    if on_thread
-      INTERP._thread_tkwait('visibility', path)
-    else
-      INTERP._invoke('tkwait', 'visibility', path)
+  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
-  def eventloop_wait_visibility
-    wait_visibility(false)
+end
+
+module TkSystemMenu
+  def initialize(parent, keys=nil)
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+    end
+    fail unless parent.kind_of? TkMenu
+    @path = format("%s.%s", parent.path, self.type::SYSMENU_NAME)
+    TkComm::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
-  def thread_wait_visibility
-    wait_visibility(true)
+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
+  WidgetClassNames['Menubutton'] = self
+  def TkMenubutton.to_eval
+    'Menubutton'
   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
-    on_thread &= (Thread.list.size != 1)
-    if on_thread
-      INTERP._thread_tkwait('window', epath)
+  def create_self(keys)
+    if keys and keys != None
+      tk_call 'menubutton', @path, *hash_kv(keys)
     else
-      INTERP._invoke('tkwait', 'window', epath)
+      tk_call 'menubutton', @path
     end
   end
-  alias wait_window wait_destroy
-  def eventloop_wait_destroy
-    wait_destroy(false)
+end
+
+class TkOptionMenubutton<TkMenubutton
+  class OptionMenu<TkMenu
+    def initialize(parent)
+      @path = parent.path + '.menu'
+      TkComm::Tk_WINDOWS[@path] = self
+    end
   end
-  alias eventloop_wait_window eventloop_wait_destroy
-  def thread_wait_destroy
-    wait_destroy(true)
+
+  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 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(self)
+    tk_call 'tk_optionMenu', @path, @variable.id, firstval, *vals
   end
-  alias thread_wait_window thread_wait_destroy
 
-  alias tkwait_destroy wait_destroy
-  alias tkwait_window wait_destroy
+  def value
+    @variable.value
+  end
 
-  alias eventloop_tkwait_destroy eventloop_wait_destroy
-  alias eventloop_tkwait_window eventloop_wait_destroy
+  def activate(index)
+    @menu.activate(index)
+  end
+  def add(value)
+    @menu.add('radiobutton', 'variable'=>@variable, 
+	      'label'=>value, 'value'=>value)
+  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)
+  end
+  def delete(index, last=None)
+    @menu.delete(index, last)
+  end
+  def yposition(index)
+    @menu.yposition(index)
+  end
+  def menucget(index, key)
+    @menu.cget(index, key)
+  end
+  def menuconfigure(index, key, val=None)
+    @menu.configure(index, key, val)
+  end
+  def menuconfiginfo(index, key=nil)
+    @menu.configinfo(index, key)
+  end
+  def entrycget(index, key)
+    @menu.entrycget(index, key)
+  end
+  def entryconfigure(index, key, val=None)
+    @menu.entryconfigure(index, key, val)
+  end
+  def entryconfiginfo(index, key=nil)
+    @menu.entryconfiginfo(index, key)
+  end
+end
 
-  alias thread_tkwait_destroy thread_wait_destroy
-  alias thread_tkwait_window thread_wait_destroy
+module TkComposite
+  include Tk
+  extend Tk
 
-  def bindtags(taglist=nil)
-    if taglist
-      fail ArgumentError, "taglist must be Array" unless taglist.kind_of? Array
-      tk_call('bindtags', path, taglist)
-      taglist
+  def initialize(parent=nil, *args)
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      parent = keys['parent']
+      keys['parent'] = @frame = TkFrame.new(parent)
+      @path = @epath = @frame.path
+      initialize_composite(keys)
     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
-        else
-          tag
-        end
-      }
+      @frame = TkFrame.new(parent)
+      @path = @epath = @frame.path
+      initialize_composite(*args)
     end
   end
 
-  def bindtags=(taglist)
-    bindtags(taglist)
-    taglist
+  def epath
+    @epath
   end
 
-  def bindtags_shift
-    taglist = bindtags
-    tag = taglist.shift
-    bindtags(taglist)
-    tag
+  def initialize_composite(*args) end
+  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)
+      end
+    else
+      @delegates[option] = wins
+    end
   end
 
-  def bindtags_unshift(tag)
-    bindtags(bindtags().unshift(tag))
+  def configure(slot, value=None)
+    if slot.kind_of? Hash
+      slot.each{|slot,value| configure slot, value}
+    else
+      if @delegates and @delegates[slot]
+	for i in @delegates[slot]
+	  if not i
+	    i = @delegates['DEFALUT']
+	    redo
+	  else
+	    last = i.configure(slot, value)
+	  end
+	end
+	last
+      else
+	super
+      end
+    end
   end
 end
 
+module TkClipboard
+  include Tk
+  extend Tk
 
-# freeze core modules
-#TclTkLib.freeze
-#TclTkIp.freeze
-#TkUtil.freeze
-#TkKernel.freeze
-#TkComm.freeze
-#TkComm::Event.freeze
-#TkCore.freeze
-#Tk.freeze
+  def clear
+    tk_call 'clipboard', 'clear'
+  end
+  def get
+    begin
+      tk_call 'selection', 'get', '-selection', 'CLIPBOARD'
+    rescue
+      ''
+    end
+  end
+  def set(data)
+    clear
+    append(data)
+  end
+  def append(data)
+    tk_call 'clipboard', 'append', data
+  end
 
-module Tk
-  RELEASE_DATE = '2006-07-14'.freeze
-
-  autoload :AUTO_PATH,        'tk/variable'
-  autoload :TCL_PACKAGE_PATH, 'tk/variable'
-  autoload :PACKAGE_PATH,     'tk/variable'
-  autoload :TCL_LIBRARY_PATH, 'tk/variable'
-  autoload :LIBRARY_PATH,     'tk/variable'
-  autoload :TCL_PRECISION,    'tk/variable'
+  module_function :clear, :set, :get, :append
 end
 
-# call setup script for Tk extension libraries (base configuration)
-begin
-  require 'tkextlib/setup.rb'
-rescue LoadError
-  # ignore
-end
+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 :TkWarning, 'tkdialog'
+autoload :TkMenubar, 'tkmenubar'
+autoload :TkAfter, 'tkafter'
+autoload :TkPalette, 'tkpalette'
+autoload :TkFont, 'tkfont'
+autoload :TkVirtualEvent, 'tkvirtevent'
+autoload :TkBgError, 'tkbgerror'
+autoload :TkManageFocus, 'tkmngfocus'
+autoload :TkPalette, 'tkpalette'
+autoload :TkWinDDE, 'tkwinpkg'
+autoload :TkWinRegistry, 'tkwinpkg'
+autoload :TkMacResource, 'tkmacpkg'
diff --git a/ext/tk/lib/tk/after.rb b/ext/tk/lib/tk/after.rb
deleted file mode 100644
index 24a048ee32..0000000000
--- a/ext/tk/lib/tk/after.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-#   tk/after.rb : methods for Tcl/Tk after command
-#
-#   $Id: after.rb,v 1.1.2.1 2004/05/01 16:09:49 nagai Exp $
-#
-require 'tk/timer'
diff --git a/ext/tk/lib/tk/autoload.rb b/ext/tk/lib/tk/autoload.rb
deleted file mode 100644
index 6b3773f4ea..0000000000
--- a/ext/tk/lib/tk/autoload.rb
+++ /dev/null
@@ -1,196 +0,0 @@
-#
-#  autoload
-#
-
-#######################
-#  geometry manager
-autoload :TkGrid,             'tk/grid'
-def TkGrid(*args); TkGrid.configure(*args); end
-
-autoload :TkPack,             'tk/pack'
-def TkPack(*args); TkPack.configure(*args); end
-
-autoload :TkPlace,            'tk/place'
-def TkPlace(*args); TkPlace.configure(*args); end
-
-
-#######################
-# others
-autoload :TkBgError,          'tk/bgerror'
-
-autoload :TkBindTag,          'tk/bindtag'
-autoload :TkBindTagAll,       'tk/bindtag'
-autoload :TkDatabaseClass,    'tk/bindtag'
-
-autoload :TkButton,           'tk/button'
-
-autoload :TkConsole,          'tk/console'
-
-autoload :TkCanvas,           'tk/canvas'
-
-autoload :TkcTagAccess,       'tk/canvastag'
-autoload :TkcTag,             'tk/canvastag'
-autoload :TkcTagString,       'tk/canvastag'
-autoload :TkcNamedTag,        'tk/canvastag'
-autoload :TkcTagAll,          'tk/canvastag'
-autoload :TkcTagCurrent,      'tk/canvastag'
-autoload :TkcTagGroup,        'tk/canvastag'
-
-autoload :TkCheckButton,      'tk/checkbutton'
-autoload :TkCheckbutton,      'tk/checkbutton'
-
-autoload :TkClipboard,        'tk/clipboard'
-
-autoload :TkComposite,        'tk/composite'
-
-autoload :TkConsole,          'tk/console'
-
-autoload :TkDialog,           'tk/dialog'
-autoload :TkDialog2,          'tk/dialog'
-autoload :TkDialogObj,        'tk/dialog'
-autoload :TkWarning,          'tk/dialog'
-autoload :TkWarning2,         'tk/dialog'
-autoload :TkWarningObj,       'tk/dialog'
-
-autoload :TkEntry,            'tk/entry'
-
-autoload :TkEvent,            'tk/event'
-
-autoload :TkFont,             'tk/font'
-autoload :TkTreatTagFont,     'tk/font'
-
-autoload :TkFrame,            'tk/frame'
-
-autoload :TkImage,            'tk/image'
-autoload :TkBitmapImage,      'tk/image'
-autoload :TkPhotoImage,       'tk/image'
-
-autoload :TkItemConfigMethod, 'tk/itemconfig'
-
-autoload :TkTreatItemFont,    'tk/itemfont'
-
-autoload :TkKinput,           'tk/kinput'
-
-autoload :TkLabel,            'tk/label'
-
-autoload :TkLabelFrame,       'tk/labelframe'
-autoload :TkLabelframe,       'tk/labelframe'
-
-autoload :TkListbox,          'tk/listbox'
-
-autoload :TkMacResource,      'tk/macpkg'
-
-autoload :TkMenu,             'tk/menu'
-autoload :TkMenuClone,        'tk/menu'
-autoload :TkSystemMenu,       'tk/menu'
-autoload :TkSysMenu_Help,     'tk/menu'
-autoload :TkSysMenu_System,   'tk/menu'
-autoload :TkSysMenu_Apple,    'tk/menu'
-autoload :TkMenubutton,       'tk/menu'
-autoload :TkOptionMenubutton, 'tk/menu'
-
-autoload :TkMenubar,          'tk/menubar'
-
-autoload :TkMenuSpec,         'tk/menuspec'
-
-autoload :TkMessage,          'tk/message'
-
-autoload :TkManageFocus,      'tk/mngfocus'
-
-autoload :TkMsgCatalog,       'tk/msgcat'
-autoload :TkMsgCat,           'tk/msgcat'
-
-autoload :TkNamespace,        'tk/namespace'
-
-autoload :TkOptionDB,         'tk/optiondb'
-autoload :TkOption,           'tk/optiondb'
-autoload :TkResourceDB,       'tk/optiondb'
-
-autoload :TkPackage,          'tk/package'
-
-autoload :TkPalette,          'tk/palette'
-
-autoload :TkPanedWindow,      'tk/panedwindow'
-autoload :TkPanedwindow,      'tk/panedwindow'
-
-autoload :TkRadioButton,      'tk/radiobutton'
-autoload :TkRadiobutton,      'tk/radiobutton'
-
-autoload :TkRoot,             'tk/root'
-
-autoload :TkScale,            'tk/scale'
-
-autoload :TkScrollbar,        'tk/scrollbar'
-autoload :TkXScrollbar,       'tk/scrollbar'
-autoload :TkYScrollbar,       'tk/scrollbar'
-
-autoload :TkScrollbox,        'tk/scrollbox'
-
-autoload :TkSelection,        'tk/selection'
-
-autoload :TkSpinbox,          'tk/spinbox'
-
-autoload :TkTreatTagFont,     'tk/tagfont'
-
-autoload :TkText,             'tk/text'
-
-autoload :TkTextImage,        'tk/textimage'
-
-autoload :TkTextMark,         'tk/textmark'
-autoload :TkTextNamedMark,    'tk/textmark'
-autoload :TkTextMarkInsert,   'tk/textmark'
-autoload :TkTextMarkCurrent,  'tk/textmark'
-autoload :TkTextMarkAnchor,   'tk/textmark'
-
-autoload :TkTextTag,          'tk/texttag'
-autoload :TkTextNamedTag,     'tk/texttag'
-autoload :TkTextTagSel,       'tk/texttag'
-
-autoload :TkTextWindow,       'tk/textwindow'
-
-autoload :TkAfter,            'tk/timer'
-autoload :TkTimer,            'tk/timer'
-autoload :TkRTTimer,          'tk/timer'
-
-autoload :TkToplevel,         'tk/toplevel'
-
-autoload :TkTextWin,          'tk/txtwin_abst'
-
-autoload :TkValidation,       'tk/validation'
-
-autoload :TkVariable,         'tk/variable'
-autoload :TkVarAccess,        'tk/variable'
-
-autoload :TkVirtualEvent,     'tk/virtevent'
-autoload :TkNamedVirtualEvent,'tk/virtevent'
-
-autoload :TkWinfo,            'tk/winfo'
-
-autoload :TkWinDDE,           'tk/winpkg'
-autoload :TkWinRegistry,      'tk/winpkg'
-
-autoload :TkXIM,              'tk/xim'
-
-
-#######################
-# sub-module of Tk
-module Tk
-  autoload :Clock,            'tk/clock'
-  autoload :OptionObj,        'tk/optionobj'
-  autoload :X_Scrollable,     'tk/scrollable'
-  autoload :Y_Scrollable,     'tk/scrollable'
-  autoload :Scrollable,       'tk/scrollable'
-  autoload :Wm,               'tk/wm'
-
-  autoload :ValidateConfigure,     'tk/validation'
-  autoload :ItemValidateConfigure, 'tk/validation'
-
-  autoload :EncodedString,    'tk/encodedstr'
-  def Tk.EncodedString(str, enc = nil); Tk::EncodedString.new(str, enc); end
-
-  autoload :BinaryString,     'tk/encodedstr'
-  def Tk.BinaryString(str); Tk::BinaryString.new(str); end
-
-  autoload :UTF8_String,      'tk/encodedstr'
-  def Tk.UTF8_String(str); Tk::UTF8_String.new(str); end
-end
diff --git a/ext/tk/lib/tk/bgerror.rb b/ext/tk/lib/tk/bgerror.rb
deleted file mode 100644
index c82a8e046b..0000000000
--- a/ext/tk/lib/tk/bgerror.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#  tkbgerror -- bgerror ( tkerror ) module
-#                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-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
-end
diff --git a/ext/tk/lib/tk/bindtag.rb b/ext/tk/lib/tk/bindtag.rb
deleted file mode 100644
index 9023a08e06..0000000000
--- a/ext/tk/lib/tk/bindtag.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# tk/bind.rb : control event binding
-#
-require 'tk'
-
-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.instance_eval{
-      BTagID_TBL.delete @id
-      @id = name
-      BTagID_TBL[@id] = self
-      bind(*args, &b) if args != []
-      self
-    }
-  end
-
-  def initialize(*args, &b)
-    # @id = Tk_BINDTAG_ID.join('')
-    @id = Tk_BINDTAG_ID.join(TkCore::INTERP._ip_id_)
-    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
-    #Kernel.format "#<TkBindTag: %s>", @id
-    '#<TkBindTag: ' + @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
-    #Kernel.format "#<TkDatabaseClass: %s>", @id
-    '#<TkDatabaseClass: ' + @id + '>'
-  end
-end
diff --git a/ext/tk/lib/tk/button.rb b/ext/tk/lib/tk/button.rb
deleted file mode 100644
index 407a47c400..0000000000
--- a/ext/tk/lib/tk/button.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# tk/button.rb : treat button widget
-#
-require 'tk'
-require 'tk/label'
-
-class TkButton<TkLabel
-  TkCommandNames = ['button'.freeze].freeze
-  WidgetClassName = 'Button'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('button', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('button', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def invoke
-    _fromUTF8(tk_send_without_enc('invoke'))
-  end
-  def flash
-    tk_send_without_enc('flash')
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/canvas.rb b/ext/tk/lib/tk/canvas.rb
deleted file mode 100644
index 0f55bff4ed..0000000000
--- a/ext/tk/lib/tk/canvas.rb
+++ /dev/null
@@ -1,759 +0,0 @@
-#
-#               tk/canvas.rb - Tk canvas classes
-#                       $Date: 2005/10/24 00:07:00 $
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-#
-require 'tk'
-require 'tk/canvastag'
-require 'tk/itemconfig'
-require 'tk/scrollable'
-
-module TkCanvasItemConfig
-  include TkItemConfigMethod
-
-  def __item_strval_optkeys(id)
-    # maybe need to override
-    super(id) + [
-      'fill', 'activefill', 'disabledfill', 
-      'outline', 'activeoutline', 'disabledoutline'
-    ]
-  end
-  private :__item_strval_optkeys
-
-  def __item_methodcall_optkeys(id)
-    {'coords'=>'coords'}
-  end
-  private :__item_methodcall_optkeys
-
-  def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
-    super(id).update('window'=>proc{|i, v| window(v)})
-  end
-  private :__item_val2ruby_optkeys
-
-  def __item_pathname(tagOrId)
-    if tagOrId.kind_of?(TkcItem) || tagOrId.kind_of?(TkcTag)
-      self.path + ';' + tagOrId.id.to_s
-    else
-      self.path + ';' + tagOrId.to_s
-    end
-  end
-  private :__item_pathname
-end
-
-class TkCanvas<TkWindow
-  include TkCanvasItemConfig
-  include Scrollable
-
-  TkCommandNames = ['canvas'.freeze].freeze
-  WidgetClassName = 'Canvas'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  def __destroy_hook__
-    TkcItem::CItemID_TBL.delete(@path)
-  end
-
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('canvas', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('canvas', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def __numval_optkeys
-    super() + ['closeenough']
-  end
-  private :__numval_optkeys
-
-  def __boolval_optkeys
-    super() + ['confine']
-  end
-  private :__boolval_optkeys
-
-  def tagid(tag)
-    if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
-      tag.id
-    else
-      tag  # maybe an Array of configure paramters
-    end
-  end
-  private :tagid
-
-
-  # create a canvas item without creating a TkcItem object
-  def create(type, *args)
-    type.create(self, *args)
-  end
-
-
-  def addtag(tag, mode, *args)
-    mode = mode.to_s
-    if args[0] && mode =~ /^(above|below|with(tag)?)$/
-      args[0] = tagid(args[0])
-    end
-    tk_send_without_enc('addtag', tagid(tag), mode, *args)
-    self
-  end
-  def addtag_above(tagOrId, target)
-    addtag(tagOrId, 'above', tagid(target))
-  end
-  def addtag_all(tagOrId)
-    addtag(tagOrId, 'all')
-  end
-  def addtag_below(tagOrId, target)
-    addtag(tagOrId, 'below', tagid(target))
-  end
-  def addtag_closest(tagOrId, x, y, halo=None, start=None)
-    addtag(tagOrId, 'closest', x, y, halo, start)
-  end
-  def addtag_enclosed(tagOrId, x1, y1, x2, y2)
-    addtag(tagOrId, 'enclosed', x1, y1, x2, y2)
-  end
-  def addtag_overlapping(tagOrId, x1, y1, x2, y2)
-    addtag(tagOrId, 'overlapping', x1, y1, x2, y2)
-  end
-  def addtag_withtag(tagOrId, tag)
-    addtag(tagOrId, 'withtag', tagid(tag))
-  end
-
-  def bbox(tagOrId, *tags)
-    list(tk_send_without_enc('bbox', tagid(tagOrId), 
-                             *tags.collect{|t| tagid(t)}))
-  end
-
-  #def itembind(tag, context, cmd=Proc.new, *args)
-  #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
-  #  self
-  #end
-  def itembind(tag, context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([path, "bind", tagid(tag)], context, cmd, *args)
-    self
-  end
-
-  #def itembind_append(tag, context, cmd=Proc.new, *args)
-  #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-  #  self
-  #end
-  def itembind_append(tag, context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-    self
-  end
-
-  def itembind_remove(tag, context)
-    _bind_remove([path, "bind", tagid(tag)], context)
-    self
-  end
-
-  def itembindinfo(tag, context=nil)
-    _bindinfo([path, "bind", tagid(tag)], context)
-  end
-
-  def canvasx(screen_x, *args)
-    #tk_tcl2ruby(tk_send_without_enc('canvasx', screen_x, *args))
-    number(tk_send_without_enc('canvasx', screen_x, *args))
-  end
-  def canvasy(screen_y, *args)
-    #tk_tcl2ruby(tk_send_without_enc('canvasy', screen_y, *args))
-    number(tk_send_without_enc('canvasy', screen_y, *args))
-  end
-
-  def coords(tag, *args)
-    if args == []
-      tk_split_list(tk_send_without_enc('coords', tagid(tag)))
-    else
-      tk_send_without_enc('coords', tagid(tag), *(args.flatten))
-      self
-    end
-  end
-
-  def dchars(tag, first, last=None)
-    tk_send_without_enc('dchars', tagid(tag), 
-                        _get_eval_enc_str(first), _get_eval_enc_str(last))
-    self
-  end
-
-  def delete(*args)
-    if TkcItem::CItemID_TBL[self.path]
-      args.each{|tag|
-        find('withtag', tag).each{|item|
-          if item.kind_of?(TkcItem)
-            TkcItem::CItemID_TBL[self.path].delete(item.id)
-          end
-        }
-      }
-    end
-    tk_send_without_enc('delete', *args.collect{|t| tagid(t)})
-    self
-  end
-  alias remove delete
-
-  def dtag(tag, tag_to_del=None)
-    tk_send_without_enc('dtag', tagid(tag), tagid(tag_to_del))
-    self
-  end
-  alias deltag dtag
-
-  def find(mode, *args)
-    list(tk_send_without_enc('find', mode, *args)).collect!{|id| 
-      TkcItem.id2obj(self, id)
-    }
-  end
-  def find_above(target)
-    find('above', tagid(target))
-  end
-  def find_all
-    find('all')
-  end
-  def find_below(target)
-    find('below', tagid(target))
-  end
-  def find_closest(x, y, halo=None, start=None)
-    find('closest', x, y, halo, start)
-  end
-  def find_enclosed(x1, y1, x2, y2)
-    find('enclosed', x1, y1, x2, y2)
-  end
-  def find_overlapping(x1, y1, x2, y2)
-    find('overlapping', x1, y1, x2, y2)
-  end
-  def find_withtag(tag)
-    find('withtag', tag)
-  end
-
-  def itemfocus(tagOrId=nil)
-    if tagOrId
-      tk_send_without_enc('focus', tagid(tagOrId))
-      self
-    else
-      ret = tk_send_without_enc('focus')
-      if ret == ""
-        nil
-      else
-        TkcItem.id2obj(self, ret)
-      end
-    end
-  end
-
-  def gettags(tagOrId)
-    list(tk_send_without_enc('gettags', tagid(tagOrId))).collect{|tag|
-      TkcTag.id2obj(self, tag)
-    }
-  end
-
-  def icursor(tagOrId, index)
-    tk_send_without_enc('icursor', tagid(tagOrId), index)
-    self
-  end
-
-  def index(tagOrId, idx)
-    number(tk_send_without_enc('index', tagid(tagOrId), idx))
-  end
-
-  def insert(tagOrId, index, string)
-    tk_send_without_enc('insert', tagid(tagOrId), index, 
-                        _get_eval_enc_str(string))
-    self
-  end
-
-=begin
-  def itemcget(tagOrId, option)
-    case option.to_s
-    when 'dash', 'activedash', 'disableddash'
-      conf = tk_send_without_enc('itemcget', tagid(tagOrId), "-#{option}")
-      if conf =~ /^[0-9]/
-        list(conf)
-      else
-        conf
-      end
-    when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
-      _fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId), "-#{option}"))
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('itemcget', tagid(tagOrId), "-#{option}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_with_enc('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(_fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId), 
-                                                "-#{option}")))
-    end
-  end
-
-  def itemconfigure(tagOrId, key, value=None)
-    if key.kind_of? Hash
-      key = _symbolkey2str(key)
-      coords = key.delete('coords')
-      self.coords(tagOrId, coords) if coords
-
-      if ( key['font'] || key['kanjifont'] \
-          || key['latinfont'] || key['asciifont'] )
-        tagfont_configure(tagid(tagOrId), key.dup)
-      else
-        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), 
-                                      *hash_kv(key, true)))
-      end
-
-    else
-      if ( key == 'coords' || key == :coords )
-        self.coords(tagOrId, value)
-      elsif ( 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
-      else
-        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), 
-                                      "-#{key}", _get_eval_enc_str(value)))
-      end
-    end
-    self
-  end
-#  def itemconfigure(tagOrId, key, value=None)
-#    if key.kind_of? Hash
-#      tk_send 'itemconfigure', tagid(tagOrId), *hash_kv(key)
-#    else
-#      tk_send 'itemconfigure', tagid(tagOrId), "-#{key}", value
-#    end
-#  end
-#  def itemconfigure(tagOrId, keys)
-#    tk_send 'itemconfigure', tagid(tagOrId), *hash_kv(keys)
-#  end
-
-  def itemconfiginfo(tagOrId, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'coords'
-          return ['coords', '', '', '', self.coords(tagOrId)]
-        when 'dash', 'activedash', 'disableddash'
-          conf = tk_split_simplelist(tk_send_without_enc('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(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),"-#{key}")))
-          conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId)))).collect{|conflist|
-          conf = tk_split_simplelist(conflist)
-          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[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          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)
-        end
-
-        ret << ['coords', '', '', '', self.coords(tagOrId)]
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'coords'
-          {'coords' => ['', '', '', self.coords(tagOrId)]}
-        when 'dash', 'activedash', 'disableddash'
-          conf = tk_split_simplelist(tk_send_without_enc('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(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),"-#{key}")))
-          conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId)))).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
-          when 'dash', 'activedash', 'disableddash'
-            if conf[2] && conf[2] =~ /^[0-9]/
-              conf[2] = list(conf[2])
-            end
-            if conf[3] && conf[3] =~ /^[0-9]/
-              conf[3] = list(conf[3])
-            end
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
-              else
-                conf[2] = tk_tcl2ruby(conf[2]) 
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
-              else
-                conf[3] = tk_tcl2ruby(conf[3]) 
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-
-        fontconf = ret['font']
-        if fontconf
-          ret.delete('font')
-          ret.delete('kanjifont')
-          fontconf[3] = tagfont_configinfo(tagid(tagOrId), fontconf[3])
-          ret['font'] = fontconf
-        end
-
-        ret['coords'] = ['', '', '', self.coords(tagOrId)]
-
-        ret
-      end
-    end
-  end
-
-  def current_itemconfiginfo(tagOrId, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = itemconfiginfo(tagOrId, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        itemconfiginfo(tagOrId).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      itemconfiginfo(tagOrId, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-=end
-
-  def lower(tag, below=nil)
-    if below
-      tk_send_without_enc('lower', tagid(tag), tagid(below))
-    else
-      tk_send_without_enc('lower', tagid(tag))
-    end
-    self
-  end
-
-  def move(tag, x, y)
-    tk_send_without_enc('move', tagid(tag), x, y)
-    self
-  end
-
-  def postscript(keys)
-    tk_send("postscript", *hash_kv(keys))
-  end
-
-  def raise(tag, above=nil)
-    if above
-      tk_send_without_enc('raise', tagid(tag), tagid(above))
-    else
-      tk_send_without_enc('raise', tagid(tag))
-    end
-    self
-  end
-
-  def scale(tag, x, y, xs, ys)
-    tk_send_without_enc('scale', tagid(tag), x, y, xs, ys)
-    self
-  end
-
-  def scan_mark(x, y)
-    tk_send_without_enc('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y)
-    tk_send_without_enc('scan', 'dragto', x, y)
-    self
-  end
-
-  def select(mode, *args)
-    r = tk_send_without_enc('select', mode, *args)
-    (mode == 'item')? TkcItem.id2obj(self, r): self
-  end
-  def select_adjust(tagOrId, index)
-    select('adjust', tagid(tagOrId), index)
-  end
-  def select_clear
-    select('clear')
-  end
-  def select_from(tagOrId, index)
-    select('from', tagid(tagOrId), index)
-  end
-  def select_item
-    select('item')
-  end
-  def select_to(tagOrId, index)
-    select('to', tagid(tagOrId), index)
-  end
-
-  def itemtype(tag)
-    TkcItem.type2class(tk_send('type', tagid(tag)))
-  end
-end
-
-class TkcItem<TkObject
-  extend Tk
-  include TkcTagAccess
-  extend TkItemFontOptkeys
-  extend TkItemConfigOptkeys
-
-  CItemTypeName = nil
-  CItemTypeToClass = {}
-  CItemID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{ CItemID_TBL.clear }
-
-  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
-  end
-
-  ########################################
-  def self._parse_create_args(args)
-    fontkeys = {}
-    methodkeys = {}
-    if args[-1].kind_of? Hash
-      keys = _symbolkey2str(args.pop)
-      if args.size == 0
-        args = keys.delete('coords')
-        unless args.kind_of?(Array)
-          fail "coords parameter must be given by an Array"
-        end
-      end
-
-      #['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
-      #  fontkeys[key] = keys.delete(key) if keys.key?(key)
-      #}
-      __item_font_optkeys(nil).each{|key|
-        fkey = key.to_s
-        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-        fkey = "kanji#{key}"
-        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-        fkey = "latin#{key}"
-        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-        fkey = "ascii#{key}"
-        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-      }
-
-      __item_methodcall_optkeys(nil).each{|key|
-        key = key.to_s
-        methodkeys[key] = keys.delete(key) if keys.key?(key)
-      }
-
-      __item_ruby2val_optkeys(nil).each{|key, method|
-        key = key.to_s
-        keys[key] = method.call(keys[key]) if keys.has_key?(key)
-      }
-
-      #args = args.flatten.concat(hash_kv(keys))
-      args = args.flatten.concat(itemconfig_hash_kv(nil, keys))
-    else
-      args = args.flatten
-    end
-
-    [args, fontkeys]
-  end
-  private_class_method :_parse_create_args
-
-  def self.create(canvas, *args)
-    unless self::CItemTypeName
-      fail RuntimeError, "#{self} is an abstract class"
-    end
-    args, fontkeys = _parse_create_args(args)
-    idnum = tk_call_without_enc(canvas.path, 'create', 
-                                self::CItemTypeName, *args)
-    canvas.itemconfigure(idnum, fontkeys) unless fontkeys.empty?
-    idnum.to_i  # 'canvas item id' is an integer number
-  end
-  ########################################
-
-  def initialize(parent, *args)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @parent = @c = parent
-    @path = parent.path
-
-    @id = create_self(*args) # an integer number as 'canvas item id'
-    CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
-    CItemID_TBL[@path][@id] = self
-  end
-  def create_self(*args)
-    self.class.create(@c, *args) # return an integer number as 'canvas item id'
-  end
-  private :create_self
-
-  def id
-    @id
-  end
-
-  def exist?
-    if @c.find_withtag(@id)
-      true
-    else
-      false
-    end
-  end
-
-  def delete
-    @c.delete @id
-    CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
-    self
-  end
-  alias remove  delete
-  alias destroy delete
-end
-
-class TkcArc<TkcItem
-  CItemTypeName = 'arc'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcBitmap<TkcItem
-  CItemTypeName = 'bitmap'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcImage<TkcItem
-  CItemTypeName = 'image'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcLine<TkcItem
-  CItemTypeName = 'line'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcOval<TkcItem
-  CItemTypeName = 'oval'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcPolygon<TkcItem
-  CItemTypeName = 'polygon'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcRectangle<TkcItem
-  CItemTypeName = 'rectangle'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcText<TkcItem
-  CItemTypeName = 'text'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-  def self.create(canvas, *args)
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-      txt = keys['text']
-      keys['text'] = _get_eval_enc_str(txt) if txt
-      args.push(keys)
-    end
-    super(canvas, *args)
-  end
-end
-
-class TkcWindow<TkcItem
-  CItemTypeName = 'window'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-  def self.create(canvas, *args)
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-      win = keys['window']
-      # keys['window'] = win.epath if win.kind_of?(TkWindow)
-      keys['window'] = _epath(win) if win
-      args.push(keys)
-    end
-    super(canvas, *args)
-  end
-end
diff --git a/ext/tk/lib/tk/canvastag.rb b/ext/tk/lib/tk/canvastag.rb
deleted file mode 100644
index a5650ee68b..0000000000
--- a/ext/tk/lib/tk/canvastag.rb
+++ /dev/null
@@ -1,375 +0,0 @@
-#
-# tk/canvastag.rb - methods for treating canvas tags
-#
-require 'tk'
-require 'tk/tagfont'
-
-module TkcTagAccess
-  include TkComm
-  include TkTreatTagFont
-end
-
-require 'tk/canvas'
-
-module TkcTagAccess
-  def addtag(tag)
-    @c.addtag(tag, 'withtag', @id)
-    self
-  end
-
-  def bbox
-    @c.bbox(@id)
-  end
-
-  #def bind(seq, cmd=Proc.new, *args)
-  #  @c.itembind(@id, seq, cmd, *args)
-  #  self
-  #end
-  def bind(seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    @c.itembind(@id, seq, cmd, *args)
-    self
-  end
-
-  #def bind_append(seq, cmd=Proc.new, *args)
-  #  @c.itembind_append(@id, seq, cmd, *args)
-  #  self
-  #end
-  def bind_append(seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    @c.itembind_append(@id, seq, cmd, *args)
-    self
-  end
-
-  def bind_remove(seq)
-    @c.itembind_remove(@id, seq)
-    self
-  end
-
-  def bindinfo(seq=nil)
-    @c.itembindinfo(@id, seq)
-  end
-
-  def cget(option)
-    @c.itemcget(@id, option)
-  end
-
-  def configure(key, value=None)
-    @c.itemconfigure(@id, key, value)
-    self
-  end
-#  def configure(keys)
-#    @c.itemconfigure @id, keys
-#  end
-
-  def configinfo(key=nil)
-    @c.itemconfiginfo(@id, key)
-  end
-
-  def current_configinfo(key=nil)
-    @c.current_itemconfiginfo(@id, key)
-  end
-
-  def coords(*args)
-    @c.coords(@id, *args)
-  end
-
-  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
-  alias deltag dtag
-
-  def find
-    @c.find('withtag', @id)
-  end
-  alias list find
-
-  def focus
-    @c.itemfocus(@id)
-  end
-
-  def gettags
-    @c.gettags(@id)
-  end
-
-  def icursor(index)
-    @c.icursor(@id, index)
-    self
-  end
-
-  def index(idx)
-    @c.index(@id, idx)
-  end
-
-  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
-
-  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
-  end
-
-  def initialize(parent, mode=nil, *args)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @c = parent
-    @cpath = parent.path
-    # @path = @id = Tk_CanvasTag_ID.join('')
-    @path = @id = Tk_CanvasTag_ID.join(TkCore::INTERP._ip_id_)
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
-    Tk_CanvasTag_ID[1].succ!
-    if mode
-      tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
-    end
-  end
-  def id
-    @id
-  end
-
-  def exist?
-    if @c.find_withtag(@id)
-      true
-    else
-      false
-    end
-  end
-
-  def delete
-    @c.delete @id
-    CTagID_TBL[@cpath].delete(@id) if CTagID_TBL[@cpath]
-    self
-  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
-  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)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #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_without_enc(@c.path, "addtag", @id, mode, *args)
-    end
-  end
-end
-TkcNamedTag = TkcTagString
-
-class TkcTagAll<TkcTag
-  def initialize(parent)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @c = parent
-    @cpath = parent.path
-    @path = @id = 'all'
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
-  end
-end
-
-class TkcTagCurrent<TkcTag
-  def initialize(parent)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @c = parent
-    @cpath = parent.path
-    @path = @id = 'current'
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
-  end
-end
-
-class TkcGroup<TkcTag
-  Tk_cGroup_ID = ['tkcg'.freeze, '00000'.taint].freeze
-  #def create_self(parent, *args)
-  def initialize(parent, *args)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @c = parent
-    @cpath = parent.path
-    # @path = @id = Tk_cGroup_ID.join('')
-    @path = @id = Tk_cGroup_ID.join(TkCore::INTERP._ip_id_)
-    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-    CTagID_TBL[@cpath][@id] = self
-    Tk_cGroup_ID[1].succ!
-    include(*args) if args != []
-  end
-  #private :create_self
-  
-  def include(*tags)
-    for i in tags
-      #i.addtag(@id)
-      @c.addtag_withtag(@id, i)
-    end
-    self
-  end
-  alias add include
-
-  def exclude(*tags)
-    for i in tags
-      #i.dtag(@id)
-      @c.dtag(i, @id)
-    end
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/checkbutton.rb b/ext/tk/lib/tk/checkbutton.rb
deleted file mode 100644
index d76d99c0f2..0000000000
--- a/ext/tk/lib/tk/checkbutton.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# tk/checkbutton.rb : treat checkbutton widget
-#
-require 'tk'
-require 'tk/radiobutton'
-
-class TkCheckButton<TkRadioButton
-  TkCommandNames = ['checkbutton'.freeze].freeze
-  WidgetClassName = 'Checkbutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('checkbutton', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('checkbutton', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def toggle
-    tk_send_without_enc('toggle')
-    self
-  end
-end
-TkCheckbutton = TkCheckButton
diff --git a/ext/tk/lib/tk/clipboard.rb b/ext/tk/lib/tk/clipboard.rb
deleted file mode 100644
index d4205a5c28..0000000000
--- a/ext/tk/lib/tk/clipboard.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# tk/clipboard.rb : methods to treat clipboard
-#
-require 'tk'
-
-module TkClipboard
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['clipboard'.freeze].freeze
-
-  def self.clear(win=nil)
-    if win
-      tk_call_without_enc('clipboard', 'clear', '-displayof', win)
-    else
-      tk_call_without_enc('clipboard', 'clear')
-    end
-  end
-  def self.clear_on_display(win)
-    tk_call_without_enc('clipboard', 'clear', '-displayof', win)
-  end
-
-  def self.get(type=nil)
-    if type
-      tk_call_without_enc('clipboard', 'get', '-type', type)
-    else
-      tk_call_without_enc('clipboard', 'get')
-    end
-  end
-  def self.get_on_display(win, type=nil)
-    if type
-      tk_call_without_enc('clipboard', 'get', '-displayof', win, '-type', type)
-    else
-      tk_call_without_enc('clipboard', 'get', '-displayof', win)
-    end
-  end
-
-  def self.set(data, keys=nil)
-    clear
-    append(data, keys)
-  end
-  def self.set_on_display(win, data, keys=nil)
-    clear(win)
-    append_on_display(win, data, keys)
-  end
-
-  def self.append(data, keys=nil)
-    args = ['clipboard', 'append']
-    args.concat(hash_kv(keys))
-    args.concat(['--', data])
-    tk_call(*args)
-  end
-  def self.append_on_display(win, data, keys=nil)
-    args = ['clipboard', 'append', '-displayof', win]
-    args.concat(hash_kv(keys))
-    args.concat(['--', 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
-end
diff --git a/ext/tk/lib/tk/clock.rb b/ext/tk/lib/tk/clock.rb
deleted file mode 100644
index 4e9438f5ab..0000000000
--- a/ext/tk/lib/tk/clock.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# tk/clock.rb : methods for clock command
-#
-require 'tk'
-
-module Tk
-  module Clock
-    include Tk
-    extend TkCore
-
-    def self.add(clk, *args)
-      tk_call_without_enc('clock','add', clk, *args).to_i
-    end
-
-    def self.clicks(ms=nil)
-      ms = ms.to_s if ms.kind_of?(Symbol)
-      case ms
-      when nil, ''
-        tk_call_without_enc('clock','clicks').to_i
-      when /^mic/
-        tk_call_without_enc('clock','clicks','-microseconds').to_i
-      when /^mil/
-        tk_call_without_enc('clock','clicks','-milliseconds').to_i
-      else
-        tk_call_without_enc('clock','clicks','-milliseconds').to_i
-      end
-    end
-
-    def self.format(clk, form=nil)
-      if form
-        tk_call('clock','format',clk,'-format',form)
-      else
-        tk_call('clock','format',clk)
-      end
-    end
-
-    def self.formatGMT(clk, form=nil)
-      if form
-        tk_call('clock','format',clk,'-format',form,'-gmt','1')
-      else
-        tk_call('clock','format',clk,'-gmt','1')
-      end
-    end
-
-    def self.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 self.scanGMT(str, base=nil)
-      if base
-        tk_call('clock','scan',str,'-base',base,'-gmt','1').to_i
-      else
-        tk_call('clock','scan',str,'-gmt','1').to_i
-      end
-    end
-
-    def self.seconds
-      tk_call_without_enc('clock','seconds').to_i
-    end
-    def self.milliseconds
-      tk_call_without_enc('clock','milliseconds').to_i
-    end
-    def self.microseconds
-      tk_call_without_enc('clock','microseconds').to_i
-    end
-  end
-end
diff --git a/ext/tk/lib/tk/composite.rb b/ext/tk/lib/tk/composite.rb
deleted file mode 100644
index eaed8ed363..0000000000
--- a/ext/tk/lib/tk/composite.rb
+++ /dev/null
@@ -1,394 +0,0 @@
-#
-# tk/composite.rb : 
-#
-require 'tk'
-
-module TkComposite
-  include Tk
-  extend Tk
-
-=begin
-  def initialize(parent=nil, *args)
-    @delegates = {}
-    @option_methods = {}
-    @option_setting = {}
-
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      parent = keys.delete('parent')
-      @frame = TkFrame.new(parent)
-      @path = @epath = @frame.path
-      initialize_composite(keys)
-    else
-      @frame = TkFrame.new(parent)
-      @path = @epath = @frame.path
-      initialize_composite(*args)
-    end
-  end
-=end
-
-  def _choice_classname_of_baseframe
-    base_class_name = nil
-
-    klass = WidgetClassNames[self.class::WidgetClassName]
-
-    if klass
-      # WidgetClassName is a known class
-      if klass <= TkFrame || klass < TkComposite
-        # klass is valid for the base frame
-        if self.class <= klass
-          # use my classname
-          base_class_name = self.class.name
-          if base_class_name == ''
-            # anonymous class -> use ancestor's name
-            base_class_name = klass.name
-          end
-        else
-          # not subclass -> use WidgetClassName
-          base_class_name = klass.name
-        end
-
-      else
-        # klass is invalid for the base frame
-        if self.class < TkFrame || self.class.superclass < TkComposite
-          # my class name is valid for the base frame -> use my classname
-          base_class_name = self.class.name
-          if base_class_name == ''
-            # anonymous class -> use TkFrame
-            base_class_name = nil
-          end
-        else
-          # no idea for the base frame -> use TkFrame
-          base_class_name = nil
-        end
-      end
-
-    elsif self.class::WidgetClassName && ! self.class::WidgetClassName.empty?
-      # unknown WidgetClassName is defined -> use it for the base frame
-      base_class_name = self.class::WidgetClassName
-
-    else
-      # no valid WidgetClassName
-      if self.class < TkFrame || self.class.superclass < TkComposite
-        # my class name is valid for the base frame -> use my classname
-        base_class_name = self.class.name
-        if base_class_name == ''
-          # anonymous class -> use TkFrame
-          base_class_name = nil
-        end
-      else
-        # no idea for the base frame -> use TkFrame
-        base_class_name = nil
-      end
-    end
-
-    base_class_name
-  end
-  private :_choice_classname_of_baseframe
-
-  # def initialize(parent=nil, *args)
-  def initialize(*args)
-    @delegates = {}
-    @option_methods = {}
-    @option_setting = {}
-
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-    else
-      keys = {}
-    end
-    parent = args.shift
-    parent = keys.delete('parent') if keys.has_key?('parent')
-
-    if keys.key?('classname')
-      keys['class'] = keys.delete('classname')
-    end
-    if (base_class_name = (keys.delete('class')).to_s).empty?
-      base_class_name = _choice_classname_of_baseframe
-    end
-
-    if base_class_name
-      @frame = TkFrame.new(parent, :class=>base_class_name)
-    else
-      @frame = TkFrame.new(parent)
-    end
-    @path = @epath = @frame.path
-
-    args.push(keys) unless keys.empty?
-    initialize_composite(*args)
-  end
-
-  def database_classname
-    @frame.database_classname
-  end
-
-  def database_class
-    @frame.database_class
-  end
-
-  def epath
-    @epath
-  end
-
-  def initialize_composite(*args) end
-  private :initialize_composite
-
-  def option_methods(*opts)
-    opts.each{|m_set, m_cget, m_info|
-      m_set  = m_set.to_s
-      m_cget = m_set if !m_cget && self.method(m_set).arity == -1
-      m_cget = m_cget.to_s if m_cget
-      m_info = m_info.to_s if m_info
-      @option_methods[m_set] = {
-        :set  => m_set, :cget => m_cget, :info => m_info
-      }
-    }
-  end
-
-  def delegate_alias(alias_opt, option, *wins)
-    if wins.length == 0
-      fail ArgumentError, "target widgets are not given"
-    end
-    if alias_opt != option && (alias_opt == 'DEFAULT' || option == 'DEFAULT')
-      fail ArgumentError, "cannot alias 'DEFAULT' option"
-    end
-    alias_opt = alias_opt.to_s
-    option = option.to_s
-    if @delegates[alias_opt].kind_of?(Array)
-      if (elem = @delegates[alias_opt].assoc(option))
-        wins.each{|w| elem[1].push(w)}
-      else
-        @delegates[alias_opt] << [option, wins]
-      end
-    else
-      @delegates[alias_opt] = [ [option, wins] ]
-    end
-  end
-
-  def delegate(option, *wins)
-    delegate_alias(option, option, *wins)
-  end
-
-  def cget(slot)
-    slot = slot.to_s
-
-    if @option_methods.include?(slot)
-      if @option_methods[slot][:cget]
-        return self.__send__(@option_methods[slot][:cget])
-      else
-        if @option_setting[slot]
-          return @option_setting[slot]
-        else
-          return ''
-        end
-      end
-    end
-
-    tbl = @delegates[slot]
-    tbl = @delegates['DEFAULT'] unless tbl
-
-    begin
-      if tbl
-        opt, wins = tbl[-1]
-        opt = slot if opt == 'DEFAULT'
-        if wins && wins[-1]
-          return wins[-1].cget(opt)
-        end
-      end
-    rescue
-    end
-
-    super(slot)
-  end
-
-  def configure(slot, value=None)
-    if slot.kind_of? Hash
-      slot.each{|slot,value| configure slot, value}
-      return self
-    end
-
-    slot = slot.to_s
-
-    if @option_methods.include?(slot)
-      unless @option_methods[slot][:cget]
-        if value.kind_of?(Symbol)
-          @option_setting[slot] = value.to_s
-        else
-          @option_setting[slot] = value
-        end
-      end
-      return self.__send__(@option_methods[slot][:set], value)
-    end
-
-    tbl = @delegates[slot]
-    tbl = @delegates['DEFAULT'] unless tbl
-
-    begin
-      if tbl
-        last = nil
-        tbl.each{|opt, wins|
-          opt = slot if opt == 'DEFAULT'
-          wins.each{|w| last = w.configure(opt, value)}
-        }
-        return last
-      end
-    rescue
-    end
-
-    super(slot, value)
-  end
-
-  def configinfo(slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        slot = slot.to_s
-        if @option_methods.include?(slot)
-          if @option_methods[slot][:info]
-            return self.__send__(@option_methods[slot][:info])
-          else
-            return [slot, '', '', '', self.cget(slot)]
-          end
-        end
-
-        tbl = @delegates[slot]
-        tbl = @delegates['DEFAULT'] unless tbl
-
-        begin
-          if tbl
-            if tbl.length == 1
-              opt, wins = tbl[0]
-              if slot == opt || opt == 'DEFAULT'
-                return wins[-1].configinfo(slot)
-              else
-                info = wins[-1].configinfo(opt)
-                info[0] = slot
-                return info
-              end
-            else
-              opt, wins = tbl[-1]
-              return [slot, '', '', '', wins[-1].cget(opt)]
-            end
-          end
-        rescue
-        end
-
-        super(slot)
-
-      else # slot == nil
-        info_list = super(slot)
-
-        tbl = @delegates['DEFAULT']
-        if tbl
-          wins = tbl[0][1]
-          if wins && wins[-1]
-            wins[-1].configinfo.each{|info|
-              slot = info[0]
-              info_list.delete_if{|i| i[0] == slot} << info
-            }
-          end
-        end
-
-        @delegates.each{|slot, tbl|
-          next if slot == 'DEFAULT'
-          if tbl.length == 1
-            opt, wins = tbl[0]
-            next unless wins && wins[-1]
-            if slot == opt
-              info_list.delete_if{|i| i[0] == slot} << 
-                wins[-1].configinfo(slot)
-            else
-              info = wins[-1].configinfo(opt)
-              info[0] = slot
-              info_list.delete_if{|i| i[0] == slot} << info
-            end
-          else
-            opt, wins = tbl[-1]
-            info_list.delete_if{|i| i[0] == slot} << 
-              [slot, '', '', '', wins[-1].cget(opt)]
-          end
-        }
-
-        @option_methods.each{|slot, m|
-          if m[:info]
-            info = self.__send__(m[:info])
-          else
-            info = [slot, '', '', '', self.cget(slot)]
-          end
-          info_list.delete_if{|i| i[0] == slot} << info
-        }
-
-        info_list
-      end
-
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        slot = slot.to_s
-        if @option_methods.include?(slot)
-          if @option_methods[slot][:info]
-            return self.__send__(@option_methods[slot][:info])
-          else
-            return {slot => ['', '', '', self.cget(slot)]}
-          end
-        end
-
-        tbl = @delegates[slot]
-        tbl = @delegates['DEFAULT'] unless tbl
-
-        begin
-          if tbl
-            if tbl.length == 1
-              opt, wins = tbl[0]
-              if slot == opt || opt == 'DEFAULT'
-                return wins[-1].configinfo(slot)
-              else
-                return {slot => wins[-1].configinfo(opt)[opt]}
-              end
-            else
-              opt, wins = tbl[-1]
-              return {slot => ['', '', '', wins[-1].cget(opt)]}
-            end
-          end
-        rescue
-        end
-
-        super(slot)
-
-      else # slot == nil
-        info_list = super(slot)
-
-        tbl = @delegates['DEFAULT']
-        if tbl
-          wins = tbl[0][1]
-          info_list.update(wins[-1].configinfo) if wins && wins[-1]
-        end
-
-        @delegates.each{|slot, tbl|
-          next if slot == 'DEFAULT'
-          if tbl.length == 1
-            opt, wins = tbl[0]
-            next unless wins && wins[-1]
-            if slot == opt
-              info_list.update(wins[-1].configinfo(slot))
-            else
-              info_list.update({slot => wins[-1].configinfo(opt)[opt]})
-            end
-          else
-            opt, wins = tbl[-1]
-            info_list.update({slot => ['', '', '', wins[-1].cget(opt)]})
-          end
-        }
-
-        @option_methods.each{|slot, m|
-          if m[:info]
-            info = self.__send__(m[:info])
-          else
-            info = {slot => ['', '', '', self.cget(slot)]}
-          end
-          info_list.update(info)
-        }
-
-        info_list
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tk/console.rb b/ext/tk/lib/tk/console.rb
deleted file mode 100644
index 26ce262caa..0000000000
--- a/ext/tk/lib/tk/console.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#   tk/console.rb : control the console on system without a real console
-#
-require 'tk'
-
-module TkConsole
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['console'.freeze, 'consoleinterp'.freeze].freeze
-
-  def self.create
-    TkCore::INTERP._create_console
-  end
-  self.create  # initialize console
-
-  def self.title(str=None)
-    tk_call 'console', str
-  end
-  def self.hide
-    tk_call_without_enc('console', 'hide')
-  end
-  def self.show
-    tk_call_without_enc('console', 'show')
-  end
-  def self.eval(tcl_script)
-    #
-    # supports a Tcl script only
-    # I have no idea to support a Ruby script seamlessly.
-    #
-    _fromUTF8(tk_call_without_enc('console', 'eval', 
-                                  _get_eval_enc_str(tcl_script)))
-  end
-  def self.maininterp_eval(tcl_script)
-    #
-    # supports a Tcl script only
-    # I have no idea to support a Ruby script seamlessly.
-    #
-    _fromUTF8(tk_call_without_enc('consoleinterp', 'eval', 
-                                  _get_eval_enc_str(tcl_script)))
-
-  end
-  def self.maininterp_record(tcl_script)
-    #
-    # supports a Tcl script only
-    # I have no idea to support a Ruby script seamlessly.
-    #
-    _fromUTF8(tk_call_without_enc('consoleinterp', 'record', 
-                                  _get_eval_enc_str(tcl_script)))
-
-  end
-end
diff --git a/ext/tk/lib/tk/dialog.rb b/ext/tk/lib/tk/dialog.rb
deleted file mode 100644
index 180da101e3..0000000000
--- a/ext/tk/lib/tk/dialog.rb
+++ /dev/null
@@ -1,326 +0,0 @@
-#
-#   tk/dialog.rb : create dialog boxes
-#
-require 'tk'
-require 'tk/variable.rb'
-
-class TkDialogObj < 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 << Kernel.format("%s.button%s configure %s; ", 
-      #                                @path, i, hash_kv(c).join(' '))
-      # @config << @path+'.button'+i.to_s+' configure '+hash_kv(c).join(' ')+'; '
-      @config << @path+'.button'+i.to_s+' configure '+
-                   array2tk_list(hash_kv(c))+'; '
-    }
-    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 != ""
-    @config = array2tk_list(['after', 'idle', @config]) << ';' if @config != ""
-  end
-  private :_set_button_config
-
-  # initialize tk_dialog
-  def create_self(keys)
-    # @var = TkVariable.new
-    @val = nil
-
-    @title   = title
-
-    @message = message
-    @message_config = message_config
-    @msgframe_config = msgframe_config
-
-    @bitmap  = bitmap
-    @bitmap_config = message_config
-
-    @default_button = default_button
-
-    @buttons = buttons
-    @button_configs = proc{|num| button_configs(num)}
-    @btnframe_config = btnframe_config
-
-    #@config = "puts [winfo children .w0000];"
-    @config = ""
-
-    @command = prev_command
-
-    if keys.kind_of?(Hash)
-      @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 == ""
-      @bitmap  = '' unless @bitmap
-      @default_button = keys['default'] if keys.key? 'default'
-      @buttons = keys['buttons'] if keys.key? 'buttons'
-
-      @command = keys['prev_command'] if keys.key? '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'
-    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 = [] unless @buttons
-=begin
-    @buttons = @buttons.collect{|s|
-      if s.kind_of?(Array)
-        s = s.join(' ')
-      end
-      if s.include? ?\s
-        '{' + s + '}'
-      else
-        s
-      end
-    }
-=end
-
-    if @message_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.msg configure %s;", 
-      #                        @path, hash_kv(@message_config).join(' '))
-      # @config << @path+'.msg configure '+hash_kv(@message_config).join(' ')+';'
-      @config << @path+'.msg configure '+
-                   array2tk_list(hash_kv(@message_config))+';'
-    end
-
-    if @msgframe_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.top configure %s;", 
-      #                        @path, hash_kv(@msgframe_config).join(' '))
-      # @config << @path+'.top configure '+hash_kv(@msgframe_config).join(' ')+';'
-      @config << @path+'.top configure '+
-                   array2tk_list(hash_kv(@msgframe_config))+';'
-    end
-
-    if @btnframe_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.bot configure %s;", 
-      #                        @path, hash_kv(@btnframe_config).join(' '))
-      # @config << @path+'.bot configure '+hash_kv(@btnframe_config).join(' ')+';'
-      @config << @path+'.bot configure '+
-                   array2tk_list(hash_kv(@btnframe_config))+';'
-    end
-
-    if @bitmap_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.bitmap configure %s;", 
-      #                        @path, hash_kv(@bitmap_config).join(' '))
-      # @config << @path+'.bitmap configure '+hash_kv(@bitmap_config).join(' ')+';'
-      @config << @path+'.bitmap configure '+
-                    array2tk_list(hash_kv(@bitmap_config))+';'
-    end
-
-    _set_button_config(@button_configs) if @button_configs
-  end
-  private :create_self
-
-  def show
-    # if @command.kind_of?(Proc)
-    if TkComm._callback_entry?(@command)
-      @command.call(self)
-    end
-
-    if @default_button.kind_of?(String)
-      default_button = @buttons.index(@default_button)
-    else
-      default_button = @default_button
-    end
-    # default_button = '{}' if default_button == nil
-    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(' ')+']}')
-    Tk.ip_eval(@config)
-    # @val = Tk.ip_eval('tk_dialog ' + @path + ' ' + @title + 
-    #                 ' {' + @message + '} ' + @bitmap + ' ' + 
-    #                 String(default_button) + ' ' + @buttons.join(' ')).to_i
-    # @val = Tk.ip_eval(self.class::TkCommandNames[0] + ' ' + @path + ' ' + 
-    #                   @title + ' {' + @message + '} ' + @bitmap + ' ' + 
-    #                   String(default_button) + ' ' + @buttons.join(' ')).to_i
-    @val = Tk.ip_eval(array2tk_list([
-                                      self.class::TkCommandNames[0], 
-                                      @path, @title, @message, @bitmap, 
-                                      String(default_button)
-                                    ].concat(@buttons))).to_i
-  end
-
-  def value
-    # @var.value.to_i
-    @val
-  end
-
-  def name
-    (@val)? @buttons[@val]: nil
-  end
-
-  ############################################################
-  #                                                          #
-  #  following methods should 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
-    #return "BUTTON1 BUTTON2"
-    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
-  def prev_command
-    # returns nil or a Proc
-    return nil
-  end
-end
-TkDialog2 = TkDialogObj
-
-#
-# TkDialog : with showing at initialize
-#
-class TkDialog < TkDialogObj
-  def self.show(*args)
-    self.new(*args)
-  end
-
-  def initialize(*args)
-    super(*args)
-    show
-  end
-end
-
-
-#
-# dialog for warning
-#
-class TkWarningObj < TkDialogObj
-  def initialize(parent = nil, mes = nil)
-    if !mes
-      if parent.kind_of?(TkWindow)
-        mes = ""
-      else
-        mes = parent.to_s
-        parent = nil
-      end
-    end
-    super(parent, :message=>mes)
-  end
-
-  def show(mes = nil)
-    mes_bup = @message
-    @message = mes if mes
-    ret = super()
-    @message = mes_bup
-    ret
-  end
-
-  #######
-  private
-
-  def title
-    return "WARNING";
-  end
-  def bitmap
-    return "warning";
-  end
-  def default_button
-    return 0;
-  end
-  def buttons
-    return "OK";
-  end
-end
-TkWarning2 = TkWarningObj
-
-class TkWarning < TkWarningObj
-  def self.show(*args)
-    self.new(*args)
-  end
-  def initialize(*args)
-    super(*args)
-    show
-  end
-end
diff --git a/ext/tk/lib/tk/encodedstr.rb b/ext/tk/lib/tk/encodedstr.rb
deleted file mode 100644
index 797e514a4c..0000000000
--- a/ext/tk/lib/tk/encodedstr.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# tk/encodedstr.rb : Tk::EncodedString class
-#
-require 'tk'
-
-###########################################
-#  string with Tcl's encoding
-###########################################
-module Tk
-  class EncodedString < String
-    Encoding = nil
-
-    def self.subst_utf_backslash(str)
-      # str.gsub(/\\u([0-9A-Fa-f]{1,4})/){[$1.hex].pack('U')}
-      TclTkLib._subst_UTF_backslash(str)
-    end
-    def self.utf_backslash(str)
-      self.subst_utf_backslash(str)
-    end
-
-    def self.subst_tk_backslash(str)
-      TclTkLib._subst_Tcl_backslash(str)
-    end
-
-    def self.utf_to_backslash_sequence(str)
-      str.unpack('U*').collect{|c|
-        if c <= 0xFF  # ascii character
-          c.chr
-        else
-          format('\u%X', c)
-        end
-      }.join('')
-    end
-    def self.utf_to_backslash(str)
-      self.utf_to_backslash_sequence(str)
-    end
-
-    def self.to_backslash_sequence(str)
-      str.unpack('U*').collect{|c|
-        if c <= 0x1F  # control character
-          case c
-          when 0x07; '\a'
-          when 0x08; '\b'
-          when 0x09; '\t'
-          when 0x0a; '\n'
-          when 0x0b; '\v'
-          when 0x0c; '\f'
-          when 0x0d; '\r'
-          else
-            format('\x%02X', c)
-          end
-        elsif c <= 0xFF  # ascii character
-          c.chr
-        else
-          format('\u%X', c)
-        end
-      }.join('')
-    end
-
-    def self.new_with_utf_backslash(str, enc = nil)
-      self.new('', enc).replace(self.subst_utf_backslash(str))
-    end
-
-    def self.new_without_utf_backslash(str, enc = nil)
-      self.new('', enc).replace(str)
-    end
-
-    def initialize(str, enc = nil)
-      super(str)
-      # @encoding = ( enc || 
-      #              ((self.class::Encoding)? 
-      #                  self.class::Encoding : Tk.encoding_system) )
-      @encoding = ( enc || 
-                   ((self.class::Encoding)?
-                         self.class::Encoding : 
-                         ((Tk.encoding)? Tk.encoding : Tk.encoding_system) ) )
-    end
-
-    attr_reader :encoding
-  end
-  # def Tk.EncodedString(str, enc = nil)
-  #   Tk::EncodedString.new(str, enc)
-  # end
-
-  ##################################
-
-  class BinaryString < EncodedString
-    Encoding = 'binary'.freeze
-  end
-  # def Tk.BinaryString(str)
-  #   Tk::BinaryString.new(str)
-  # end
-
-  ##################################
-
-  class UTF8_String < EncodedString
-    Encoding = 'utf-8'.freeze
-    def self.new(str)
-      super(self.subst_utf_backslash(str))
-    end
-
-    def to_backslash_sequence
-      Tk::EncodedString.utf_to_backslash_sequence(self)
-    end
-    alias to_backslash to_backslash_sequence
-  end
-  # def Tk.UTF8_String(str)
-  #   Tk::UTF8_String.new(str)
-  # end
-
-end
diff --git a/ext/tk/lib/tk/entry.rb b/ext/tk/lib/tk/entry.rb
deleted file mode 100644
index e4d69eb7bf..0000000000
--- a/ext/tk/lib/tk/entry.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-#               tk/entry.rb - Tk entry classes
-#                       $Date: 2005/10/22 22:16:24 $
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-
-require 'tk'
-require 'tk/label'
-require 'tk/scrollable'
-require 'tk/validation'
-
-class TkEntry<TkLabel
-  include X_Scrollable
-  include TkValidation
-
-  TkCommandNames = ['entry'.freeze].freeze
-  WidgetClassName = 'Entry'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  #def create_self(keys)
-  #  super(__conv_vcmd_on_hash_kv(keys))
-  #end
-  #private :create_self
-
-  def __strval_optkeys
-    super() + ['show', 'disabledbackground', 'readonlybackground']
-  end
-  private :__strval_optkeys
-
-  def bbox(index)
-    list(tk_send_without_enc('bbox', index))
-  end
-  def cursor
-    number(tk_send_without_enc('index', 'insert'))
-  end
-  alias icursor cursor
-  def cursor=(index)
-    tk_send_without_enc('icursor', index)
-    #self
-    index
-  end
-  alias icursor= cursor=
-  def index(idx)
-    number(tk_send_without_enc('index', idx))
-  end
-  def insert(pos,text)
-    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
-    self
-  end
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-  def mark(pos)
-    tk_send_without_enc('scan', 'mark', pos)
-    self
-  end
-  def dragto(pos)
-    tk_send_without_enc('scan', 'dragto', pos)
-    self
-  end
-  def selection_adjust(index)
-    tk_send_without_enc('selection', 'adjust', index)
-    self
-  end
-  def selection_clear
-    tk_send_without_enc('selection', 'clear')
-    self
-  end
-  def selection_from(index)
-    tk_send_without_enc('selection', 'from', index)
-    self
-  end
-  def selection_present()
-    bool(tk_send_without_enc('selection', 'present'))
-  end
-  def selection_range(s, e)
-    tk_send_without_enc('selection', 'range', s, e)
-    self
-  end
-  def selection_to(index)
-    tk_send_without_enc('selection', 'to', index)
-    self
-  end
-
-  def invoke_validate
-    bool(tk_send_without_enc('validate'))
-  end
-  def validate(mode = nil)
-    if mode
-      configure 'validate', mode
-    else
-      invoke_validate
-    end
-  end
-
-  def value
-    _fromUTF8(tk_send_without_enc('get'))
-  end
-  def value= (val)
-    tk_send_without_enc('delete', 0, 'end')
-    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
-    val
-  end
-  alias get value
-  alias set value=
-
-  def [](*args)
-    self.value[*args]
-  end
-  def []=(*args)
-    val = args.pop
-    str = self.value
-    str[*args] = val
-    self.value = str
-    val
-  end
-end
diff --git a/ext/tk/lib/tk/event.rb b/ext/tk/lib/tk/event.rb
deleted file mode 100644
index 70a1e38bbe..0000000000
--- a/ext/tk/lib/tk/event.rb
+++ /dev/null
@@ -1,488 +0,0 @@
-#
-#  tk/event.rb - module for event
-#
-
-module TkEvent
-end
-
-########################
-
-require 'tkutil'
-require 'tk'
-
-########################
-
-module TkEvent
-  class Event < TkUtil::CallbackSubst
-    module Grp
-      KEY         =           0x1
-      BUTTON      =           0x2
-      MOTION      =           0x4
-      CROSSING    =           0x8
-      FOCUS       =           0x10
-      EXPOSE      =           0x20
-      VISIBILITY  =           0x40
-      CREATE      =           0x80
-      DESTROY     =           0x100
-      UNMAP       =           0x200
-      MAP         =           0x400
-      REPARENT    =           0x800
-      CONFIG      =           0x1000
-      GRAVITY     =           0x2000
-      CIRC        =           0x4000
-      PROP        =           0x8000
-      COLORMAP    =           0x10000
-      VIRTUAL     =           0x20000
-      ACTIVATE    =           0x40000
-      MAPREQ      =           0x80000
-      CONFIGREQ   =           0x100000
-      RESIZEREQ   =           0x200000
-      CIRCREQ     =           0x400000
-
-      MWHEEL      =           0x10000000
-
-      ALL         =           0xFFFFFFFF
-
-      KEY_BUTTON_MOTION_VIRTUAL  = (KEY|MWHEEL|BUTTON|MOTION|VIRTUAL)
-      KEY_BUTTON_MOTION_CROSSING = (KEY|MWHEEL|BUTTON|MOTION|CROSSING|VIRTUAL)
-    end
-
-    type_data = [
-      #-----+-------------------+------------------+-----------------------#
-      #  ID |  const            |  group_flag      |  context_name         #
-      #-----+-------------------+------------------+-----------------------#
-      [  2,  :KeyPress,          Grp::KEY,         'KeyPress',    'Key'    ], 
-      [  3,  :KeyRelease,        Grp::KEY,         'KeyRelease'            ], 
-      [  4,  :ButtonPress,       Grp::BUTTON,      'ButtonPress', 'Button' ], 
-      [  5,  :ButtonRelease,     Grp::BUTTON,      'ButtonRelease'         ], 
-      [  6,  :MotionNotify,      Grp::MOTION,      'Motion'                ], 
-      [  7,  :EnterNotify,       Grp::CROSSING,    'Enter'                 ], 
-      [  8,  :LeaveNotify,       Grp::CROSSING,    'Leave'                 ], 
-      [  9,  :FocusIn,           Grp::FOCUS,       'FocusIn'               ], 
-      [ 10,  :FocusOut,          Grp::FOCUS,       'FocusOut'              ], 
-      [ 11,  :KeymapNotify,      0,                                        ], 
-      [ 12,  :Expose,            Grp::EXPOSE,      'Expose'                ], 
-      [ 13,  :GraphicsExpose,    Grp::EXPOSE,                              ], 
-      [ 14,  :NoExpose,          0,                                        ], 
-      [ 15,  :VisibilityNotify,  Grp::VISIBILITY,  'Visibility'            ], 
-      [ 16,  :CreateNotify,      Grp::CREATE,      'Create'                ], 
-      [ 17,  :DestroyNotify,     Grp::DESTROY,     'Destroy'               ], 
-      [ 18,  :UnmapNotify,       Grp::UNMAP,       'Unmap'                 ], 
-      [ 19,  :MapNotify,         Grp::MAP,         'Map'                   ], 
-      [ 20,  :MapRequest,        Grp::MAPREQ,      'MapRequest'            ], 
-      [ 21,  :ReparentNotify,    Grp::REPARENT,    'Reparent'              ], 
-      [ 22,  :ConfigureNotify,   Grp::CONFIG,      'Configure'             ], 
-      [ 23,  :ConfigureRequest,  Grp::CONFIGREQ,   'ConfigureRequest'      ], 
-      [ 24,  :GravityNotify,     Grp::GRAVITY,     'Gravity'               ], 
-      [ 25,  :ResizeRequest,     Grp::RESIZEREQ,   'ResizeRequest'         ], 
-      [ 26,  :CirculateNotify,   Grp::CIRC,        'Circulate'             ], 
-      [ 27,  :CirculateRequest,  0,                'CirculateRequest'      ], 
-      [ 28,  :PropertyNotify,    Grp::PROP,        'Property'              ], 
-      [ 29,  :SelectionClear,    0,                                        ], 
-      [ 30,  :SelectionRequest,  0,                                        ], 
-      [ 31,  :SelectionNotify,   0,                                        ], 
-      [ 32,  :ColormapNotify,    Grp::COLORMAP,    'Colormap'              ], 
-      [ 33,  :ClientMessage,     0,                                        ], 
-      [ 34,  :MappingNotify,     0,                                        ], 
-      [ 35,  :VirtualEvent,      Grp::VIRTUAL,                             ],
-      [ 36,  :ActivateNotify,    Grp::ACTIVATE,    'Activate'              ],
-      [ 37,  :DeactivateNotify,  Grp::ACTIVATE,    'Deactivate'            ],
-      [ 38,  :MouseWheelEvent,   Grp::MWHEEL,      'MouseWheel'            ],
-      [ 39,  :TK_LASTEVENT,      0,                                        ]
-    ]
-
-    module TypeNum
-    end
-
-    TYPE_NAME_TBL  = Hash.new
-    TYPE_ID_TBL    = Hash.new
-    TYPE_GROUP_TBL = Hash.new
-
-    type_data.each{|id, c_name, g_flag, *t_names|
-      TypeNum.const_set(c_name, id)
-      t_names.each{|t_name| t_name.freeze; TYPE_NAME_TBL[t_name] = id }
-      TYPE_ID_TBL[id]    = t_names
-      TYPE_GROUP_TBL[id] = g_flag
-    }
-
-    TYPE_NAME_TBL.freeze
-    TYPE_ID_TBL.freeze
-
-    def self.type_id(name)
-      TYPE_NAME_TBL[name.to_s]
-    end
-
-    def self.type_name(id)
-      TYPE_ID_TBL[id] && TYPE_ID_TBL[id][0]
-    end
-
-    def self.group_flag(id)
-      TYPE_GROUP_TBL[id] || 0
-    end
-
-    #############################################
-
-    module StateMask
-      ShiftMask      =        (1<<0)
-      LockMask       =        (1<<1)
-      ControlMask    =        (1<<2)
-      Mod1Mask       =        (1<<3)
-      Mod2Mask       =        (1<<4)
-      Mod3Mask       =        (1<<5)
-      Mod4Mask       =        (1<<6)
-      Mod5Mask       =        (1<<7)
-      Button1Mask    =        (1<<8)
-      Button2Mask    =        (1<<9)
-      Button3Mask    =        (1<<10)
-      Button4Mask    =        (1<<11)
-      Button5Mask    =        (1<<12)
-
-      AnyModifier    =        (1<<15)
-
-      META_MASK      =  (AnyModifier<<1)
-      ALT_MASK       =  (AnyModifier<<2)
-      EXTENDED_MASK  =  (AnyModifier<<3)
-
-      CommandMask    =  Mod1Mask
-      OptionMask     =  Mod2Mask
-    end
-
-    #############################################
-
-    FIELD_FLAG = {
-      # key  =>  flag
-      'above'       => Grp::CONFIG, 
-      'borderwidth' => (Grp::CREATE|Grp::CONFIG),
-      'button'      => Grp::BUTTON, 
-      'count'       => Grp::EXPOSE, 
-      'data'        => Grp::VIRTUAL, 
-      'delta'       => Grp::MWHEEL, 
-      'detail'      => (Grp::FOCUS|Grp::CROSSING),
-      'focus'       => Grp::CROSSING,
-      'height'      => (Grp::EXPOSE|Grp::CONFIG),
-      'keycode'     => Grp::KEY,
-      'keysym'      => Grp::KEY,
-      'mode'        => (Grp::CROSSING|Grp::FOCUS),
-      'override'    => (Grp::CREATE|Grp::MAP|Grp::REPARENT|Grp::CONFIG),
-      'place'       => Grp::CIRC,
-      'root'        => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
-      'rootx'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
-      'rooty'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
-      'sendevent'   => Grp::ALL,
-      'serial'      => Grp::ALL,
-      'state'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|
-                        Grp::CROSSING|Grp::VISIBILITY),
-      'subwindow'   => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
-      'time'        => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
-                        Grp::PROP),
-      'warp'        => Grp::KEY_BUTTON_MOTION_VIRTUAL,
-      'width'       => (Grp::EXPOSE|Grp::CREATE|Grp::CONFIG),
-      'window'      => (Grp::CREATE|Grp::UNMAP|Grp::MAP|Grp::REPARENT|
-                        Grp::CONFIG|Grp::GRAVITY|Grp::CIRC),
-      'when'        => Grp::ALL,
-      'x'           => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
-                        Grp::EXPOSE|Grp::CREATE|Grp::CONFIG|Grp::GRAVITY|
-                        Grp::REPARENT),
-      'y'           => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
-                        Grp::EXPOSE|Grp::CREATE|Grp::CONFIG|Grp::GRAVITY|
-                        Grp::REPARENT),
-    }
-
-    FIELD_OPERATION = {
-      'root' => proc{|val| 
-        begin
-          Tk.tk_call_without_enc('winfo', 'pathname', val)
-          val
-        rescue
-          nil
-        end
-      }, 
-
-      'subwindow' => proc{|val| 
-        begin
-          Tk.tk_call_without_enc('winfo', 'pathname', val)
-          val
-        rescue
-          nil
-        end
-      }, 
-
-      'window' => proc{|val| nil}
-    }
-
-    #-------------------------------------------
-
-    def valid_fields(group_flag=nil)
-      group_flag = self.class.group_flag(self.type) unless group_flag
-
-      fields = {}
-      FIELD_FLAG.each{|key, flag|
-        next if (flag & group_flag) == 0
-        begin
-          val = self.__send__(key)
-        rescue
-          next
-        end
-        next if !val || val == '??'
-        fields[key] = val
-      }
-
-      fields
-    end
-
-    def valid_for_generate(group_flag=nil)
-      fields = valid_fields(group_flag)
-
-      FIELD_OPERATION.each{|key, cmd|
-        next unless fields.has_key?(key)
-        val = FIELD_OPERATION[key].call(fields[key])
-        if val
-          fields[key] = val
-        else
-          fields.delete(key)
-        end
-      }
-
-      fields
-    end
-
-    def generate(win, modkeys={})
-      klass = self.class
-
-      if modkeys.has_key?(:type) || modkeys.has_key?('type')
-        modkeys = TkComm._symbolkey2str(modkeys)
-        type_id = modkeys.delete('type')
-      else
-        type_id = self.type
-      end
-
-      type_name  = klass.type_name(type_id)
-      unless type_name
-        fail RuntimeError, "type_id #{type_id} is invalid"
-      end
-
-      group_flag = klass.group_flag(type_id)
-
-      opts = valid_for_generate(group_flag)
-
-      modkeys.each{|key, val|
-        if val
-          opts[key.to_s] = val
-        else
-          opts.delete(key.to_s)
-        end
-      }
-
-      if group_flag != Grp::KEY
-        Tk.event_generate(win, type_name, opts)
-      else
-        # If type is KEY event, focus should be set to target widget.
-        # If not set, original widget will get the same event. 
-        # That will make infinite loop.
-        w = Tk.tk_call_without_enc('focus')
-        begin
-          Tk.tk_call_without_enc('focus', win)
-          Tk.event_generate(win, type_name, opts)
-        ensure
-          Tk.tk_call_without_enc('focus', w)
-        end
-      end
-    end
-
-    #############################################
-
-    # [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>]
-    KEY_TBL = [
-      [ ?#, ?n, :serial ], 
-      [ ?a, ?s, :above ], 
-      [ ?b, ?n, :num ], 
-      [ ?c, ?n, :count ], 
-      [ ?d, ?s, :detail ], 
-      [ ?f, ?b, :focus ], 
-      [ ?h, ?n, :height ], 
-      [ ?i, ?s, :win_hex ], 
-      [ ?k, ?n, :keycode ], 
-      [ ?m, ?s, :mode ], 
-      [ ?o, ?b, :override ], 
-      [ ?p, ?s, :place ], 
-      [ ?s, ?x, :state ], 
-      [ ?t, ?n, :time ], 
-      [ ?w, ?n, :width ], 
-      [ ?x, ?n, :x ], 
-      [ ?y, ?n, :y ], 
-      [ ?A, ?s, :char ], 
-      [ ?B, ?n, :borderwidth ], 
-      [ ?D, ?n, :wheel_delta ], 
-      [ ?E, ?b, :send_event ], 
-      [ ?K, ?s, :keysym ], 
-      [ ?N, ?n, :keysym_num ], 
-      [ ?P, ?s, :property ], 
-      [ ?R, ?s, :rootwin_id ], 
-      [ ?S, ?s, :subwindow ], 
-      [ ?T, ?n, :type ], 
-      [ ?W, ?w, :widget ], 
-      [ ?X, ?n, :x_root ], 
-      [ ?Y, ?n, :y_root ], 
-      nil
-    ]
-
-    # [ <proc type char>, <proc/method to convert tcl-str to ruby-obj>]
-    PROC_TBL = [
-      [ ?n, TkComm.method(:num_or_str) ], 
-      [ ?s, TkComm.method(:string) ], 
-      [ ?b, TkComm.method(:bool) ], 
-      [ ?w, TkComm.method(:window) ], 
-
-      [ ?x, proc{|val|
-          begin
-            TkComm::number(val)
-          rescue ArgumentError
-            val
-          end
-        }
-      ], 
-
-      nil
-    ]
-
-    # setup tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
-    #
-    #     _get_subst_key() and _get_all_subst_keys() generates key-string 
-    #     which describe how to convert callback arguments to ruby objects. 
-    #     When binding parameters are given, use _get_subst_key(). 
-    #     But when no parameters are given, use _get_all_subst_keys() to 
-    #     create a Event class object as a callback parameter. 
-    #
-    #     scan_args() is used when doing callback. It convert arguments 
-    #     ( which are Tcl strings ) to ruby objects based on the key string 
-    #     that is generated by _get_subst_key() or _get_all_subst_keys(). 
-    #
-    _setup_subst_table(KEY_TBL, PROC_TBL);
-
-    #
-    # NOTE: The order of parameters which passed to callback procedure is 
-    #        <extra_arg>, <extra_arg>, ... , <subst_arg>, <subst_arg>, ...
-    #
-
-    # If you need support extra arguments given by Tcl/Tk, 
-    # please override _get_extra_args_tbl
-    #
-    #def self._get_extra_args_tbl
-    #  # return an array of convert procs
-    #  []
-    #end
-
-=begin
-    alias button num
-    alias delta  wheel_delta
-    alias root   rootwin_id
-    alias rootx  x_root
-    alias root_x x_root
-    alias rooty  y_root
-    alias root_y y_root
-    alias sendevent send_event
-=end
-    ALIAS_TBL = {
-      :button    => :num, 
-      :data      => :detail, 
-      :delta     => :wheel_delta, 
-      :root      => :rootwin_id, 
-      :rootx     => :x_root, 
-      :root_x    => :x_root, 
-      :rooty     => :y_root, 
-      :root_y    => :y_root, 
-      :sendevent => :send_event, 
-      :window    => :widget
-    }
-
-    _define_attribute_aliases(ALIAS_TBL)
-
-  end
-
-  ###############################################
-
-  def install_bind_for_event_class(klass, cmd, *args)
-    extra_args_tbl = klass._get_extra_args_tbl
-
-    if args.compact.size > 0
-      args = args.join(' ')
-      keys = klass._get_subst_key(args)
-
-      if cmd.kind_of?(String)
-        id = cmd
-      elsif cmd.kind_of?(TkCallbackEntry)
-        id = install_cmd(cmd)
-      else
-        id = install_cmd(proc{|*arg|
-          ex_args = []
-          extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
-          begin
-            TkUtil.eval_cmd(cmd, *(ex_args.concat(klass.scan_args(keys, arg))))
-          rescue Exception=>e
-            if TkCore::INTERP.kind_of?(TclTkIp)
-              fail e
-            else
-              # MultiTkIp
-              fail Exception, "#{e.class}: #{e.message.dup}"
-            end
-          end
-        })
-      end
-    else
-      keys, args = klass._get_all_subst_keys
-
-      if cmd.kind_of?(String)
-        id = cmd
-      elsif cmd.kind_of?(TkCallbackEntry)
-        id = install_cmd(cmd)
-      else
-        id = install_cmd(proc{|*arg|
-          ex_args = []
-          extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
-          begin
-            TkUtil.eval_cmd(cmd, *(ex_args << klass.new(*klass.scan_args(keys, arg))))
-          rescue Exception=>e
-            if TkCore::INTERP.kind_of?(TclTkIp)
-              fail e
-            else
-              # MultiTkIp
-              fail Exception, "#{e.class}: #{e.message.dup}"
-            end
-          end
-        })
-      end
-    end
-
-    if TkCore::INTERP.kind_of?(TclTkIp)
-      id + ' ' + args
-    else
-      # MultiTkIp
-      "if {[set st [catch {#{id} #{args}} ret]] != 0} {
-         if {$st == 4} {
-           return -code continue $ret
-         } elseif {$st == 3} {
-           return -code break $ret
-         } elseif {$st == 2} {
-           return -code return $ret
-         } elseif {[regexp {^Exception: (TkCallbackContinue: .*)$} \
-                                                               $ret m msg]} {
-           return -code continue $msg
-         } elseif {[regexp {^Exception: (TkCallbackBreak: .*)$} $ret m msg]} {
-           return -code break $msg
-         } elseif {[regexp {^Exception: (TkCallbackReturn: .*)$} $ret m msg]} {
-           return -code return $msg
-         } elseif {[regexp {^Exception: (\\S+: .*)$} $ret m msg]} {
-           return -code return $msg
-         } else {
-           return -code error $ret
-         }
-       } else {
-          set ret
-       }"
-    end
-  end
-
-  def install_bind(cmd, *args)
-    install_bind_for_event_class(TkEvent::Event, cmd, *args)
-  end
-end
diff --git a/ext/tk/lib/tk/font.rb b/ext/tk/lib/tk/font.rb
deleted file mode 100644
index de02d4957c..0000000000
--- a/ext/tk/lib/tk/font.rb
+++ /dev/null
@@ -1,1762 +0,0 @@
-#
-#  tk/font.rb - the class to treat fonts on Ruby/Tk
-#
-#                               by  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-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
-  }
-
-  # option_type : default => string
-  OptionType = Hash.new(?s)
-  OptionType['size'] = ?n
-  OptionType['pointadjust'] = ?n
-  OptionType['underline'] = ?b
-  OptionType['overstrike'] = ?b
-
-  # metric_type : default => num_or_str
-  MetricType = Hash.new(?n)
-  MetricType['fixed'] = ?b
-
-  # 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)')
-          platform = Tk::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)')
-        platform = Tk::PLATFORM['platform']
-        case platform
-        when 'unix'
-          ltn = {'family'=>'Helvetica'.freeze, 
-                 'size'=>-12, 'weight'=>'bold'.freeze}
-        when 'windows'
-          ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
-        when 'macintosh'
-          ltn = 'system'
-        else # unknown
-          ltn = 'Helvetica'
-        end
-      rescue
-        ltn = 'Helvetica'
-      end
-
-      knj = ltn.dup
-    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
-      when :kanji, :latin, :ascii
-        @type = type.to_s
-      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)
-      @compound.__send__(@type + '_configure', slot, value)
-      value
-    end
-
-    def method_missing(id, *args)
-      @compound.__send__(@type + '_' + id.id2name, *args)
-    end
-  end
-
-
-  ###################################
-  # class methods
-  ###################################
-  def TkFont.actual(fnt, option=nil)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-     fnt.actual(option)
-    else
-      actual_core(fnt, nil, option)
-    end
-  end
-
-  def TkFont.actual_displayof(fnt, win, option=nil)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-     fnt.actual_displayof(win, option)
-    else
-      win = '.' unless win
-      actual_core(fnt, win, option)
-    end
-  end
-
-  def TkFont.configure(fnt, slot, value=None)
-    if fnt.kind_of?(TkFont)
-      fnt.configure(fnt, slot, value)
-    else
-      configure_core(fnt, slot, value)
-    end
-    fnt
-  end
-
-  def TkFont.configinfo(fnt, slot=nil)
-    if fnt.kind_of?(TkFont)
-      fnt.configinfo(fnt, slot)
-    else
-      configinfo_core(fnt, slot)
-    end
-  end
-
-  def TkFont.current_configinfo(fnt, slot=nil)
-    if fnt.kind_of?(TkFont)
-      fnt.current_configinfo(fnt, slot)
-    else
-      current_configinfo_core(fnt, slot)
-    end
-  end
-
-  def TkFont.measure(fnt, text)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-      fnt.measure(text)
-    else
-      measure_core(fnt, nil, text)
-    end
-  end
-
-  def TkFont.measure_displayof(fnt, win, text)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-      fnt.measure_displayof(win, text)
-    else
-      win = '.' unless win
-      measure_core(fnt, win, text)
-    end
-  end
-
-  def TkFont.metrics(fnt, option=nil)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-      fnt.metrics(option)
-    else
-      metrics_core(fnt, nil, option)
-    end
-  end
-
-  def TkFont.metrics_displayof(fnt, win, option=nil)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-      font.metrics_displayof(win, option=nil)
-    else
-      win = '.' unless win
-      metrics_core(fnt, win, option)
-    end
-  end
-
-  def TkFont.families(win=nil)
-    case (Tk::TK_VERSION)
-    when /^4\.*/
-      ['fixed']
-
-    when /^8\.*/
-      if win
-        tk_split_simplelist(tk_call('font', 'families', '-displayof', win))
-      else
-        tk_split_simplelist(tk_call('font', 'families'))
-      end
-    end
-  end
-
-  def TkFont.names
-    case (Tk::TK_VERSION)
-    when /^4\.*/
-      r = ['fixed']
-      r += ['a14', 'k14'] if JAPANIZED_TK
-      Tk_FontNameTBL.each_value{|obj| r.push(obj)}
-      r | []
-
-    when /^8\.*/
-      tk_split_simplelist(tk_call('font', 'names'))
-
-    end
-  end
-
-  def TkFont.create_copy(font)
-    fail 'source-font must be a TkFont object' unless font.kind_of? TkFont
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      keys = {}
-      font.configinfo.each{|key,value| keys[key] = value }
-      TkFont.new(font.latin_font_id, font.kanji_font_id, keys)
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      TkFont.new(font.latin_font_id, font.kanji_font_id, font.configinfo)
-    end
-  end
-
-  def TkFont.get_obj(name)
-    if name =~ /^(@font[0-9]+)(|c|l|k)$/
-      Tk_FontNameTBL[$1]
-    else
-      nil
-    end
-  end
-
-  def TkFont.init_widget_font(pathname, *args)
-    win, tag, key = pathname.split(';')
-    key = 'font' if key == nil || key == ''
-    path = [win, tag, key].join(';')
-
-    case (Tk::TK_VERSION)
-    when /^4\.*/
-      regexp = /^-(|kanji)#{key} /
-
-      conf_list = tk_split_simplelist(tk_call(*args)).
-        find_all{|prop| prop =~ regexp}.
-        collect{|prop| tk_split_simplelist(prop)}
-
-      if conf_list.size == 0
-        raise RuntimeError, "the widget may not support 'font' option"
-      end
-
-      args << {}
-
-      ltn_key = "-#{key}"
-      knj_key = "-kanji#{key}"
-
-      ltn_info = conf_list.find{|conf| conf[0] == ltn_key}
-      ltn = ltn_info[-1]
-      ltn = nil if ltn == [] || ltn == ""
-
-      knj_info = conf_list.find{|conf| conf[0] == knj_key}
-      knj = knj_info[-1]
-      knj = nil if knj == [] || knj == ""
-
-      TkFont.new(ltn, knj).call_font_configure([path, key], *args)
-
-    when /^8\.*/
-      regexp = /^-#{key} /
-
-      conf_list = tk_split_simplelist(tk_call(*args)).
-        find_all{|prop| prop =~ regexp}.
-        collect{|prop| tk_split_simplelist(prop)}
-
-      if conf_list.size == 0
-        raise RuntimeError, "the widget may not support 'font' option"
-      end
-
-      args << {}
-
-      optkey = "-#{key}"
-
-      info = conf_list.find{|conf| conf[0] == optkey}
-      fnt = info[-1]
-      fnt = nil if fnt == [] || fnt == ""
-
-      unless fnt
-        # create dummy
-        # TkFont.new(nil, nil).call_font_configure([path, key], *args)
-        dummy_fnt = TkFont.allocate
-        dummy_fnt.instance_eval{ init_dummy_fontobj() }
-        dummy_fnt
-      else
-        begin
-          compound = tk_split_simplelist(
-              Hash[*tk_split_simplelist(tk_call('font', 'configure', 
-                                                fnt))].collect{|k,v|
-                [k[1..-1], v]
-              }.assoc('compound')[1])
-        rescue
-          compound = []
-        end
-        if compound == []
-          TkFont.new(fnt).call_font_configure([path, key], *args)
-        else
-          TkFont.new(compound[0], 
-                     compound[1]).call_font_configure([path, key], *args)
-        end
-      end
-    end
-  end
-
-  def TkFont.used_on(path=nil)
-    if path
-      Tk_FontUseTBL[path]
-    else
-      Tk_FontUseTBL.values | []
-    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 init_dummy_fontobj
-    @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
-    Tk_FontID[1].succ!
-    Tk_FontNameTBL[@id] = self
-
-    @latin_desscendant = nil
-    @kanji_desscendant = nil
-
-    case (Tk::TK_VERSION)
-    when /^4\.*/
-      @latinfont = ""
-      @kanjifont = ""
-      if JAPANIZED_TK
-        @compoundfont = [[@latinfont], [@kanjifont]]
-        @fontslot = {'font'=>@latinfont, 'kanjifont'=>@kanjifont}
-      else
-        @compoundfont = @latinfont
-        @fontslot = {'font'=>@latinfont}
-      end
-    else
-      @latinfont = @id + 'l'
-      @kanjifont = @id + 'k'
-      @compoundfont = @id + 'c'
-
-      if JAPANIZED_TK
-        tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
-        tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
-        tk_call('font', 'create', @compoundfont, 
-                '-compound', [@latinfont, @kanjifont])
-      else
-        tk_call('font', 'create', @latinfont)
-        tk_call('font', 'create', @kanjifont)
-        tk_call('font', 'create', @compoundfont)
-      end
-
-      @fontslot = {'font'=>@compoundfont}
-    end
-
-    self
-  end
-
-  def initialize(ltn=nil, knj=nil, keys=nil)
-    ltn = '{}' if ltn == ''
-    knj = '{}' if knj == ''
-
-    # @id = Tk_FontID.join('')
-    @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
-    Tk_FontID[1].succ!
-    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
-
-    if ltn
-      if JAPANIZED_TK && !knj
-        if Tk::TK_VERSION =~ /^4.*/
-          knj = DEFAULT_KANJI_FONT_NAME
-        else
-          knj = ltn 
-        end
-      end
-    else
-      ltn = DEFAULT_LATIN_FONT_NAME
-      knj = DEFAULT_KANJI_FONT_NAME if JAPANIZED_TK && !knj
-    end
-
-    create_compoundfont(ltn, knj, keys)
-  end
-
-  def initialize_copy(font)
-    unless font.kind_of?(TkFont)
-      fail TypeError, '"initialize_copy should take same class object'
-    end
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      keys = {}
-      font.configinfo.each{|key,value| keys[key] = value }
-      initialize(font.latin_font_id, font.kanji_font_id, keys)
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      initialize(font.latin_font_id, font.kanji_font_id, font.configinfo)
-    end
-  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: '*'
-    slant    = (info = font['slant']   .to_s)?  info: '*'
-    swidth   = (info = font['swidth']  .to_s)?  info: '*'
-    adstyle  = (info = font['adstyle'] .to_s)?  info: '*'
-    pixels   = (info = font['pixels']  .to_s)?  info: '*'
-    points   = (info = font['points']  .to_s)?  info: '*'
-    resx     = (info = font['resx']    .to_s)?  info: '*'
-    resy     = (info = font['resy']    .to_s)?  info: '*'
-    space    = (info = font['space']   .to_s)?  info: '*'
-    avgWidth = (info = font['avgWidth'].to_s)?  info: '*'
-    charset  = (info = font['charset'] .to_s)?  info: '*'
-    encoding = (info = font['encoding'].to_s)?  info: '*'
-
-    [foundry, family, weight, slant, swidth, adstyle,
-      pixels, points, resx, resy, space, avgWidth, charset, encoding]
-  end
-
-  def create_latinfont_tk4x(font)
-    if font.kind_of? Hash
-      @latinfont = '-' + _get_font_info_from_hash(font).join('-') + '-'
-
-    elsif font.kind_of? Array
-      finfo = {}
-      finfo['family'] = font[0].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'] = '13'
-        end
-      end
-      font[2..-1].each{|style|
-        case (style)
-        when 'normal'
-          finfo['weight'] = style
-        when 'bold'
-          finfo['weight'] = style
-        when 'roman'
-          finfo['slant'] = 'r'
-        when 'italic'
-          finfo['slant'] = 'i'
-        end
-      }
-
-      @latinfont = '-' + _get_font_info_from_hash(finfo).join('-') + '-'
-
-    elsif font.kind_of? TkFont
-      @latinfont = font.latin_font
-
-    else
-      if font
-        @latinfont = font
-      else
-        @latinfont = DEFAULT_LATIN_FONT_NAME
-      end
-
-    end
-  end
-
-  def create_kanjifont_tk4x(font)
-    unless JAPANIZED_TK
-      @kanjifont = ""
-      return
-    end
-
-    if font.kind_of? Hash
-      @kanjifont = '-' + _get_font_info_from_hash(font).join('-') + '-'
-
-    elsif font.kind_of? Array
-      finfo = {}
-      finfo['family'] = font[0].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'] = '13'
-        end
-      end
-      font[2..-1].each{|style|
-        case (style)
-        when 'normal'
-          finfo['weight'] = style
-        when 'bold'
-          finfo['weight'] = style
-        when 'roman'
-          finfo['slant'] = 'r'
-        when 'italic'
-          finfo['slant'] = 'i'
-        end
-      }
-
-      @kanjifont = '-' + _get_font_info_from_hash(finfo).join('-') + '-'
-    elsif font.kind_of? TkFont
-      @kanjifont = font.kanji_font_id
-    else
-      if font
-        @kanjifont = font
-      else
-        @kanjifont = DEFAULT_KANJI_FONT_NAME
-      end
-    end
-  end
-
-  def create_compoundfont_tk4x(ltn, knj, keys)
-    create_latinfont(ltn)
-    create_kanjifont(knj)
-
-    if JAPANIZED_TK
-      @compoundfont = [[@latinfont], [@kanjifont]]
-      @fontslot = {'font'=>@latinfont, 'kanjifont'=>@kanjifont}
-    else
-      @compoundfont = @latinfont
-      @fontslot = {'font'=>@latinfont}
-    end
-  end
-
-  def create_latinfont_tk8x(font)
-    @latinfont = @id + 'l'
-
-    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
-      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')
-      end
-    else
-      if font.kind_of? Hash
-        tk_call('font', 'create', @latinfont, *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.latin_font).each{|key,val| keys[key] = val}
-        elsif font
-          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)
-    @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')
-      else
-        tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
-      end
-      # end of JAPANIZED_TK
-
-    else
-      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_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))
-      end
-
-      if font && @compoundfont
-        keys = {}
-        actual_core(@kanjifont).each{|key,val| keys[key] = val}
-        tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
-      end
-    end
-  end
-
-  def create_compoundfont_tk8x(ltn, knj, keys)
-    if knj
-      create_latinfont(ltn)
-      create_kanjifont(knj)
-    else
-      cfnt = ltn
-      create_kanjifont(cfnt)
-      create_latinfont(cfnt)
-    end
-
-    @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
-    else
-      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
-
-      if knj
-        compoundkeys = nil
-        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
-
-      if cfnt
-        if cfnt.kind_of?(Hash)
-          compoundkeys = cfnt.dup
-        else
-          compoundkeys = {}
-          actual_core(cfnt).each{|key,val| compoundkeys[key] = val}
-        end
-        compoundkeys.update(_symbolkey2str(keys))
-        keys = compoundkeys
-      end
-
-      @fontslot = {'font'=>@compoundfont}
-      tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
-    end
-  end
-
-  ###################################
-  public
-  ###################################
-  def inspect
-    sprintf("#<%s:%0x:%s>", self.class.inspect, self.__id__, @compoundfont)
-  end
-
-  def method_missing(id, *args)
-    name = id.id2name
-    case args.length
-    when 1
-      if name[-1] == ?=
-        configure name[0..-2], args[0]
-        args[0]
-      else
-        configure name, args[0]
-        self
-      end
-    when 0
-      begin
-        configinfo name
-      rescue
-        super(id, *args)
-#        fail NameError, "undefined local variable or method `#{name}' for #{self.to_s}", error_at
-      end
-    else
-      super(id, *args)
-#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
-    end
-  end
-
-  def call_font_configure(path, *args)
-    if path.kind_of?(Array)
-      # [path, optkey]
-      win, tag = path[0].split(';')
-      optkey = path[1].to_s
-    else
-      win, tag, optkey = path.split(';')
-    end
-
-    fontslot = _symbolkey2str(@fontslot)
-    if optkey && optkey != ""
-      ltn = fontslot.delete('font')
-      knj = fontslot.delete('kanjifont')
-      fontslot[optkey] = ltn if ltn
-      fontslot["kanji#{optkey}"] = knj if knj
-    end
-
-    keys = _symbolkey2str(args.pop).update(fontslot)
-    args.concat(hash_kv(keys))
-    tk_call(*args)
-    Tk_FontUseTBL[[win, tag, optkey].join(';')] = self
-    self
-  end
-
-  def used
-    ret = []
-    Tk_FontUseTBL.each{|key,value|
-      next unless self == value
-      if key.include?(';')
-        win, tag, optkey = key.split(';')
-        winobj = tk_tcl2ruby(win)
-        if winobj.kind_of? TkText
-          if optkey
-            ret.push([winobj, winobj.tagid2obj(tag), optkey])
-          else
-            ret.push([winobj, winobj.tagid2obj(tag)])
-          end
-        elsif winobj.kind_of? TkCanvas
-          if (tagobj = TkcTag.id2obj(winobj, tag)).kind_of? TkcTag
-            if optkey
-              ret.push([winobj, tagobj, optkey])
-            else
-              ret.push([winobj, tagobj])
-            end
-          elsif (tagobj = TkcItem.id2obj(winobj, tag)).kind_of? TkcItem
-            if optkey
-              ret.push([winobj, tagobj, optkey])
-            else
-              ret.push([winobj, tagobj])
-            end
-          else
-            if optkey
-              ret.push([winobj, tag, optkey])
-            else
-              ret.push([winobj, tag])
-            end
-          end
-        elsif winobj.kind_of? TkMenu
-          if optkey
-            ret.push([winobj, tag, optkey])
-          else
-            ret.push([winobj, tag])
-          end
-        else
-          if optkey
-            ret.push([win, tag, optkey])
-          else
-            ret.push([win, tag])
-          end
-        end
-      else
-        ret.push(tk_tcl2ruby(key))
-      end
-    }
-    ret
-  end
-
-  def id
-    @id
-  end
-
-  def to_eval
-    font
-  end
-
-  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
-  end
-
-  def kanji_font
-    # @kanjifont
-    if @kanji_descendant
-      @kanji_descendant
-    else
-      @kanji_descendant = DescendantFont.new(self, 'kanji')
-    end
-  end
-  alias kanjifont kanji_font
-
-  def actual(option=nil)
-    actual_core(@compoundfont, nil, option)
-  end
-
-  def actual_displayof(win, option=nil)
-    win = '.' unless win
-    actual_core(@compoundfont, win, option)
-  end
-
-  def latin_actual(option=nil)
-    actual_core(@latinfont, nil, option)
-  end
-
-  def latin_actual_displayof(win, option=nil)
-    win = '.' unless win
-    actual_core(@latinfont, win, option)
-  end
-
-  def kanji_actual(option=nil)
-    #if JAPANIZED_TK
-    if @kanjifont != ""
-      actual_core(@kanjifont, nil, option)
-    else
-      actual_core_tk4x(nil, nil, option)
-    end
-  end
-
-  def kanji_actual_displayof(win, option=nil)
-    #if JAPANIZED_TK
-    if @kanjifont != ""
-      win = '.' unless win
-      actual_core(@kanjifont, win, option)
-    else
-      actual_core_tk4x(nil, win, option)
-    end
-  end
-
-  def [](slot)
-    configinfo slot
-  end
-
-  def []=(slot, val)
-    configure slot, val
-    val
-  end
-
-  def configure(slot, value=None)
-    configure_core(@compoundfont, slot, value)
-    self
-  end
-
-  def configinfo(slot=nil)
-    configinfo_core(@compoundfont, slot)
-  end
-
-  def current_configinfo(slot=nil)
-    current_configinfo_core(@compoundfont, slot)
-  end
-
-  def delete
-    delete_core
-  end
-
-  def latin_configure(slot, value=None)
-    if JAPANIZED_TK
-      configure_core(@latinfont, slot, value)
-    else
-      configure(slot, value)
-    end
-    self
-  end
-
-  def latin_configinfo(slot=nil)
-    if JAPANIZED_TK
-      configinfo_core(@latinfont, slot)
-    else
-      configinfo(slot)
-    end
-  end
-
-  def kanji_configure(slot, value=None)
-    #if JAPANIZED_TK
-    if @kanjifont != ""
-      configure_core(@kanjifont, slot, value)
-      configure('size'=>configinfo('size')) # to reflect new configuration
-    else
-      #""
-      configure(slot, value)
-    end
-    self
-  end
-
-  def kanji_configinfo(slot=nil)
-    #if JAPANIZED_TK
-    if @kanjifont != ""
-      configinfo_core(@kanjifont, slot)
-    else
-      #[]
-      configinfo(slot)
-    end
-  end
-
-  def replace(ltn, knj=None)
-    knj = ltn if knj == None
-    latin_replace(ltn)
-    kanji_replace(knj)
-    self
-  end
-
-  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)
-    measure_core(@compoundfont, nil, text)
-  end
-
-  def measure_displayof(win, text)
-    win = '.' unless win
-    measure_core(@compoundfont, win, text)
-  end
-
-  def metrics(option=nil)
-    metrics_core(@compoundfont, nil, option)
-  end
-
-  def metrics_displayof(win, option=nil)
-    win = '.' unless win
-    metrics_core(@compoundfont, win, option)
-  end
-
-  def latin_metrics(option=nil)
-    metrics_core(@latinfont, nil, option)
-  end
-
-  def latin_metrics_displayof(win, option=nil)
-    win = '.' unless win
-    metrics_core(@latinfont, win, option)
-  end
-
-  def kanji_metrics(option=nil)
-    if JAPANIZED_TK
-      metrics_core(@kanjifont, nil, option)
-    else
-      metrics_core_tk4x(nil, nil, option)
-    end
-  end
-
-  def kanji_metrics_displayof(win, option=nil)
-    if JAPANIZED_TK
-      win = '.' unless win
-      metrics_core(@kanjifont, win, option)
-    else
-      metrics_core_tk4x(nil, win, option)
-    end
-  end
-
-  def reset_pointadjust
-    begin
-      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
-        configure('pointadjust' => latin_actual.assoc('size')[1].to_f / 
-                                      kanji_actual.assoc('size')[1].to_f )
-      end
-    rescue
-    end
-    self
-  end
-
-  ###################################
-  # private alias
-  ###################################
-  case (Tk::TK_VERSION)
-  when /^4\.*/
-    alias create_latinfont        create_latinfont_tk4x
-    alias create_kanjifont        create_kanjifont_tk4x
-    alias create_compoundfont     create_compoundfont_tk4x
-
-  when /^8\.[0-5]/
-    alias create_latinfont        create_latinfont_tk8x
-    alias create_kanjifont        create_kanjifont_tk8x
-    alias create_compoundfont     create_compoundfont_tk8x
-
-  else
-    alias create_latinfont        create_latinfont_tk8x
-    alias create_kanjifont        create_kanjifont_tk8x
-    alias create_compoundfont     create_compoundfont_tk8x
-
-  end
-
-  ###################################
-  # 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
-  alias ascii_configure        latin_configure
-  alias ascii_configinfo       latin_configinfo
-  alias ascii_replace          latin_replace
-  alias ascii_metrics          latin_metrics
-
-  ###################################
-=begin
-  def dup
-    TkFont.new(self)
-  end
-  def clone
-    TkFont.new(self)
-  end
-=end
-end
-
-module TkFont::CoreMethods
-  include Tk
-  extend TkCore
-
-  private
-
-  def actual_core_tk4x(font, win=nil, option=nil)
-    # dummy
-    if option == 'pointadjust' || option == :pointadjust
-        1.0
-    elsif option
-      case TkFont::OptionType[option.to_s]
-      when ?n
-        0
-      when ?b
-        false
-      else
-        ''
-      end
-    else
-      [['family',''], ['size',0], ['weight',''], ['slant',''], 
-        ['underline',false], ['overstrike',false], ['charset',''], 
-        ['pointadjust',0]]
-    end
-  end
-
-  def actual_core_tk8x(font, win=nil, option=nil)
-    font = '{}' if font == ''
-
-    if option == 'compound' || option == :compound
-      ""
-    elsif option
-      if win
-        val = tk_call('font', 'actual', font, 
-                      "-displayof", win, "-#{option}")
-      else
-        val = tk_call('font', 'actual', font, "-#{option}")
-      end
-      case TkFont::OptionType[option.to_s]
-      when ?n
-        num_or_str(val)
-      when ?b
-        bool(val)
-      else
-        val
-      end
-    else
-      l = tk_split_simplelist(if win
-                                 tk_call('font', 'actual', font, 
-                                                     "-displayof", win)
-                              else
-                                 tk_call('font', 'actual', font)
-                              end)
-      r = []
-      while key=l.shift
-        if key == '-compound'
-          l.shift
-        else
-          key = key[1..-1]
-          val = l.shift
-          case TkFont::OptionType[key]
-          when ?n
-            r.push [key, num_or_str(val)]
-          when ?b
-            r.push [key, bool(val)]
-          else
-            r.push [key, val]
-          end
-        end
-      end
-      r
-    end
-  end
-
-  def configure_core_tk4x(font, slot, value=None)
-    #""
-    self
-  end
-
-  def configinfo_core_tk4x(font, option=nil)
-    # dummy
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      if option == 'pointadjust' || option == :pointadjust
-        1.0
-      elsif option
-        case TkFont::OptionType[option.to_s]
-        when ?n
-          0
-        when ?b
-          false
-        else
-          ''
-        end
-      else
-        [['family',''], ['size',0], ['weight',''], ['slant',''], 
-          ['underline',false], ['overstrike',false], ['charset',''], 
-          ['pointadjust',1.0]]
-      end
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      current_configinfo_core_tk4x(font, option)
-    end
-  end
-
-  def current_configinfo_core_tk4x(font, option=nil)
-    if option
-      case TkFont::OptionType[option.to_s]
-      when ?n
-        0
-      when ?b
-        false
-      else
-        ''
-      end
-    else
-      {'family'=>'', 'size'=>0, 'weight'=>'', 'slant'=>'', 
-        'underline'=>false, 'overstrike'=>false, 
-        'charset'=>false, 'pointadjust'=>1.0}
-    end
-  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
-      
-    else
-      tk_call('font', 'configure', font, "-#{slot}", value)
-    end
-    self
-  end
-
-  def configinfo_core_tk8x(font, option=nil)
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      if option == 'compound' || option == :compound
-        ""
-      elsif option
-        val = tk_call('font', 'configure', font, "-#{option}")
-        case TkFont::OptionType[option.to_s]
-        when ?n
-          num_or_str(val)
-        when ?b
-          bool(val)
-        else
-          val
-        end
-      else
-        l = tk_split_simplelist(tk_call('font', 'configure', font))
-        r = []
-        while key=l.shift
-          if key == '-compound'
-            l.shift
-          else
-            key = key[1..-1]
-            val = l.shift
-            case TkFont::OptionType[key]
-            when ?n
-              r.push [key, num_or_str(val)]
-            when ?b
-              r.push [key, bool(val)]
-            else
-              r.push [key, val]
-            end
-          end
-        end
-        r
-      end
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      current_configinfo_core_tk8x(font, option)
-    end
-  end
-
-  def current_configinfo_core_tk8x(font, option=nil)
-    if option == 'compound'
-      ""
-    elsif option
-      val = tk_call('font', 'configure', font, "-#{option}")
-      case TkFont::OptionType[option.to_s]
-      when ?n
-        num_or_str(val)
-      when ?b
-        bool(val)
-      else
-        val
-      end
-    else
-      l = tk_split_simplelist(tk_call('font', 'configure', font))
-      r = {}
-      while key=l.shift
-        if key == '-compound'
-          l.shift
-        else
-          key = key[1..-1]
-          val = l.shift
-          case TkFont::OptionType[key]
-          when ?n
-            r.push [key, num_or_str(val)]
-          when ?b
-            r.push [key, bool(val)]
-          else
-            r.push [key, val]
-          end
-        end
-      end
-      r
-    end
-  end
-
-  def delete_core_tk4x
-    TkFont::Tk_FontNameTBL.delete(@id)
-    TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
-  end
-
-  def delete_core_tk8x
-    begin
-      tk_call('font', 'delete', @latinfont)
-    rescue
-    end
-    begin
-      tk_call('font', 'delete', @kanjifont)
-    rescue
-    end
-    begin
-      tk_call('font', 'delete', @compoundfont)
-    rescue
-    end
-    TkFont::Tk_FontNameTBL.delete(@id)
-    TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
-  end
-
-  def latin_replace_core_tk4x(ltn)
-    create_latinfont_tk4x(ltn)
-    @compoundfont[0] = [@latinfont] if JAPANIZED_TK
-    @fontslot['font'] = @latinfont
-    TkFont::Tk_FontUseTBL.dup.each{|w, fobj|
-      if self == fobj
-        begin
-          if w.include?(';')
-            win, tag, optkey = w.split(';')
-            optkey = 'font' if optkey == nil || optkey == ''
-            winobj = tk_tcl2ruby(win)
-#           winobj.tagfont_configure(tag, {'font'=>@latinfont})
-            if winobj.kind_of? TkText
-              tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @latinfont)
-            elsif winobj.kind_of? TkCanvas
-              tk_call(win, 'itemconfigure', tag, "-#{optkey}", @latinfont)
-            elsif winobj.kind_of? TkMenu
-              tk_call(win, 'entryconfigure', tag, "-#{optkey}", @latinfont)
-            else
-              raise RuntimeError, "unknown widget type"
-            end
-          else
-#           tk_tcl2ruby(w).font_configure('font'=>@latinfont)
-            tk_call(w, 'configure', '-font', @latinfont)
-          end
-        rescue
-          TkFont::Tk_FontUseTBL.delete(w)
-        end
-      end
-    }
-    self
-  end
-
-  def kanji_replace_core_tk4x(knj)
-    return self unless JAPANIZED_TK
-
-    create_kanjifont_tk4x(knj)
-    @compoundfont[1] = [@kanjifont]
-    @fontslot['kanjifont'] = @kanjifont
-    TkFont::Tk_FontUseTBL.dup.each{|w, fobj|
-      if self == fobj
-        begin
-          if w.include?(';')
-            win, tag, optkey = w.split(';')
-            optkey = 'kanjifont' unless optkey
-            winobj = tk_tcl2ruby(win)
-#           winobj.tagfont_configure(tag, {'kanjifont'=>@kanjifont})
-            if winobj.kind_of? TkText
-              tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @kanjifont)
-            elsif winobj.kind_of? TkCanvas
-              tk_call(win, 'itemconfigure', tag, "-#{optkey}", @kanjifont)
-            elsif winobj.kind_of? TkMenu
-              tk_call(win, 'entryconfigure', tag, "-#{optkey}", @latinfont)
-            else
-              raise RuntimeError, "unknown widget type"
-            end
-          else
-#           tk_tcl2ruby(w).font_configure('kanjifont'=>@kanjifont)
-            tk_call(w, 'configure', '-kanjifont', @kanjifont)
-          end
-        rescue
-          TkFont::Tk_FontUseTBL.delete(w)
-        end
-      end
-    }
-    self
-  end
-
-  def latin_replace_core_tk8x(ltn)
-    ltn = '{}' if 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 = TkFont::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)
-    knj = '{}' if 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 = TkFont::DEFAULT_KANJI_FONT_NAME
-      end
-    end
-
-    begin
-      tk_call('font', 'delete', @kanjifont)
-    rescue
-    end
-    create_kanjifont(knj)
-
-    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
-      end
-    end    
-    self
-  end
-
-  def measure_core_tk4x(font, win, text)
-    0
-  end
-
-  def measure_core_tk8x(font, win, text)
-    font = '{}' if font == ''
-
-    if win
-      number(tk_call('font', 'measure', font, 
-                     '-displayof', win, text))
-    else
-      number(tk_call('font', 'measure', font, text))
-    end
-  end
-
-  def metrics_core_tk4x(font, win, option=nil)
-    # dummy
-    if option
-      ""
-    else
-      [['ascent',[]], ['descent',[]], ['linespace',[]], ['fixed',[]]]
-    end
-  end
-
-  def metrics_core_tk8x(font, win, option=nil)
-    font = '{}' if font == ''
-
-    if option
-      if win
-        number(tk_call('font', 'metrics', font, 
-                       "-displayof", win, "-#{option}"))
-      else
-        number(tk_call('font', 'metrics', font, "-#{option}"))
-      end
-    else
-      l = tk_split_list(if win
-                          tk_call('font','metrics',font,"-displayof",win)
-                        else
-                          tk_call('font','metrics',font)
-                        end)
-      r = []
-      while key=l.shift
-        r.push [key[1..-1], l.shift.to_i]
-      end
-      r
-    end
-  end
-
-  ###################################
-  # private alias
-  ###################################
-  case (Tk::TK_VERSION)
-  when /^4\.*/
-    alias actual_core             actual_core_tk4x
-    alias configure_core          configure_core_tk4x
-    alias configinfo_core         configinfo_core_tk4x
-    alias current_configinfo_core current_configinfo_core_tk4x
-    alias delete_core             delete_core_tk4x
-    alias latin_replace_core      latin_replace_core_tk4x
-    alias kanji_replace_core      kanji_replace_core_tk4x
-    alias measure_core            measure_core_tk4x
-    alias metrics_core            metrics_core_tk4x
-
-  when /^8\.[0-5]/
-    alias actual_core             actual_core_tk8x
-    alias configure_core          configure_core_tk8x
-    alias configinfo_core         configinfo_core_tk8x
-    alias current_configinfo_core current_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 measure_core            measure_core_tk8x
-    alias metrics_core            metrics_core_tk8x
-
-  else
-    alias actual_core             actual_core_tk8x
-    alias configure_core          configure_core_tk8x
-    alias configinfo_core         configinfo_core_tk8x
-    alias current_configinfo_core current_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 measure_core            measure_core_tk8x
-    alias metrics_core            metrics_core_tk8x
-
-  end
-end
-
-class TkFont
-  include TkFont::CoreMethods
-  extend  TkFont::CoreMethods
-end
diff --git a/ext/tk/lib/tk/frame.rb b/ext/tk/lib/tk/frame.rb
deleted file mode 100644
index 6636fef5b5..0000000000
--- a/ext/tk/lib/tk/frame.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# tk/frame.rb : treat frame widget
-#
-require 'tk'
-
-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
-#################
-
-  def __boolval_optkeys
-    super() << 'container'
-  end
-  private :__boolval_optkeys
-
-  def initialize(parent=nil, keys=nil)
-    my_class_name = nil
-    if self.class < WidgetClassNames[self.class::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}
-      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_without_enc('frame', @path, *hash_kv(keys))
-  #  else
-  #    tk_call_without_enc( 'frame', @path)
-  #  end
-  #end
-  #private :create_self
-
-  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, &b)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args, &b)
-    else
-      TkDatabaseClass.new(self.name).bind(*args, &b)
-    end
-  end
-  def self.bind_append(*args, &b)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args, &b)
-    else
-      TkDatabaseClass.new(self.name).bind_append(*args, &b)
-    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
diff --git a/ext/tk/lib/tk/grid.rb b/ext/tk/lib/tk/grid.rb
deleted file mode 100644
index 10fdf3569b..0000000000
--- a/ext/tk/lib/tk/grid.rb
+++ /dev/null
@@ -1,220 +0,0 @@
-#
-# tk/grid.rb : control grid geometry manager
-#
-require 'tk'
-
-module TkGrid
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['grid'.freeze].freeze
-
-  def anchor(master, anchor=None)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    tk_call_without_enc('grid', 'anchor', master, anchor)
-  end
-
-  def bbox(master, *args)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    args.unshift(master)
-    list(tk_call_without_enc('grid', 'bbox', *args))
-  end
-
-  def configure(win, *args)
-    if args[-1].kind_of?(Hash)
-      opts = args.pop
-    else
-      opts = {}
-    end
-    params = []
-    params.push(_epath(win))
-    args.each{|win|
-      case win
-      when '-', 'x', '^'  # RELATIVE PLACEMENT
-        params.push(win)
-      else
-        params.push(_epath(win))
-      end
-    }
-    opts.each{|k, v|
-      params.push("-#{k}")
-      params.push((v.kind_of?(TkObject))? v.epath: v)
-    }
-    if Tk::TCL_MAJOR_VERSION < 8 ||
-        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION <= 3)
-      if params[0] == '-' || params[0] == 'x' || params[0] == '^'
-        tk_call_without_enc('grid', *params)
-      else
-        tk_call_without_enc('grid', 'configure', *params)
-      end
-    else
-      tk_call_without_enc('grid', 'configure', *params)
-    end
-  end
-  alias grid configure
-
-  def columnconfigure(master, index, args)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    tk_call_without_enc("grid", 'columnconfigure', 
-                        master, index, *hash_kv(args))
-  end
-
-  def rowconfigure(master, index, args)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    tk_call_without_enc("grid", 'rowconfigure', master, index, *hash_kv(args))
-  end
-
-  def columnconfiginfo(master, index, slot=nil)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    if slot
-      case slot
-      when 'uniform', :uniform
-        tk_call_without_enc('grid', 'columnconfigure', 
-                            master, index, "-#{slot}")
-      else
-        num_or_str(tk_call_without_enc('grid', 'columnconfigure', 
-                                       master, index, "-#{slot}"))
-      end
-    else
-      #ilist = list(tk_call_without_enc('grid','columnconfigure',master,index))
-      ilist = simplelist(tk_call_without_enc('grid', 'columnconfigure', 
-                                             master, index))
-      info = {}
-      while key = ilist.shift
-        case key
-        when 'uniform'
-          info[key[1..-1]] = ilist.shift
-        else
-          info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
-        end
-      end
-      info
-    end
-  end
-
-  def rowconfiginfo(master, index, slot=nil)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    if slot
-      case slot
-      when 'uniform', :uniform
-        tk_call_without_enc('grid', 'rowconfigure', 
-                            master, index, "-#{slot}")
-      else
-        num_or_str(tk_call_without_enc('grid', 'rowconfigure', 
-                                       master, index, "-#{slot}"))
-      end
-    else
-      #ilist = list(tk_call_without_enc('grid', 'rowconfigure', master, index))
-      ilist = simplelist(tk_call_without_enc('grid', 'rowconfigure', 
-                                             master, index))
-      info = {}
-      while key = ilist.shift
-        case key
-        when 'uniform'
-          info[key[1..-1]] = ilist.shift
-        else
-          info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
-        end
-      end
-      info
-    end
-  end
-
-  def add(widget, *args)
-    configure(widget, *args)
-  end
-
-  def forget(*args)
-    return '' if args.size == 0
-    wins = args.collect{|win|
-      # (win.kind_of?(TkObject))? win.epath: win
-      _epath(win)
-    }
-    tk_call_without_enc('grid', 'forget', *wins)
-  end
-
-  def info(slave)
-    # slave = slave.epath if slave.kind_of?(TkObject)
-    slave = _epath(slave)
-    #ilist = list(tk_call_without_enc('grid', 'info', slave))
-    ilist = simplelist(tk_call_without_enc('grid', 'info', slave))
-    info = {}
-    while key = ilist.shift
-      #info[key[1..-1]] = ilist.shift
-      info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
-    end
-    return info
-  end
-
-  def location(master, x, y)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    list(tk_call_without_enc('grid', 'location', master, x, y))
-  end
-
-  def propagate(master, mode=None)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    if mode == None
-      bool(tk_call_without_enc('grid', 'propagate', master))
-    else
-      tk_call_without_enc('grid', 'propagate', master, mode)
-    end
-  end
-
-  def remove(*args)
-    return '' if args.size == 0
-    wins = args.collect{|win|
-      # (win.kind_of?(TkObject))? win.epath: win
-      _epath(win)
-    }
-    tk_call_without_enc('grid', 'remove', *wins)
-  end
-
-  def size(master)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    list(tk_call_without_enc('grid', 'size', master))
-  end
-
-  def slaves(master, args)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    list(tk_call_without_enc('grid', 'slaves', master, *hash_kv(args)))
-  end
-
-  module_function :bbox, :forget, :propagate, :info
-  module_function :remove, :size, :slaves, :location
-  module_function :grid, :configure, :columnconfigure, :rowconfigure
-  module_function :columnconfiginfo, :rowconfiginfo
-end
-=begin
-def TkGrid(win, *args)
-  if args[-1].kind_of?(Hash)
-    opts = args.pop
-  else
-    opts = {}
-  end
-  params = []
-  params.push((win.kind_of?(TkObject))? win.epath: win)
-  args.each{|win|
-    case win
-    when '-', 'x', '^'  # RELATIVE PLACEMENT
-      params.push(win)
-    else
-      params.push((win.kind_of?(TkObject))? win.epath: win)
-    end
-  }
-  opts.each{|k, v|
-    params.push("-#{k}")
-    params.push((v.kind_of?(TkObject))? v.epath: v)
-  }
-  tk_call_without_enc("grid", *params)
-end
-=end
diff --git a/ext/tk/lib/tk/image.rb b/ext/tk/lib/tk/image.rb
deleted file mode 100644
index 35e2c4e394..0000000000
--- a/ext/tk/lib/tk/image.rb
+++ /dev/null
@@ -1,237 +0,0 @@
-#
-# tk/image.rb : treat Tk image objects
-#
-
-require 'tk'
-
-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 }
-
-  def self.new(keys=nil)
-    if keys.kind_of?(Hash)
-      name = nil
-      if keys.key?(:imagename)
-        name = keys[:imagename]
-      elsif keys.key?('imagename')
-        name = keys['imagename']
-      end
-      if name
-        if name.kind_of?(TkImage)
-          obj = name
-        else
-          name = _get_eval_string(name)
-          obj = Tk_IMGTBL[name]
-        end
-        if obj
-          if !(keys[:without_creating] || keys['without_creating'])
-            keys = _symbolkey2str(keys)
-            keys.delete('imagename')
-            keys.delete('without_creating')
-            obj.instance_eval{
-              tk_call_without_enc('image', 'create', 
-                                  @type, @path, *hash_kv(keys, true))
-            }
-          end
-          return obj
-        end
-      end
-    end
-    super(keys)
-  end
-
-  def initialize(keys=nil)
-    @path = nil
-    without_creating = false
-    if keys.kind_of?(Hash)
-      keys = _symbolkey2str(keys)
-      @path = keys.delete('imagename')
-      without_creating = keys.delete('without_creating')
-    end
-    unless @path
-      # @path = Tk_Image_ID.join('')
-      @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
-      Tk_Image_ID[1].succ!
-    end
-    unless without_creating
-      tk_call_without_enc('image', 'create', 
-                          @type, @path, *hash_kv(keys, true))
-    end
-    Tk_IMGTBL[@path] = self
-  end
-
-  def delete
-    Tk_IMGTBL.delete(@id) if @id
-    tk_call_without_enc('image', 'delete', @path)
-    self
-  end
-  def height
-    number(tk_call_without_enc('image', 'height', @path))
-  end
-  def inuse
-    bool(tk_call_without_enc('image', 'inuse', @path))
-  end
-  def itemtype
-    tk_call_without_enc('image', 'type', @path)
-  end
-  def width
-    number(tk_call_without_enc('image', 'width', @path))
-  end
-
-  def TkImage.names
-    Tk.tk_call_without_enc('image', 'names').split.collect!{|id|
-      (Tk_IMGTBL[id])? Tk_IMGTBL[id] : id
-    }
-  end
-
-  def TkImage.types
-    Tk.tk_call_without_enc('image', 'types').split
-  end
-end
-
-class TkBitmapImage<TkImage
-  def __strval_optkeys
-    super() + ['maskdata', 'maskfile']
-  end
-  private :__strval_optkeys
-
-  def initialize(*args)
-    @type = 'bitmap'
-    super(*args)
-  end
-end
-
-class TkPhotoImage<TkImage
-  NullArgOptionKeys = [ "shrink", "grayscale" ]
-
-  def _photo_hash_kv(keys)
-    keys = _symbolkey2str(keys)
-    NullArgOptionKeys.collect{|opt|
-      if keys[opt]
-        keys[opt] = None
-      else
-        keys.delete(opt)
-      end
-    }
-    keys.collect{|k,v|
-      ['-' << k, v]
-    }.flatten
-  end
-  private :_photo_hash_kv
-
-  def initialize(*args)
-    @type = 'photo'
-    super(*args)
-  end
-
-  def blank
-    tk_send_without_enc('blank')
-    self
-  end
-
-  def cget(option)
-    case option.to_s
-    when 'data', 'file'
-      tk_send 'cget', '-' << option.to_s
-    else
-      tk_tcl2ruby(tk_send('cget', '-' << option.to_s))
-    end
-  end
-
-  def copy(src, *opts)
-    if opts.size == 0
-      tk_send('copy', src)
-    elsif opts.size == 1 && opts[0].kind_of?(Hash)
-      tk_send('copy', src, *_photo_hash_kv(opts[0]))
-    else
-      # for backward compatibility
-      args = opts.collect{|term|
-        if term.kind_of?(String) && term.include?(?\s)
-          term.split
-        else
-          term
-        end
-      }.flatten
-      tk_send('copy', src, *args)
-    end
-    self
-  end
-
-  def data(keys={})
-    #tk_send('data', *_photo_hash_kv(keys))
-    tk_split_list(tk_send('data', *_photo_hash_kv(keys)))
-  end
-
-  def get(x, y)
-    tk_send('get', x, y).split.collect{|n| n.to_i}
-  end
-
-  def put(data, *opts)
-    if opts == []
-      tk_send('put', data)
-    elsif opts.size == 1 && opts[0].kind_of?(Hash)
-      tk_send('put', data, *_photo_hash_kv(opts[0]))
-    else
-      # for backward compatibility
-      tk_send('put', data, '-to', *opts)
-    end
-    self
-  end
-
-  def read(file, *opts)
-    if opts.size == 0
-      tk_send('read', file)
-    elsif opts.size == 1 && opts[0].kind_of?(Hash)
-      tk_send('read', file, *_photo_hash_kv(opts[0]))
-    else
-      # for backward compatibility
-      args = opts.collect{|term|
-        if term.kind_of?(String) && term.include?(?\s)
-          term.split
-        else
-          term
-        end
-      }.flatten
-      tk_send('read', file, *args)
-    end
-    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)
-    if opts.size == 0
-      tk_send('write', file)
-    elsif opts.size == 1 && opts[0].kind_of?(Hash)
-      tk_send('write', file, *_photo_hash_kv(opts[0]))
-    else
-      # for backward compatibility
-      args = opts.collect{|term|
-        if term.kind_of?(String) && term.include?(?\s)
-          term.split
-        else
-          term
-        end
-      }.flatten
-      tk_send('write', file, *args)
-    end
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/itemconfig.rb b/ext/tk/lib/tk/itemconfig.rb
deleted file mode 100644
index 0b84be38b8..0000000000
--- a/ext/tk/lib/tk/itemconfig.rb
+++ /dev/null
@@ -1,1056 +0,0 @@
-#
-# tk/itemconfig.rb : control item/tag configuration of widget
-#
-require 'tk'
-require 'tkutil'
-require 'tk/itemfont.rb'
-
-module TkItemConfigOptkeys
-  include TkUtil
-
-  def __item_numval_optkeys(id)
-    []
-  end
-  private :__item_numval_optkeys
-
-  def __item_numstrval_optkeys(id)
-    []
-  end
-  private :__item_numstrval_optkeys
-
-  def __item_boolval_optkeys(id)
-    ['exportselection', 'jump', 'setgrid', 'takefocus']
-  end
-  private :__item_boolval_optkeys
-
-  def __item_strval_optkeys(id)
-    # maybe need to override
-    [
-      'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile', 
-      'activebackground', 'activeforeground', 'background', 
-      'disabledforeground', 'disabledbackground', 'foreground', 
-      'highlightbackground', 'highlightcolor', 'insertbackground', 
-      'selectbackground', 'selectforeground', 'troughcolor'
-    ]
-  end
-  private :__item_strval_optkeys
-
-  def __item_listval_optkeys(id)
-    []
-  end
-  private :__item_listval_optkeys
-
-  def __item_numlistval_optkeys(id)
-    # maybe need to override
-    ['dash', 'activedash', 'disableddash']
-  end
-  private :__item_numlistval_optkeys
-
-  def __item_tkvariable_optkeys(id)
-    ['variable', 'textvariable']
-  end
-  private :__item_tkvariable_optkeys
-
-  def __item_val2ruby_optkeys(id)  # { key=>method, ... }
-    # The method is used to convert a opt-value to a ruby's object.
-    # When get the value of the option "key", "method.call(id, val)" is called.
-    {}
-  end
-  private :__item_val2ruby_optkeys
-
-  def __item_ruby2val_optkeys(id)  # { key=>method, ... }
-    # The method is used to convert a ruby's object to a opt-value.
-    # When set the value of the option "key", "method.call(id, val)" is called.
-    # That is, "-#{key} #{method.call(id, value)}".
-    {}
-  end
-  private :__item_ruby2val_optkeys
-
-  def __item_methodcall_optkeys(id)  # { key=>method, ... }
-    # Use the method for both of get and set.
-    # Usually, the 'key' will not be a widget option.
-    #
-    # maybe need to override
-    # {'coords'=>'coords'}
-    {}
-  end
-  private :__item_methodcall_optkeys
-
-  ################################################
-
-  def __item_keyonly_optkeys(id)  # { def_key=>(undef_key|nil), ... }
-    # maybe need to override
-    {}
-  end
-  private :__item_keyonly_optkeys
-
-
-  def __conv_item_keyonly_opts(id, keys)
-    return keys unless keys.kind_of?(Hash)
-    keyonly = __item_keyonly_optkeys(id)
-    keys2 = {}
-    keys.each{|k, v|
-      optkey = keyonly.find{|kk,vv| kk.to_s == k.to_s}
-      if optkey
-        defkey, undefkey = optkey
-        if v
-          keys2[defkey.to_s] = None
-        else
-          keys2[undefkey.to_s] = None
-        end
-      else
-        keys2[k.to_s] = v
-      end
-    }
-    keys2
-  end
-
-  def itemconfig_hash_kv(id, keys, enc_mode = nil, conf = nil)
-    hash_kv(__conv_item_keyonly_opts(id, keys), enc_mode, conf)
-  end
-end
-
-module TkItemConfigMethod
-  include TkUtil
-  include TkTreatItemFont
-  include TkItemConfigOptkeys
-
-  def __item_cget_cmd(id)
-    # maybe need to override
-    [self.path, 'itemcget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    # maybe need to override
-    [self.path, 'itemconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def __item_confinfo_cmd(id)
-    # maybe need to override
-    __item_config_cmd(id)
-  end
-  private :__item_confinfo_cmd
-
-  def __item_configinfo_struct(id)
-    # maybe need to override
-    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2, 
-      :default_value=>3, :current_value=>4}
-  end
-  private :__item_configinfo_struct
-
-  ################################################
-
-  def tagid(tagOrId)
-    # maybe need to override
-    tagOrId
-  end
-
-  ################################################
-
-  def itemcget(tagOrId, option)
-    orig_opt = option
-    option = option.to_s
-
-    if option.length == 0
-      fail ArgumentError, "Invalid option `#{orig_opt.inspect}'"
-    end
-
-    if ( method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[option] )
-      optval = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
-      begin
-        return method.call(tagOrId, optval)
-      rescue => e
-        warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-        return optval
-      end
-    end
-
-    if ( method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[option] )
-      return self.__send__(method, tagOrId)
-    end
-
-    case option
-    when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-      begin
-        number(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
-      rescue
-        nil
-      end
-
-    when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-      num_or_str(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
-
-    when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-      begin
-        bool(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
-      rescue
-        nil
-      end
-
-    when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-      simplelist(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
-
-    when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-      conf = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
-      if conf =~ /^[0-9]/
-        list(conf)
-      else
-        conf
-      end
-
-    when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-      v = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
-      (v.empty?)? nil: TkVarAccess.new(v)
-
-    when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-      _fromUTF8(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
-
-    when /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/
-      fontcode = $1
-      fontkey  = $2
-      fnt = tk_tcl2ruby(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{fontkey}")), true)
-      unless fnt.kind_of?(TkFont)
-        fnt = tagfontobj(tagid(tagOrId), fontkey)
-      end
-      if fontcode == 'kanji' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-        # obsolete; just for compatibility
-        fnt.kanji_font
-      else
-        fnt
-      end
-    else
-      tk_tcl2ruby(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")), true)
-    end
-  end
-
-  def itemconfigure(tagOrId, slot, value=None)
-    if slot.kind_of? Hash
-      slot = _symbolkey2str(slot)
-
-      __item_methodcall_optkeys(tagid(tagOrId)).each{|key, method|
-        value = slot.delete(key.to_s)
-        self.__send__(method, tagOrId, value) if value
-      }
-
-      __item_ruby2val_optkeys(tagid(tagOrId)).each{|key, method|
-        key = key.to_s
-        slot[key] = method.call(tagOrId, slot[key]) if slot.has_key?(key)
-      }
-
-      __item_keyonly_optkeys(tagid(tagOrId)).each{|defkey, undefkey|
-        conf = slot.find{|kk, vv| kk == defkey.to_s}
-        if conf
-          k, v = conf
-          if v
-            slot[k] = None
-          else
-            slot[undefkey.to_s] = None if undefkey
-            slot.delete(k)
-          end
-        end
-      }
-
-      if (slot.find{|k, v| k =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/})
-        tagfont_configure(tagid(tagOrId), slot)
-      elsif slot.size > 0
-        tk_call(*(__item_config_cmd(tagid(tagOrId)).concat(hash_kv(slot))))
-      end
-
-    else
-      orig_slot = slot
-      slot = slot.to_s
-      if slot.length == 0
-        fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
-      end
-
-      if ( conf = __item_keyonly_optkeys(tagid(tagOrId)).find{|k, v| k.to_s == slot } )
-        defkey, undefkey = conf
-        if value
-          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{defkey}"))
-        elsif undefkey
-          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{undefkey}"))
-        end
-      elsif ( method = _symbolkey2str(__item_ruby2val_optkeys(tagid(tagOrId)))[slot] )
-        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{slot}" << method.call(tagOrId, value)))
-      elsif ( method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot] )
-        self.__send__(method, tagOrId, value)
-      elsif (slot =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
-        if value == None
-          tagfontobj(tagid(tagOrId), $2)
-        else
-          tagfont_configure(tagid(tagOrId), {slot=>value})
-        end
-      else
-        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{slot}" << value))
-      end
-    end
-    self
-  end
-
-  def itemconfiginfo(tagOrId, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
-        fontkey  = $2
-        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
-        conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}")), false, true)
-        conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
-          conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-        if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
-            || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-          conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), fontkey)
-        elsif ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-               && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
-               && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
-          conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
-            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-        end
-        conf
-      else
-        if slot
-          slot = slot.to_s
-          case slot
-          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              begin
-                val = method.call(tagOrId, optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-              begin
-                val = method.call(tagOrId, optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}lcall(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
-            end
-
-          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
-            return [slot, '', '', '', self.__send__(method, tagOrId)]
-
-          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              if v.empty?
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              else
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-              if v.empty?
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              else
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
-              end
-            end
-
-          else
-            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
-          end
-          conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
-            conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-
-          if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-              && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
-              && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
-            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
-              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-          end
-
-          conf
-
-        else
-          # ret = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))))).collect{|conflist|
-          #   conf = tk_split_simplelist(conflist)
-          ret = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false).collect{|conflist|
-            conf = tk_split_simplelist(conflist, false, true)
-            conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
-              conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-
-            optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
-            case optkey
-            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-                begin
-                  val = method(tagOrId, optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                begin
-                  val = method.call(tagOrId, optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
-              end
-
-            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-              # do nothing
-
-            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-                if v.empty?
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                if v.empty?
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new
-                end
-              end
-
-            else
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                if conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]) 
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]) 
-                end
-              end
-              if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]) 
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]) 
-                end
-              end
-            end
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-                && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
-                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-            end
-
-            conf
-          }
-
-          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
-            optkey = optkey.to_s
-            fontconf = ret.assoc(optkey)
-            if fontconf && fontconf.size > 2
-              ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
-              fontconf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), optkey)
-              ret.push(fontconf)
-            end
-          }
-
-          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
-            ret << [optkey.to_s, '', '', '', self.__send__(method, tagOrId)]
-          }
-
-          ret
-        end
-      end
-
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
-        fontkey  = $2
-        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
-        conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}")), false, true)
-        conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
-          conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-
-        if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
-            || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-          conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = fontobj(tagid(tagOrId), fontkey)
-          { conf.shift => conf }
-        elsif ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-               && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-          if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
-            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
-              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-          end
-          { conf[0] => conf[1] }
-        else
-          { conf.shift => conf }
-        end
-      else
-        if slot
-          slot = slot.to_s
-          case slot
-          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              begin
-                val = method.call(tagOrId, optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-              begin
-                val = method.call(tagOrId, optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
-            end
-
-          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
-            return {slot => ['', '', '', self.__send__(method, tagOrId)]}
-
-          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                num_or_stre(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              if v.empty?
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              else
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-              if v.empty?
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              else
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
-              end
-            end
-
-          else
-            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
-          end
-          conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
-            conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-
-          if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-              && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-            if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
-              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
-                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-            end
-            { conf[0] => conf[1] }
-          else
-            { conf.shift => conf }
-          end
-
-        else
-          ret = {}
-          # tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))))).each{|conflist|
-          #   conf = tk_split_simplelist(conflist)
-          tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false).each{|conflist|
-            conf = tk_split_simplelist(conflist, false, true)
-            conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
-              conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-
-            optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
-            case optkey
-            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-                begin
-                  val = method.call(tagOrId, optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                begin
-                  val = method.call(tagOrId, optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
-              end
-
-            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-              # do nothing
-
-            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-                if v.empty?
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                if v.empty?
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
-                end
-              end
-
-            else
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                if conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]) 
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
-                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                end
-              end
-              if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]) 
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
-                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                end
-              end
-            end
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-                && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-              if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
-                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-              end
-              ret[conf[0]] = conf[1]
-            else
-              ret[conf.shift] = conf
-            end
-          }
-
-          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
-            optkey = optkey.to_s
-            fontconf = ret[optkey]
-            if fontconf.kind_of?(Array)
-              ret.delete(optkey)
-              ret.delete('latin' << optkey)
-              ret.delete('ascii' << optkey)
-              ret.delete('kanji' << optkey)
-              fontconf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), optkey)
-              ret[optkey] = fontconf
-            end
-          }
-
-          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
-            ret[optkey.to_s] = ['', '', '', self.__send__(method, tagOrId)]
-          }
-
-          ret
-        end
-      end
-    end
-  end
-
-  def current_itemconfiginfo(tagOrId, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        org_slot = slot
-        begin
-          conf = itemconfiginfo(tagOrId, slot)
-          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
-              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-            return {conf[0] => conf[-1]}
-          end
-          slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
-        end while(org_slot != slot)
-        fail RuntimeError, 
-          "there is a configure alias loop about '#{org_slot}'"
-      else
-        ret = {}
-        itemconfiginfo(tagOrId).each{|conf|
-          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
-              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-            ret[conf[0]] = conf[-1]
-          end
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      itemconfiginfo(slot).each{|key, conf|     
-        ret[key] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-end
diff --git a/ext/tk/lib/tk/itemfont.rb b/ext/tk/lib/tk/itemfont.rb
deleted file mode 100644
index ab9e3ff6c9..0000000000
--- a/ext/tk/lib/tk/itemfont.rb
+++ /dev/null
@@ -1,300 +0,0 @@
-#
-# tk/itemfont.rb : control font of widget items
-#
-require 'tk'
-
-module TkItemFontOptkeys
-  def __item_font_optkeys(id)
-    # maybe need to override
-    ['font']
-  end
-  private :__item_font_optkeys
-end
-
-module TkTreatItemFont
-  include TkItemFontOptkeys
-
-  def __item_pathname(id)
-    # maybe need to override
-    [self.path, id].join(';')
-  end
-  private :__item_pathname
-
-  ################################################
-
-  def tagfont_configinfo(tagOrId, key = nil)
-    optkeys = __item_font_optkeys(tagid(tagOrId))
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
-
-    win, tag = __item_pathname(tagid(tagOrId)).split(';')
-
-    if key
-      pathname = [win, tag, key].join(';')
-      TkFont.used_on(pathname) || 
-        TkFont.init_widget_font(pathname, 
-                                *(__item_confinfo_cmd(tagid(tagOrId))))
-    elsif optkeys.size == 1
-      pathname = [win, tag, optkeys[0]].join(';')
-      TkFont.used_on(pathname) || 
-        TkFont.init_widget_font(pathname, 
-                                *(__item_confinfo_cmd(tagid(tagOrId))))
-    else
-      fonts = {}
-      optkeys.each{|key|
-        key = key.to_s
-        pathname = [win, tag, key].join(';')
-        fonts[key] = 
-          TkFont.used_on(pathname) || 
-          TkFont.init_widget_font(pathname, 
-                                  *(__item_confinfo_cmd(tagid(tagOrId))))
-      }
-      fonts
-    end
-  end
-  alias tagfontobj tagfont_configinfo
-
-  def tagfont_configure(tagOrId, slot)
-    pathname = __item_pathname(tagid(tagOrId))
-
-    slot = _symbolkey2str(slot)
-
-    __item_font_optkeys(tagid(tagOrId)).each{|optkey|
-      optkey = optkey.to_s
-      l_optkey = 'latin' << optkey
-      a_optkey = 'ascii' << optkey
-      k_optkey = 'kanji' << optkey
-
-      if slot.key?(optkey)
-        fnt = slot.delete(optkey)
-        if fnt.kind_of?(TkFont)
-          slot.delete(l_optkey)
-          slot.delete(a_optkey)
-          slot.delete(k_optkey)
-
-          fnt.call_font_configure([pathname, optkey], 
-                                  *(__item_config_cmd(tagid(tagOrId)) << {}))
-          next
-        else
-          if fnt
-            if (slot.key?(l_optkey) || 
-                slot.key?(a_optkey) || 
-                slot.key?(k_optkey))
-              fnt = TkFont.new(fnt)
-
-              lfnt = slot.delete(l_optkey)
-              lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
-              kfnt = slot.delete(k_optkey)
-
-              fnt.latin_replace(lfnt) if lfnt
-              fnt.kanji_replace(kfnt) if kfnt
-
-              fnt.call_font_configure([pathname, optkey], 
-                                      *(__item_config_cmd(tagid(tagOrId)) << {}))
-              next
-            else
-              tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
-            end
-          end
-          next
-        end
-      end
-
-      lfnt = slot.delete(l_optkey)
-      lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
-      kfnt = slot.delete(k_optkey)
-
-      if lfnt && kfnt
-        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey], 
-                                                   *(__item_config_cmd(tagid(tagOrId)) << {}))
-      elsif lfnt
-        latintagfont_configure([lfnt, optkey])
-      elsif kfnt
-        kanjitagfont_configure([kfnt, optkey])
-      end
-    }
-
-    # configure other (without font) options
-    tk_call(*(__item_config_cmd(tagid(tagOrId)).concat(hash_kv(slot)))) if slot != {}
-    self
-  end
-
-  def latintagfont_configure(tagOrId, ltn, keys=nil)
-    if ltn.kind_of?(Array)
-      key = ltn[1]
-      ltn = ltn[0]
-    else
-      key = nil
-    end
-
-    optkeys = __item_font_optkeys(tagid(tagOrId))
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
-
-    win, tag = __item_pathname(tagid(tagOrId)).split(';')
-
-    optkeys = [key] if key
-
-    optkeys.each{|optkey|
-      optkey = optkey.to_s
-
-      pathname = [win, tag, optkey].join(';')
-
-      if (fobj = TkFont.used_on(pathname))
-        fobj = TkFont.new(fobj) # create a new TkFont object
-      elsif Tk::JAPANIZED_TK
-        fobj = fontobj          # create a new TkFont object
-      else
-        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
-        next
-      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
-
-      fobj.call_font_configure([pathname, optkey], *(__item_config_cmd(tagid(tagOrId)) << {}))
-    }
-    self
-  end
-  alias asciitagfont_configure latintagfont_configure
-
-  def kanjitagfont_configure(tagOrId, knj, keys=nil)
-    if knj.kind_of?(Array)
-      key = knj[1]
-      knj = knj[0]
-    else
-      key = nil
-    end
-
-    optkeys = __item_font_optkeys(tagid(tagOrId))
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
-
-    win, tag = __item_pathname(tagid(tagOrId)).split(';')
-
-    optkeys = [key] if key
-
-    optkeys.each{|optkey|
-      optkey = optkey.to_s
-
-      pathname = [win, tag, optkey].join(';')
-
-      if (fobj = TkFont.used_on(pathname))
-        fobj = TkFont.new(fobj) # create a new TkFont object
-      elsif Tk::JAPANIZED_TK
-        fobj = fontobj          # create a new TkFont object
-      else
-        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
-        next
-      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
-
-      fobj.call_font_configure([pathname, optkey], *(__item_config_cmd(tagid(tagOrId)) << {}))
-    }
-    self
-  end
-
-  def tagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
-    if wintag
-      if winkey
-        fnt = win.tagfontobj(wintag, winkey).dup
-      else
-        fnt = win.tagfontobj(wintag).dup
-      end
-    else
-      if winkey
-        fnt = win.fontobj(winkey).dup
-      else
-        fnt = win.fontobj.dup
-      end
-    end
-
-    if targetkey
-      fnt.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
-                              *(__item_config_cmd(tagid(tagOrId)) << {}))
-    else
-      fnt.call_font_configure(__item_pathname(tagid(tagOrId)), 
-                              *(__item_config_cmd(tagid(tagOrId)) << {}))
-    end
-    self
-  end
-
-
-  def latintagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
-    if targetkey
-      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
-                                                 *(__item_config_cmd(tagid(tagOrId)) << {}))
-    else
-      fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)), 
-                                      *(__item_config_cmd(tagid(tagOrId)) << {}))
-    end
-
-    if wintag
-      if winkey
-        fontobj.latin_replace(win.tagfontobj(wintag, winkey).latin_font_id)
-      else
-        fontobj.latin_replace(win.tagfontobj(wintag).latin_font_id)
-      end
-    else
-      if winkey
-        fontobj.latin_replace(win.fontobj(winkey).latin_font_id)
-      else
-        fontobj.latin_replace(win.fontobj.latin_font_id)
-      end
-    end
-    self
-  end
-  alias asciitagfont_copy latintagfont_copy
-
-  def kanjifont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
-    if targetkey
-      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
-                                                 *(__item_config_cmd(tagid(tagOrId)) << {}))
-    else
-        fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)), 
-                                        *(__item_config_cmd(tagid(tagOrId)) << {}))
-    end
-
-    if wintag
-      if winkey
-        fontobj.kanji_replace(win.tagfontobj(wintag, winkey).kanji_font_id)
-      else
-        fontobj.kanji_replace(win.tagfontobj(wintag).kanji_font_id)
-      end
-    else
-      if winkey
-        fontobj.kanji_replace(win.fontobj(winkey).kanji_font_id)
-      else
-        fontobj.kanji_replace(win.fontobj.kanji_font_id)
-      end
-    end
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/kinput.rb b/ext/tk/lib/tk/kinput.rb
deleted file mode 100644
index a29dbcdb72..0000000000
--- a/ext/tk/lib/tk/kinput.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# tk/kinput.rb : control kinput
-#
-require 'tk'
-
-module TkKinput
-  include Tk
-  extend Tk
-
-  TkCommandNames = [
-    'kinput_start'.freeze, 
-    'kinput_send_spot'.freeze, 
-    'kanjiInput'.freeze
-  ].freeze
-
-  def TkKinput.start(win, style=None)
-    tk_call('kinput_start', win, style)
-  end
-  def kinput_start(style=None)
-    TkKinput.start(self, style)
-  end
-
-  def TkKinput.send_spot(win)
-    tk_call('kinput_send_spot', win)
-  end
-  def kinput_send_spot
-    TkKinput.send_spot(self)
-  end
-
-  def TkKinput.input_start(win, keys=nil)
-    tk_call('kanjiInput', 'start', win, *hash_kv(keys))
-  end
-  def kanji_input_start(keys=nil)
-    TkKinput.input_start(self, keys)
-  end
-
-  def TkKinput.attribute_config(win, slot, value=None)
-    if slot.kind_of? Hash
-      tk_call('kanjiInput', 'attribute', win, *hash_kv(slot))
-    else
-      tk_call('kanjiInput', 'attribute', win, "-#{slot}", value)
-    end
-  end
-  def kinput_attribute_config(slot, value=None)
-    TkKinput.attribute_config(self, slot, value)
-  end
-
-  def TkKinput.attribute_info(win, slot=nil)
-    if slot
-      conf = tk_split_list(tk_call('kanjiInput', 'attribute', 
-                                   win, "-#{slot}"))
-      conf[0] = conf[0][1..-1]
-      conf
-    else
-      tk_split_list(tk_call('kanjiInput', 'attribute', win)).collect{|conf|
-        conf[0] = conf[0][1..-1]
-        conf
-      }
-    end
-  end
-  def kinput_attribute_info(slot=nil)
-    TkKinput.attribute_info(self, slot)
-  end
-
-  def TkKinput.input_end(win)
-    tk_call('kanjiInput', 'end', win)
-  end
-  def kanji_input_end
-    TkKinput.input_end(self)
-  end
-end
diff --git a/ext/tk/lib/tk/label.rb b/ext/tk/lib/tk/label.rb
deleted file mode 100644
index 8b45db9b30..0000000000
--- a/ext/tk/lib/tk/label.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# tk/label.rb : treat label widget
-#
-require 'tk'
-
-class TkLabel<TkWindow
-  TkCommandNames = ['label'.freeze].freeze
-  WidgetClassName = 'Label'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('label', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('label', @path)
-  #  end
-  #end
-  #private :create_self
-end
diff --git a/ext/tk/lib/tk/labelframe.rb b/ext/tk/lib/tk/labelframe.rb
deleted file mode 100644
index 73d5603200..0000000000
--- a/ext/tk/lib/tk/labelframe.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# tk/labelframe.rb : treat labelframe widget
-#
-require 'tk'
-require 'tk/frame'
-
-class TkLabelFrame<TkFrame
-  TkCommandNames = ['labelframe'.freeze].freeze
-  WidgetClassName = 'Labelframe'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('labelframe', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('labelframe', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def __val2ruby_optkeys  # { key=>proc, ... }
-    super().update('labelwidget'=>proc{|v| window(v)})
-  end
-  private :__val2ruby_optkeys
-end
-TkLabelframe = TkLabelFrame
diff --git a/ext/tk/lib/tk/listbox.rb b/ext/tk/lib/tk/listbox.rb
deleted file mode 100644
index 41d02d279e..0000000000
--- a/ext/tk/lib/tk/listbox.rb
+++ /dev/null
@@ -1,279 +0,0 @@
-#
-# tk/listbox.rb : treat listbox widget
-#
-require 'tk'
-require 'tk/itemconfig'
-require 'tk/scrollable'
-require 'tk/txtwin_abst'
-
-module TkListItemConfig
-  include TkItemConfigMethod
-
-  def __item_listval_optkeys(id)
-    []
-  end
-  private :__item_listval_optkeys
-end
-
-class TkListbox<TkTextWin
-  include TkListItemConfig
-  include Scrollable
-
-  TkCommandNames = ['listbox'.freeze].freeze
-  WidgetClassName = 'Listbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('listbox', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('listbox', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def __tkvariable_optkeys
-    super() << 'listvariable'
-  end
-  private :__tkvariable_optkeys
-
-  def tagid(id)
-    #id.to_s
-    _get_eval_string(id)
-  end
-
-  def activate(y)
-    tk_send_without_enc('activate', y)
-    self
-  end
-  def curselection
-    list(tk_send_without_enc('curselection'))
-  end
-  def get(first, last=nil)
-    if last
-      # tk_split_simplelist(_fromUTF8(tk_send_without_enc('get', first, last)))
-      tk_split_simplelist(tk_send_without_enc('get', first, last), false, true)
-    else
-      _fromUTF8(tk_send_without_enc('get', first))
-    end
-  end
-  def nearest(y)
-    tk_send_without_enc('nearest', y).to_i
-  end
-  def size
-    tk_send_without_enc('size').to_i
-  end
-  def selection_anchor(index)
-    tk_send_without_enc('selection', 'anchor', index)
-    self
-  end
-  def selection_clear(first, last=None)
-    tk_send_without_enc('selection', 'clear', first, last)
-    self
-  end
-  def selection_includes(index)
-    bool(tk_send_without_enc('selection', 'includes', index))
-  end
-  def selection_set(first, last=None)
-    tk_send_without_enc('selection', 'set', first, last)
-    self
-  end
-
-  def index(idx)
-    tk_send_without_enc('index', idx).to_i
-  end
-
-  def value
-    get('0', 'end')
-  end
-
-  def value= (vals)
-    unless vals.kind_of?(Array)
-      fail ArgumentError, 'an Array is expected'
-    end
-    tk_send_without_enc('delete', '0', 'end')
-    tk_send_without_enc('insert', '0', 
-                        *(vals.collect{|v| _get_eval_enc_str(v)}))
-    vals
-  end
-
-  def clear
-    tk_send_without_enc('delete', '0', 'end')
-    self
-  end
-  alias erase clear
-
-=begin
-  def itemcget(index, key)
-    case key.to_s
-    when 'text', 'label', 'show'
-      _fromUTF8(tk_send_without_enc('itemcget', index, "-#{key}"))
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('itemcget', index, "-#{key}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('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(_fromUTF8(tk_send_without_enc('itemcget', index, "-#{key}")))
-    end
-  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_without_enc('itemconfigure', index, *hash_kv(key, true))
-      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
-      else
-        tk_call('itemconfigure', index, "-#{key}", val)
-      end
-    end
-    self
-  end
-
-  def itemconfiginfo(index, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-          conf[4] = tagfont_configinfo(index, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('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[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          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)
-        else
-          ret
-        end
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-          conf[4] = tagfont_configinfo(index, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', index))).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
-              else
-                conf[2] = tk_tcl2ruby(conf[2]) 
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
-              else
-                conf[3] = tk_tcl2ruby(conf[3]) 
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        fontconf = ret['font']
-        if fontconf
-          ret.delete('font')
-          ret.delete('kanjifont')
-          fontconf[3] = tagfont_configinfo(index, fontconf[3])
-          ret['font'] = fontconf
-        end
-        ret
-      end
-    end
-  end
-
-  def current_itemconfiginfo(index, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = itemconfiginfo(index, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        itemconfiginfo(index).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      itemconfiginfo(index, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-=end
-end
diff --git a/ext/tk/lib/tk/macpkg.rb b/ext/tk/lib/tk/macpkg.rb
deleted file mode 100644
index 1802073f46..0000000000
--- a/ext/tk/lib/tk/macpkg.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-#   tk/macpkg.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 Tk
-  def Tk.load_tclscript_rsrc(resource_name, file=None)
-    # Mac only
-    tk_call('source', '-rsrc', resource_name, file)
-  end
-
-  def Tk.load_tclscript_rsrcid(resource_id, file=None)
-    # Mac only
-    tk_call('source', '-rsrcid', resource_id, file)
-  end
-end
-
-module TkMacResource
-  extend Tk
-  extend TkMacResource
-
-  TkCommandNames = ['resource'.freeze].freeze
-
-  PACKAGE_NAME = 'resource'.freeze
-  def self.package_name
-    PACKAGE_NAME
-  end
-
-  tk_call_without_enc('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/tk/menu.rb b/ext/tk/lib/tk/menu.rb
deleted file mode 100644
index ddddc8e53e..0000000000
--- a/ext/tk/lib/tk/menu.rb
+++ /dev/null
@@ -1,632 +0,0 @@
-#
-# tk/menu.rb : treat menu and menubutton
-#
-require 'tk'
-require 'tk/itemconfig'
-require 'tk/menuspec'
-
-module TkMenuEntryConfig
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'entrycget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'entryconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def __item_strval_optkeys(id)
-    super(id) << 'selectcolor'
-  end
-  private :__item_strval_optkeys
-
-  def __item_listval_optkeys(id)
-    []
-  end
-  private :__item_listval_optkeys
-
-  def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
-    super(id).update('menu'=>proc{|i, v| window(v)})
-  end
-  private :__item_val2ruby_optkeys
-
-  alias entrycget itemcget
-  alias entryconfigure itemconfigure
-  alias entryconfiginfo itemconfiginfo
-  alias current_entryconfiginfo current_itemconfiginfo
-
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
-end
-
-class TkMenu<TkWindow
-  include Wm
-  include TkMenuEntryConfig
-  extend TkMenuSpec
-
-  TkCommandNames = ['menu'.freeze].freeze
-  WidgetClassName = 'Menu'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('menu', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('menu', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def __strval_optkeys
-    super() << 'selectcolor' << 'title'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'tearoff'
-  end
-  private :__boolval_optkeys
-
-  def self.new_menuspec(menu_spec, parent = nil, tearoff = false, keys = nil)
-    if parent.kind_of?(Hash)
-      keys = _symbolkey2str(parent)
-      parent = keys.delete('parent')
-      tearoff = keys.delete('tearoff')
-    elsif tearoff.kind_of?(Hash)
-      keys = _symbolkey2str(tearoff)
-      tearoff = keys.delete('tearoff')
-    elsif keys
-      keys = _symbolkey2str(keys)
-    else
-      keys = {}
-    end
-
-    widgetname = keys.delete('widgetname')
-    _create_menu(parent, menu_spec, widgetname, tearoff, keys)
-  end
-
-  def tagid(id)
-    #id.to_s
-    _get_eval_string(id)
-  end
-
-  def activate(index)
-    tk_send_without_enc('activate', _get_eval_enc_str(index))
-    self
-  end
-  def add(type, keys=nil)
-    tk_send_without_enc('add', type, *hash_kv(keys, true))
-    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 clone_menu(*args)
-    if args[0].kind_of?(TkWindow)
-      parent = args.shift
-    else
-      parent = self
-    end
-
-    if args[0].kind_of?(String) || args[0].kind_of?(Symbol) # menu type
-      type = args.shift
-    else
-      type = None # 'normal'
-    end
-
-    if args[0].kind_of?(Hash)
-      keys = _symbolkey2str(args.shift)
-    else
-      keys = {}
-    end
-
-    parent = keys.delete('parent') if keys.has_key?('parent')
-    type = keys.delete('type') if keys.has_key?('type')
-
-    if keys.empty?
-      TkMenuClone.new(self, parent, type)
-    else
-      TkMenuClone.new(self, parent, type, keys)
-    end
-  end
-
-  def index(idx)
-    ret = tk_send_without_enc('index', _get_eval_enc_str(idx))
-    (ret == 'none')? nil: number(ret)
-  end
-  def invoke(index)
-    _fromUTF8(tk_send_without_enc('invoke', _get_eval_enc_str(index)))
-  end
-  def insert(index, type, keys=nil)
-    tk_send_without_enc('insert', _get_eval_enc_str(index), 
-                        type, *hash_kv(keys, true))
-    self
-  end
-  def delete(first, last=nil)
-    if last
-      tk_send_without_enc('delete', _get_eval_enc_str(first), 
-                          _get_eval_enc_str(last))
-    else
-      tk_send_without_enc('delete', _get_eval_enc_str(first))
-    end
-    self
-  end
-  def popup(x, y, index=nil)
-    if index
-      tk_call_without_enc('tk_popup', path, x, y, 
-                          _get_eval_enc_str(index))
-    else
-      tk_call_without_enc('tk_popup', path, x, y)
-    end
-    self
-  end
-  def post(x, y)
-    _fromUTF8(tk_send_without_enc('post', x, y))
-  end
-  def postcascade(index)
-    tk_send_without_enc('postcascade', _get_eval_enc_str(index))
-    self
-  end
-  def postcommand(cmd=Proc.new)
-    configure_cmd 'postcommand', cmd
-    self
-  end
-  def set_focus
-    tk_call_without_enc('tk_menuSetFocus', path)
-    self
-  end
-  def tearoffcommand(cmd=Proc.new)
-    configure_cmd 'tearoffcommand', cmd
-    self
-  end
-  def menutype(index)
-    tk_send_without_enc('type', _get_eval_enc_str(index))
-  end
-  def unpost
-    tk_send_without_enc('unpost')
-    self
-  end
-  def yposition(index)
-    number(tk_send_without_enc('yposition', _get_eval_enc_str(index)))
-  end
-
-=begin
-  def entrycget(index, key)
-    case key.to_s
-    when 'text', 'label', 'show'
-      _fromUTF8(tk_send_without_enc('entrycget', 
-                                    _get_eval_enc_str(index), "-#{key}"))
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('entrycget', index, "-#{key}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('entrycget', _get_eval_enc_str(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(_fromUTF8(tk_send_without_enc('entrycget', _get_eval_enc_str(index), "-#{key}")))
-    end
-  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))
-      else
-        tk_send_without_enc('entryconfigure', _get_eval_enc_str(index), 
-                            *hash_kv(key, true))
-      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
-      else
-        tk_call('entryconfigure', index, "-#{key}", val)
-      end
-    end
-    self
-  end
-
-  def entryconfiginfo(index, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-          conf[4] = tagfont_configinfo(index, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure', _get_eval_enc_str(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[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          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
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-          conf[4] = tagfont_configinfo(index, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure', _get_eval_enc_str(index)))).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
-              else
-                conf[2] = tk_tcl2ruby(conf[2]) 
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
-              else
-                conf[3] = tk_tcl2ruby(conf[3]) 
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        fontconf = ret['font']
-        if fontconf
-          ret.delete('font')
-          ret.delete('kanjifont')
-          fontconf[3] = tagfont_configinfo(index, fontconf[3])
-          ret['font'] = fontconf
-        end
-        ret
-      end
-    end
-  end
-
-  def current_entryconfiginfo(index, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = entryconfiginfo(index, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        entryconfiginfo(index).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      entryconfiginfo(index, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-=end
-end
-
-
-class TkMenuClone<TkMenu
-=begin
-  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_without_enc(@parent.path, 'clone', @path, type)
-  end
-=end
-  def initialize(src_menu, *args)
-    widgetname = nil
-
-    if args[0].kind_of?(TkWindow)  # parent window
-      parent = args.shift
-    else
-      parent = src_menu
-    end
-
-    if args[0].kind_of?(String) || args[0].kind_of?(Symbol)  # menu type
-      type = args.shift
-    else
-      type = None  # 'normal'
-    end
-
-    if args[0].kind_of?(Hash)
-      keys = _symbolkey2str(args.shift)
-      parent = keys.delete('parent') if keys.has_key?('parent')
-      widgetname = keys.delete('widgetname')
-      type = keys.delete('type') if keys.has_key?('type')
-    else
-      keys = nil
-    end
-
-    @src_menu = src_menu
-    @parent = parent
-    @type = type
-    install_win(@parent.path, widgetname)
-    tk_call_without_enc(@src_menu.path, 'clone', @path, @type)
-    configure(keys) if keys && !keys.empty?
-  end
-
-  def source_menu
-    @src_menu
-  end
-end
-TkCloneMenu = TkMenuClone
-
-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 = Kernel.format("%s.%s", parent.path, self.class::SYSMENU_NAME)
-    @path = 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_without_enc('menubutton', @path, *hash_kv(keys, true))
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                          *hash_kv(keys, true))
-    else
-      # tk_call_without_enc('menubutton', @path)
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def __boolval_optkeys
-    super() << 'indicatoron'
-  end
-  private :__boolval_optkeys
-
-end
-TkMenuButton = TkMenubutton
-
-
-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(*args)
-    # args :: [parent,] [var,] [value[, ...],] [keys]
-    #    parent --> TkWindow or nil
-    #    var    --> TkVariable or nil
-    #    keys   --> Hash
-    #       keys[:parent] or keys['parent']     --> parent
-    #       keys[:variable] or keys['variable'] --> var
-    #       keys[:values] or keys['values']     --> value, ...
-    #       other Hash keys are menubutton options
-    keys = {}
-    keys = args.pop if args[-1].kind_of?(Hash)
-    keys = _symbolkey2str(keys)
-
-    parent = nil
-    if args[0].kind_of?(TkWindow) || args[0] == nil
-      keys.delete('parent') # ignore
-      parent = args.shift 
-    else
-      parent = keys.delete('parent')
-    end
-
-    @variable = nil
-    if args[0].kind_of?(TkVariable) || args[0] == nil
-      keys.delete('variable') # ignore
-      @variable = args.shift 
-    else
-      @variable = keys.delete('variable')
-    end
-    @variable = TkVariable.new unless @variable
-
-    (args = keys.delete('values') || []) if args.empty?
-    if args.empty?
-      args << @variable.value
-    else
-      @variable.value = args[0]
-    end
-
-    install_win(if parent then parent.path end)
-    @menu = OptionMenu.new(tk_call('tk_optionMenu', 
-                                   @path, @variable.id, *args))
-
-    configure(keys) if keys
-  end
-
-  def value
-    @variable.value
-  end
-
-  def value=(val)
-    @variable.value = val
-  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.insert(index, 'radiobutton', 'variable'=>@variable, 
-              'label'=>value, 'value'=>value)
-    self
-  end
-  def delete(index, last=None)
-    @menu.delete(index, last)
-    self
-  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 current_menuconfiginfo(key=nil)
-    @menu.current_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)
-  end
-  def current_entryconfiginfo(index, key=nil)
-    @menu.current_entryconfiginfo(index, key)
-  end
-end
-TkOptionMenuButton = TkOptionMenubutton
diff --git a/ext/tk/lib/tk/menubar.rb b/ext/tk/lib/tk/menubar.rb
deleted file mode 100644
index 392b6fbd4e..0000000000
--- a/ext/tk/lib/tk/menubar.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# tk/menubar.rb
-#
-# Original version:
-#   Copyright (C) 1998 maeda shugo. All rights reserved. 
-#   This file can be distributed under the terms of the Ruby.
-
-# Usage:
-#
-# menu_spec = [
-#   [['File', 0],
-#     ['Open', proc{puts('Open clicked')}, 0],
-#     '---',
-#     ['Quit', proc{exit}, 0]],
-#   [['Edit', 0],
-#     ['Cut', proc{puts('Cut clicked')}, 2],
-#     ['Copy', proc{puts('Copy clicked')}, 0],
-#     ['Paste', proc{puts('Paste clicked')}, 0]]
-# ]
-# menubar = TkMenubar.new(nil, menu_spec,
-#                       'tearoff'=>false,
-#                       'foreground'=>'grey40',
-#                       'activeforeground'=>'red',
-#                       'font'=>'-adobe-helvetica-bold-r-*--12-*-iso8859-1')
-# menubar.pack('side'=>'top', 'fill'=>'x')
-#
-#
-# OR
-#
-#
-# menubar = TkMenubar.new
-# menubar.add_menu([['File', 0],
-#                  ['Open', proc{puts('Open clicked')}, 0],
-#                  '---',
-#                  ['Quit', proc{exit}, 0]])
-# menubar.add_menu([['Edit', 0],
-#                  ['Cut', proc{puts('Cut clicked')}, 2],
-#                  ['Copy', proc{puts('Copy clicked')}, 0],
-#                  ['Paste', proc{puts('Paste clicked')}, 0]])
-# menubar.configure('tearoff', false)
-# menubar.configure('foreground', 'grey40')
-# menubar.configure('activeforeground', 'red')
-# menubar.configure('font', '-adobe-helvetica-bold-r-*--12-*-iso8859-1')
-# menubar.pack('side'=>'top', 'fill'=>'x')
-#
-#
-# OR
-#
-# radio_var = TkVariable.new('y')
-# menu_spec = [
-#   [['File', 0],
-#     {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
-#     '---',
-#     ['Check_A', TkVariable.new(true), 6],
-#     {:type=>'checkbutton', :label=>'Check_B', 
-#                 :variable=>TkVariable.new, :underline=>6},
-#     '---',
-#     ['Radio_X', [radio_var, 'x'], 6],
-#     ['Radio_Y', [radio_var, 'y'], 6],
-#     ['Radio_Z', [radio_var, 'z'], 6],
-#     '---',
-#     ['cascade', [ 
-#                    ['sss', proc{p 'sss'}, 0], 
-#                    ['ttt', proc{p 'ttt'}, 0], 
-#                    ['uuu', proc{p 'uuu'}, 0], 
-#                    ['vvv', proc{p 'vvv'}, 0], 
-#                 ], 0],
-#     '---',
-#     ['Quit', proc{exit}, 0]],
-#   [['Edit', 0],
-#     ['Cut', proc{puts('Cut clicked')}, 2],
-#     ['Copy', proc{puts('Copy clicked')}, 0],
-#     ['Paste', proc{puts('Paste clicked')}, 0]]
-# ]
-# menubar = TkMenubar.new(nil, menu_spec,
-#                        'tearoff'=>false,
-#                        'foreground'=>'grey40',
-#                        'activeforeground'=>'red',
-#                        'font'=>'Helvetia 12 bold')
-# menubar.pack('side'=>'top', 'fill'=>'x')
-
-# See tk/menuspce.rb about the format of the menu_spec
-
-# To use add_menu, configuration must be done by calling configure after
-# adding all menus by add_menu, not by the constructor arguments.
-
-require 'tk'
-require 'tk/frame'
-require 'tk/composite'
-require 'tk/menuspec'
-
-class TkMenubar<TkFrame
-  include TkComposite
-  include TkMenuSpec
-  
-  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
-
-    @menus = []
-    
-    spec.each{|info| add_menu(info)} if spec
-
-    options.each{|key, value| configure(key, value)} if options
-  end
-
-  def add_menu(menu_info)
-    mbtn, menu = _create_menubutton(@frame, menu_info)
-
-    submenus = _get_cascade_menus(menu).flatten
-
-    @menus.push([mbtn, menu])
-    delegate('tearoff', menu, *submenus)
-    delegate('foreground', mbtn, menu, *submenus)
-    delegate('background', mbtn, menu, *submenus)
-    delegate('disabledforeground', mbtn, menu, *submenus)
-    delegate('activeforeground', mbtn, menu, *submenus)
-    delegate('activebackground', mbtn, menu, *submenus)
-    delegate('font', mbtn, menu, *submenus)
-    delegate('kanjifont', mbtn, menu, *submenus)
-  end
-  
-  def [](index)
-    return @menus[index]
-  end
-end
diff --git a/ext/tk/lib/tk/menuspec.rb b/ext/tk/lib/tk/menuspec.rb
deleted file mode 100644
index 118a4f42b1..0000000000
--- a/ext/tk/lib/tk/menuspec.rb
+++ /dev/null
@@ -1,269 +0,0 @@
-#
-# tk/menuspec.rb
-#                              Hidethoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# based on tkmenubar.rb :
-#   Copyright (C) 1998 maeda shugo. All rights reserved. 
-#   This file can be distributed under the terms of the Ruby.
-#
-# The format of the menu_spec is:
-#   [ menu_info, menu_info, ... ]
-#
-# And the format of the menu_info is:
-#   [
-#     [text, underline, configs], # menu button/entry (*1)
-#     [label, command, underline, accelerator, configs],   # command entry
-#     [label, TkVar_obj, underline, accelerator, configs], # checkbutton entry
-#     [label, [TkVar_obj, value], 
-#                        underline, accelerator, configs], # radiobutton entry
-#     [label, [[...menu_info...], [...menu_info...], ...], 
-#                        underline, accelerator, configs], # cascade entry (*2)
-#     '---', # separator
-#     ...
-#   ]
-#
-# underline, accelerator, and configs are optional pearameters. 
-# Hashes are OK instead of Arrays. Then the entry type ('command', 
-# 'checkbutton', 'radiobutton' or 'cascade') is given by 'type' key
-# (e.g. :type=>'cascade'). When type is 'cascade', an array of menu_info
-# is acceptable for 'menu' key (then, create sub-menu).
-#
-# NOTE: (*1)
-#   If you want to make special menus (*.help for UNIX, *.system for Win, 
-#   and *.apple for Mac), append 'menu_name'=>name (name is 'help' for UNIX, 
-#   'system' for Win, and 'apple' for Mac) option to the configs hash of 
-#   menu button/entry information.
-#
-# NOTE: (*2)
-#   If you want to configure a cascade menu, add :menu_config=>{...configs..}
-#   to the configs of the cascade entry.
-
-module TkMenuSpec
-  def _create_menu(parent, menu_info, menu_name = nil, 
-                   tearoff = false, default_opts = nil)
-    if tearoff.kind_of?(Hash)
-      default_opts = tearoff
-      tearoff = false
-    end
-
-    if menu_name.kind_of?(Hash)
-      default_opts = menu_name
-      menu_name = nil
-      tearoff = false
-    end
-
-    if default_opts.kind_of?(Hash)
-      orig_opts = _symbolkey2str(default_opts)
-    else
-      orig_opts = {}
-    end
-
-    tearoff = orig_opts.delete('tearoff') if orig_opts.key?('tearoff')
-
-    if menu_name
-      menu = TkMenu.new(parent, :widgetname=>menu_name, :tearoff=>tearoff)
-    else
-      menu = TkMenu.new(parent, :tearoff=>tearoff)
-    end
-
-    for item_info in menu_info
-      if item_info.kind_of?(Hash)
-        options = orig_opts.dup
-        options.update(_symbolkey2str(item_info))
-        item_type = (options.delete('type') || 'command').to_s
-        menu_name = options.delete('menu_name')
-        menu_opts = orig_opts.dup
-        menu_opts.update(_symbolkey2str(options.delete('menu_config') || {}))
-        if item_type == 'cascade' && options['menu'].kind_of?(Array)
-          # create cascade menu
-          submenu = _create_menu(menu, options['menu'], menu_name, 
-                                 tearoff, menu_opts)
-          options['menu'] = submenu
-        end
-        menu.add(item_type, options)
-
-      elsif item_info.kind_of?(Array)
-        options = orig_opts.dup
-
-        options['label'] = item_info[0] if item_info[0]
-
-        case item_info[1]
-        when TkVariable
-          # checkbutton
-          item_type = 'checkbutton'
-          options['variable'] = item_info[1]
-          options['onvalue']  = true
-          options['offvalue'] = false
-
-        when Array
-          # radiobutton or cascade
-          if item_info[1][0].kind_of?(TkVariable)
-            # radiobutton
-            item_type = 'radiobutton'
-            options['variable'] = item_info[1][0]
-            options['value'] = item_info[1][1] if item_info[1][1]
-
-          else
-            # cascade
-            item_type = 'cascade'
-            menu_opts = orig_opts.dup
-            if item_info[4] && item_info[4].kind_of?(Hash)
-              opts = _symbolkey2str(item_info[4])
-              menu_name = opts.delete('menu_name')
-              menu_config = opts.delete('menu_config') || {}
-              menu_opts.update(_symbolkey2str(menu_config))
-            end
-            submenu = _create_menu(menu, item_info[1], menu_name, 
-                                   tearoff, menu_opts)
-            options['menu'] = submenu
-          end
-
-        else
-          # command
-          item_type = 'command'
-          options['command'] = item_info[1] if item_info[1]
-        end
-
-        options['underline'] = item_info[2] if item_info[2]
-        options['accelerator'] = item_info[3] if item_info[3]
-        if item_info[4] && item_info[4].kind_of?(Hash)
-          opts = _symbolkey2str(item_info[4])
-          if item_type == 'cascade'
-            opts.delete('menu_name')
-            opts.delete('menu_config')
-          end
-          options.update(opts)
-        end
-        menu.add(item_type, options)
-
-      elsif /^-+$/ =~ item_info
-        menu.add('separator')
-
-      else
-        menu.add('command', 'label' => item_info)
-      end
-    end
-
-    menu
-  end
-  private :_create_menu
-
-  def _use_menubar?(parent)
-    use_menubar = false
-    if parent.kind_of?(TkRoot) || parent.kind_of?(TkToplevel)
-      return true 
-    else
-      begin
-        parent.cget('menu')
-        return true 
-      rescue
-      end
-    end
-    false
-  end
-  private :_use_menubar?
-
-  def _create_menu_for_menubar(parent)
-    unless (mbar = parent.menu).kind_of?(TkMenu)
-      mbar = TkMenu.new(parent, :tearoff=>false)
-      parent.menu(mbar)
-    end
-    mbar
-  end
-  private :_create_menu_for_menubar
-
-  def _create_menubutton(parent, menu_info, tearoff=false, default_opts = nil)
-    btn_info = menu_info[0]
-
-    if tearoff.kind_of?(Hash)
-      default_opts = tearoff
-      tearoff = false
-    end
-
-    if default_opts.kind_of?(Hash)
-      keys = _symbolkey2str(default_opts)
-    else
-      keys = {}
-    end
-
-    tearoff = keys.delete('tearoff') if keys.key?('tearoff')
-
-    if _use_menubar?(parent)
-      # menubar by menu entries
-
-      mbar = _create_menu_for_menubar(parent)
-
-      menu_name = nil
-
-      if btn_info.kind_of?(Hash)
-        keys.update(_symbolkey2str(btn_info))
-        menu_name = keys.delete('menu_name')
-        keys['label'] = keys.delete('text') if keys.key?('text')
-      elsif btn_info.kind_of?(Array)
-        keys['label'] = btn_info[0] if btn_info[0]
-        keys['underline'] = btn_info[1] if btn_info[1]
-        if btn_info[2]&&btn_info[2].kind_of?(Hash)
-          keys.update(_symbolkey2str(btn_info[2]))
-          menu_name = keys.delete('menu_name')
-        end
-      else
-        keys = {:label=>btn_info}
-      end
-
-      menu = _create_menu(mbar, menu_info[1..-1], menu_name, 
-                          tearoff, default_opts)
-      menu.tearoff(tearoff)
-
-      keys['menu'] = menu
-      mbar.add('cascade', keys)
-
-      [mbar, menu]
-
-    else
-      # menubar by menubuttons
-      mbtn = TkMenubutton.new(parent)
-
-      menu_name = nil
-
-      if btn_info.kind_of?(Hash)
-        keys.update(_symbolkey2str(btn_info))
-        menu_name = keys.delete('menu_name')
-        keys['text'] = keys.delete('label') if keys.key?('label')
-        mbtn.configure(keys)
-      elsif btn_info.kind_of?(Array)
-        mbtn.configure('text', btn_info[0]) if btn_info[0]
-        mbtn.configure('underline', btn_info[1]) if btn_info[1]
-        # mbtn.configure('accelerator', btn_info[2]) if btn_info[2]
-        if btn_info[2]&&btn_info[2].kind_of?(Hash)
-          keys.update(_symbolkey2str(btn_info[2]))
-          menu_name = keys.delete('menu_name')
-          mbtn.configure(keys)
-        end
-      else
-        mbtn.configure('text', btn_info)
-      end
-
-      mbtn.pack('side' => 'left')
-
-      menu = _create_menu(mbtn, menu_info[1..-1], menu_name, 
-                          tearoff, default_opts)
-    
-      mbtn.menu(menu)
-
-      [mbtn, menu]
-    end
-  end
-  private :_create_menubutton
-
-  def _get_cascade_menus(menu)
-    menus = []
-    (0..(menu.index('last'))).each{|idx|
-      if menu.menutype(idx) == 'cascade'
-        submenu = menu.entrycget(idx, 'menu')
-        menus << [submenu, _get_cascade_menus(submenu)]
-      end
-    }
-    menus
-  end
-  private :_get_cascade_menus
-end
diff --git a/ext/tk/lib/tk/message.rb b/ext/tk/lib/tk/message.rb
deleted file mode 100644
index 79121bebb3..0000000000
--- a/ext/tk/lib/tk/message.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# tk/message.rb : treat message widget
-#
-require 'tk'
-require 'tk/label'
-
-class TkMessage<TkLabel
-  TkCommandNames = ['message'.freeze].freeze
-  WidgetClassName = 'Message'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('message', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('message', @path)
-  #  end
-  #end
-  private :create_self
-end
diff --git a/ext/tk/lib/tk/mngfocus.rb b/ext/tk/lib/tk/mngfocus.rb
deleted file mode 100644
index 1a2049c8a8..0000000000
--- a/ext/tk/lib/tk/mngfocus.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#   tk/mngfocus.rb : methods for Tcl/Tk standard library 'focus.tcl'
-#                           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_without_enc('tk_focusFollowsMouse')
-  end
-
-  def TkManageFocus.next(win)
-    tk_tcl2ruby(tk_call('tk_focusNext', win))
-  end
-  def focusNext
-    TkManageFocus.next(self)
-  end
-
-  def TkManageFocus.prev(win)
-    tk_tcl2ruby(tk_call('tk_focusPrev', win))
-  end
-  def focusPrev
-    TkManageFocus.prev(self)
-  end
-end
diff --git a/ext/tk/lib/tk/msgcat.rb b/ext/tk/lib/tk/msgcat.rb
deleted file mode 100644
index 061e43fd89..0000000000
--- a/ext/tk/lib/tk/msgcat.rb
+++ /dev/null
@@ -1,292 +0,0 @@
-#
-#   tk/msgcat.rb : methods for Tcl message catalog
-#                     by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-require 'tk'
-
-#class TkMsgCatalog
-class TkMsgCatalog < TkObject
-  include TkCore
-  extend Tk
-  #extend TkMsgCatalog
-
-  TkCommandNames = [
-    '::msgcat::mc'.freeze, 
-    '::msgcat::mcmax'.freeze, 
-    '::msgcat::mclocale'.freeze, 
-    '::msgcat::mcpreferences'.freeze, 
-    '::msgcat::mcload'.freeze, 
-    '::msgcat::mcset'.freeze, 
-    '::msgcat::mcmset'.freeze, 
-    '::msgcat::mcunknown'.freeze
-  ].freeze
-
-  tk_call_without_enc('package', 'require', 'Tcl', '8.2')
-
-  PACKAGE_NAME = 'msgcat'.freeze
-  def self.package_name
-    PACKAGE_NAME
-  end
-
-  if self.const_defined? :FORCE_VERSION
-    tk_call_without_enc('package', 'require', 'msgcat', FORCE_VERSION)
-  else
-    tk_call_without_enc('package', 'require', 'msgcat')
-  end
-
-  MSGCAT_EXT = '.msg'
-
-  UNKNOWN_CBTBL = Hash.new{|hash,key| hash[key] = {}}.taint
-
-  TkCore::INTERP.add_tk_procs('::msgcat::mcunknown', 'args', <<-'EOL')
-    if {[set st [catch {eval {ruby_cmd TkMsgCatalog callback} [namespace current] $args} ret]] != 0} {
-       #return -code $st $ret
-       set idx [string first "\n\n" $ret]
-       if {$idx > 0} {
-          return -code $st \
-                 -errorinfo [string range $ret [expr $idx + 2] \
-                                               [string length $ret]] \
-                 [string range $ret 0 [expr $idx - 1]]
-       } else {
-          return -code $st $ret
-       }
-    } else {
-        return $ret
-    }
-  EOL
-
-  def self.callback(namespace, locale, src_str, *args)
-    src_str = sprintf(src_str, *args) unless args.empty?
-    cmd_tbl = TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]
-    cmd = cmd_tbl[namespace]
-    cmd = cmd_tbl['::'] unless cmd  # use global scope as interp default
-    return src_str unless cmd       # no cmd -> return src-str (default action)
-    begin
-      cmd.call(locale, src_str)
-    rescue SystemExit
-      exit(0)
-    rescue Interrupt
-      exit!(1)
-    rescue Exception => e
-      begin
-        msg = _toUTF8(e.class.inspect) + ': ' + 
-              _toUTF8(e.message) + "\n" + 
-              "\n---< backtrace of Ruby side >-----\n" + 
-              _toUTF8(e.backtrace.join("\n")) + 
-              "\n---< backtrace of Tk side >-------"
-        msg.instance_variable_set(:@encoding, 'utf-8')
-      rescue Exception
-        msg = e.class.inspect + ': ' + e.message + "\n" + 
-              "\n---< backtrace of Ruby side >-----\n" + 
-              e.backtrace.join("\n") + 
-              "\n---< backtrace of Tk side >-------"
-      end
-      fail(e, msg)
-    end
-  end
-
-  def initialize(namespace = nil)
-    if namespace.kind_of?(TkNamespace)
-      @namespace = namespace
-    elsif namespace == nil
-      @namespace = TkNamespace.new('::')  # global namespace
-    else
-      @namespace = TkNamespace.new(namespace)
-    end
-    @path = @namespace.path
-
-    @msgcat_ext = '.msg'
-  end
-  attr_accessor :msgcat_ext
-
-  def method_missing(id, *args)
-    # locale(src, trans) ==> set_translation(locale, src, trans)
-    loc = id.id2name
-    case args.length
-    when 0 # set locale
-      self.locale=(loc)
-
-    when 1 # src only, or trans_list
-      if args[0].kind_of?(Array)
-        # trans_list
-        #list = args[0].collect{|src, trans|
-        #  [ Tk::UTF8_String.new(src), Tk::UTF8_String.new(trans) ]
-        #}
-        self.set_translation_list(loc, args[0])
-      else
-        # src
-        #self.set_translation(loc, Tk::UTF8_String.new(args[0]))
-        self.set_translation(loc, args[0])
-      end
-
-    when 2 # src and trans, or, trans_list and enc
-      if args[0].kind_of?(Array)
-      else
-        #self.set_translation(loc, args[0], Tk::UTF8_String.new(args[1]))
-        self.set_translation(loc, *args)
-      end
-
-    when 3 # src and trans and enc
-      self.set_translation(loc, *args)
-
-    else
-      super(id, *args)
-#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
-
-    end
-  end
-
-  # *args ::= form, arg, arg, ...
-  def self.translate(*args)
-    dst = args.collect{|src|
-      tk_call_without_enc('::msgcat::mc', _get_eval_string(src, true))
-    }
-    Tk.UTF8_String(sprintf(*dst))
-  end
-  class << self
-    alias mc translate
-    alias [] translate
-  end
-  def translate(*args)
-    dst = args.collect{|src|
-      @namespace.eval{tk_call_without_enc('::msgcat::mc', 
-                                          _get_eval_string(src, true))}
-    }
-    Tk.UTF8_String(sprintf(*dst))
-  end
-  alias mc translate
-  alias [] translate
-
-  def self.maxlen(*src_strings)
-    tk_call('::msgcat::mcmax', *src_strings).to_i
-  end
-  def maxlen(*src_strings)
-    @namespace.eval{tk_call('::msgcat::mcmax', *src_strings).to_i}
-  end
-
-  def self.locale
-    tk_call('::msgcat::mclocale')
-  end
-  def locale
-    @namespace.eval{tk_call('::msgcat::mclocale')}
-  end
-
-  def self.locale=(locale)
-    tk_call('::msgcat::mclocale', locale)
-  end
-  def locale=(locale)
-    @namespace.eval{tk_call('::msgcat::mclocale', locale)}
-  end
-
-  def self.preferences
-    tk_split_simplelist(tk_call('::msgcat::mcpreferences'))
-  end
-  def preferences
-    tk_split_simplelist(@namespace.eval{tk_call('::msgcat::mcpreferences')})
-  end
-
-  def self.load_tk(dir)
-    number(tk_call('::msgcat::mcload', dir))
-  end
-
-  def self.load_rb(dir)
-    count = 0
-    preferences().each{|loc|
-      file = File.join(dir, loc + self::MSGCAT_EXT)
-      if File.readable?(file)
-        count += 1
-        eval(open(file){|f| f.read})
-      end
-    }
-    count
-  end
-
-  def load_tk(dir)
-    number(@namespace.eval{tk_call('::msgcat::mcload', dir)})
-  end
-
-  def load_rb(dir)
-    count = 0
-    preferences().each{|loc|
-      file = File.join(dir, loc + @msgcat_ext)
-      if File.readable?(file)
-        count += 1
-        @namespace.eval(open(file){|f| f.read})
-      end
-    }
-    count
-  end
-
-  def self.load(dir)
-    self.load_rb(dir)
-  end
-  alias load load_rb
-
-  def self.set_translation(locale, src_str, trans_str=None, enc='utf-8')
-    if trans_str && trans_str != None
-      trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
-      Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset', 
-                                         locale, 
-                                         _get_eval_string(src_str, true), 
-                                         trans_str))
-    else
-      Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset', 
-                                         locale, 
-                                         _get_eval_string(src_str, true)))
-    end
-  end
-  def set_translation(locale, src_str, trans_str=None, enc='utf-8')
-    if trans_str && trans_str != None
-      trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc)) 
-      Tk.UTF8_String(@namespace.eval{
-                       tk_call_without_enc('::msgcat::mcset', 
-                                           locale, 
-                                           _get_eval_string(src_str, true), 
-                                           trans_str)
-                     })
-    else
-      Tk.UTF8_String(@namespace.eval{
-                       tk_call_without_enc('::msgcat::mcset', 
-                                           locale, 
-                                           _get_eval_string(src_str, true))})
-    end
-  end
-
-  def self.set_translation_list(locale, trans_list, enc='utf-8')
-    # trans_list ::= [ [src, trans], [src, trans], ... ]
-    list = []
-    trans_list.each{|src, trans|
-      if trans && trans != None
-        list << _get_eval_string(src, true) 
-        list << Tk.UTF8_Stirng(_toUTF8(trans, enc))
-      else
-        list << _get_eval_string(src, true) << ''
-      end
-    }
-    number(tk_call_without_enc('::msgcat::mcmset', locale, list))
-  end
-  def set_translation_list(locale, trans_list, enc='utf-8')
-    # trans_list ::= [ [src, trans], [src, trans], ... ]
-    list = []
-    trans_list.each{|src, trans|
-      if trans && trans != None
-        list << _get_eval_string(src, true) 
-        list << Tk.UTF8_String(_toUTF8(trans, enc))
-      else
-        list << _get_eval_string(src, true) << ''
-      end
-    }
-    number(@namespace.eval{
-             tk_call_without_enc('::msgcat::mcmset', locale, list)
-           })
-  end
-
-  def self.def_unknown_proc(cmd=Proc.new)
-    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]['::'] = cmd
-  end
-  def def_unknown_proc(cmd=Proc.new)
-    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip][@namespace.path] = cmd
-  end
-end
-
-TkMsgCat = TkMsgCatalog
diff --git a/ext/tk/lib/tk/namespace.rb b/ext/tk/lib/tk/namespace.rb
deleted file mode 100644
index 5bf6474c5b..0000000000
--- a/ext/tk/lib/tk/namespace.rb
+++ /dev/null
@@ -1,500 +0,0 @@
-#
-#   tk/namespace.rb : methods to manipulate Tcl/Tk namespace
-#                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-require 'tk'
-
-class TkNamespace < TkObject
-  extend Tk
-
-  TkCommandNames = [
-    'namespace'.freeze, 
-  ].freeze
-
-  Tk_Namespace_ID_TBL = TkCore::INTERP.create_table
-  Tk_Namespace_ID = ["ns".freeze, "00000".taint].freeze
-
-  Tk_NsCode_RetObjID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    Tk_Namespace_ID_TBL.clear
-    Tk_NsCode_RetObjID_TBL.clear
-  }
-
-  def TkNamespace.id2obj(id)
-    Tk_Namespace_ID_TBL[id]? Tk_Namespace_ID_TBL[id]: id
-  end
-
-  #####################################
-
-  class Ensemble < TkObject
-    def __cget_cmd
-      ['namespace', 'ensemble', 'configure', self.path]
-    end
-    private :__cget_cmd
-
-    def __config_cmd
-      ['namespace', 'ensemble', 'configure', self.path]
-    end
-    private :__config_cmd
-
-    def __configinfo_struct
-      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil, 
-        :default_value=>nil, :current_value=>2}
-    end
-    private :__configinfo_struct
-
-    def __boolval_optkeys
-      ['prefixes']
-    end
-    private :__boolval_optkeys
-
-    def __listval_optkeys
-      ['map', 'subcommands', 'unknown']
-    end
-    private :__listval_optkeys
-
-    def self.exist?(ensemble)
-      bool(tk_call('namespace', 'ensemble', 'exists', ensemble))
-    end
-
-    def initialize(keys = {})
-      @ensemble = @path = tk_call('namespace', 'ensemble', 'create', keys)
-    end
-
-    def cget(slot)
-      if slot == :namespace || slot == 'namespace'
-        ns = super(slot)
-        if TkNamespace::Tk_Namespace_ID_TBL.key?(ns)
-          TkNamespace::Tk_Namespace_ID_TBL[ns]
-        else
-          ns
-        end
-      else
-        super(slot)
-      end
-    end
-
-    def configinfo(slot = nil)
-      if slot
-        if slot == :namespace || slot == 'namespace'
-          val = super(slot)
-          if TkNamespace::Tk_Namespace_ID_TBL.key?(val)
-            val = TkNamespace::Tk_Namespace_ID_TBL[val]
-          end
-        else
-          val = super(slot)
-        end
-
-        if TkComm::GET_CONFIGINFO_AS_ARRAY
-          [slot.to_s, val]
-        else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-          {slot.to_s => val}
-        end
-
-      else
-        info = super()
-
-        if TkComm::GET_CONFIGINFO_AS_ARRAY
-          info.map!{|inf| 
-            if inf[0] == 'namespace' && 
-                TkNamespace::Tk_Namespace_ID_TBL.key?(inf[-1])
-              [inf[0], TkNamespace::Tk_Namespace_ID_TBL[inf[-1]]]
-            else
-              inf
-            end
-          }
-        else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-          val = info['namespace']
-          if TkNamespace::Tk_Namespace_ID_TBL.key?(val)
-            info['namespace'] = TkNamespace::Tk_Namespace_ID_TBL[val]
-          end
-        end
-
-        info
-      end
-    end
-
-    def exists?
-      bool(tk_call('namespace', 'ensemble', 'exists', @path))
-    end
-  end
-
-  #####################################
-
-  class ScopeArgs < Array
-    include Tk
-
-    # alias __tk_call             tk_call
-    # alias __tk_call_without_enc tk_call_without_enc
-    # alias __tk_call_with_enc    tk_call_with_enc
-    def tk_call(*args)
-      #super('namespace', 'eval', @namespace, *args)
-      args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-      super('namespace', 'eval', @namespace, 
-            TkCore::INTERP._merge_tklist(*args))
-    end
-    def tk_call_without_enc(*args)
-      #super('namespace', 'eval', @namespace, *args)
-      args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-      super('namespace', 'eval', @namespace, 
-            TkCore::INTERP._merge_tklist(*args))
-    end
-    def tk_call_with_enc(*args)
-      #super('namespace', 'eval', @namespace, *args)
-      args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-      super('namespace', 'eval', @namespace, 
-            TkCore::INTERP._merge_tklist(*args))
-    end
-
-    def initialize(namespace, *args)
-      @namespace = namespace
-      super(args.size)
-      self.replace(args)
-    end
-  end
-
-  #####################################
-
-  class NsCode < TkObject
-    def initialize(scope, use_obj_id = false)
-      @scope = scope + ' '
-      @use_obj_id = use_obj_id
-    end
-    def path
-      @scope
-    end
-    def to_eval
-      @scope
-    end
-    def call(*args)
-      ret = TkCore::INTERP._eval_without_enc(@scope + array2tk_list(args))
-      if @use_obj_id
-        ret = TkNamespace::Tk_NsCode_RetObjID_TBL.delete(ret.to_i)
-      end
-      ret
-    end
-  end
-
-  #####################################
-
-  def install_cmd(cmd)
-    lst = tk_split_simplelist(super(cmd), false, false)
-    if lst[1] =~ /^::/
-      lst[1] = @fullname
-    else
-      lst.insert(1, @fullname)
-    end
-    TkCore::INTERP._merge_tklist(*lst)
-  end
-
-  alias __tk_call             tk_call
-  alias __tk_call_without_enc tk_call_without_enc
-  alias __tk_call_with_enc    tk_call_with_enc
-  def tk_call(*args)
-    #super('namespace', 'eval', @fullname, *args)
-    args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-    super('namespace', 'eval', @fullname, 
-          TkCore::INTERP._merge_tklist(*args))
-  end
-  def tk_call_without_enc(*args)
-    #super('namespace', 'eval', @fullname, *args)
-    args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-    super('namespace', 'eval', @fullname,  
-          TkCore::INTERP._merge_tklist(*args))
-  end
-  def tk_call_with_enc(*args)
-    #super('namespace', 'eval', @fullname, *args)
-    args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-    super('namespace', 'eval', @fullname, 
-          TkCore::INTERP._merge_tklist(*args))
-  end
-  alias ns_tk_call             tk_call
-  alias ns_tk_call_without_enc tk_call_without_enc
-  alias ns_tk_call_with_enc    tk_call_with_enc
-
-  def initialize(name = nil, parent = nil)
-    unless name
-      # name = Tk_Namespace_ID.join('')
-      name = Tk_Namespace_ID.join(TkCore::INTERP._ip_id_)
-      Tk_Namespace_ID[1].succ!
-    end
-    name = __tk_call('namespace', 'current') if name == ''
-    if parent
-      if parent =~ /^::/
-        if name =~ /^::/
-          @fullname = parent + name
-        else
-          @fullname = parent +'::'+ name
-        end
-      else
-        ancestor = __tk_call('namespace', 'current')
-        ancestor = '' if ancestor == '::'
-        if name =~ /^::/
-          @fullname = ancestor + '::' + parent + name
-        else
-          @fullname = ancestor + '::'+ parent +'::'+ name
-        end
-      end
-    else # parent == nil
-      ancestor = __tk_call('namespace', 'current')
-      ancestor = '' if ancestor == '::'
-      if name =~ /^::/
-        @fullname = name
-      else
-        @fullname = ancestor + '::' + name
-      end
-    end
-    @path = @fullname
-    @parent = __tk_call('namespace', 'qualifiers', @fullname)
-    @name = __tk_call('namespace', 'tail', @fullname)
-
-    # create namespace
-    __tk_call('namespace', 'eval', @fullname, '')
-
-    Tk_Namespace_ID_TBL[@fullname] = self
-  end
-
-  def self.children(*args)
-    # args ::= [<namespace>] [<pattern>]
-    # <pattern> must be glob-style pattern
-    tk_split_simplelist(tk_call('namespace', 'children', *args)).collect{|ns|
-      # ns is fullname
-      if Tk_Namespace_ID_TBL.key?(ns)
-        Tk_Namespace_ID_TBL[ns]
-      else
-        ns
-      end
-    }
-  end
-  def children(pattern=None)
-    TkNamespace.children(@fullname, pattern)
-  end
-
-  def self.code(script = Proc.new)
-    TkNamespace.new('').code(script)
-  end
-=begin
-  def code(script = Proc.new)
-    if script.kind_of?(String)
-      cmd = proc{|*args| ScopeArgs.new(@fullname,*args).instance_eval(script)}
-    elsif script.kind_of?(Proc)
-      cmd = proc{|*args| ScopeArgs.new(@fullname,*args).instance_eval(&script)}
-    else
-      fail ArgumentError, "String or Proc is expected"
-    end
-    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code', 
-                                                _get_eval_string(cmd, false)))
-  end
-=end
-  def code(script = Proc.new)
-    if script.kind_of?(String)
-      cmd = proc{|*args|
-        ret = ScopeArgs.new(@fullname,*args).instance_eval(script)
-        id = ret.object_id
-        TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
-        id
-      }
-    elsif script.kind_of?(Proc)
-      cmd = proc{|*args|
-        ret = ScopeArgs.new(@fullname,*args).instance_eval(&script)
-        id = ret.object_id
-        TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
-        id
-      }
-    else
-      fail ArgumentError, "String or Proc is expected"
-    end
-    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code', 
-                                                _get_eval_string(cmd, false)), 
-                            true)
-  end
-
-  def self.current_path
-    tk_call('namespace', 'current')
-  end
-  def current_path
-    @fullname
-  end
-
-  def self.current
-    ns = self.current_path
-    if Tk_Namespace_ID_TBL.key?(ns)
-      Tk_Namespace_ID_TBL[ns]
-    else
-      ns
-    end
-  end
-  def current_namespace
-    # ns_tk_call('namespace', 'current')
-    # @fullname
-    self
-  end
-  alias current current_namespace
-
-  def self.delete(*ns_list)
-    tk_call('namespace', 'delete', *ns_list)
-    ns_list.each{|ns|
-      if ns.kind_of?(TkNamespace)
-        Tk_Namespace_ID_TBL.delete(ns.path)
-      else
-        Tk_Namespace_ID_TBL.delete(ns.to_s)
-      end
-    }
-  end
-  def delete
-    TkNamespece.delete(@fullname)
-  end
-
-  def self.ensemble_create(*keys)
-    tk_call('namespace', 'ensemble', 'create', *hash_kv(keys))
-  end
-  def self.ensemble_configure(cmd, slot, value=None)
-    if slot.kind_of?(Hash)
-      tk_call('namespace', 'ensemble', 'configure', cmd, *hash_kv(slot))
-    else
-      tk_call('namespace', 'ensemble', 'configure', cmd, '-'+slot.to_s, value)
-    end
-  end
-  def self.ensemble_configinfo(cmd, slot = nil)
-    if slot
-      tk_call('namespace', 'ensemble', 'configure', cmd, '-' + slot.to_s)
-    else
-      inf = {}
-      Hash(*tk_split_simplelist(tk_call('namespace', 'ensemble', 'configure', cmd))).each{|k, v| inf[k[1..-1]] = v}
-      inf
-    end
-  end
-  def self.ensemble_exist?(cmd)
-    bool(tk_call('namespace', 'ensemble', 'exists', cmd))
-  end
-
-  def self.eval(namespace, cmd = Proc.new, *args)
-    #tk_call('namespace', 'eval', namespace, cmd, *args)
-    TkNamespace.new(namespece).eval(cmd, *args)
-  end
-=begin
-  def eval(cmd = Proc.new, *args)
-    #TkNamespace.eval(@fullname, cmd, *args)
-    #ns_tk_call(cmd, *args)
-    code_obj = code(cmd)
-    ret = code_obj.call(*args)
-    # uninstall_cmd(TkCore::INTERP._split_tklist(code_obj.path)[-1])
-    uninstall_cmd(_fromUTF8(TkCore::INTERP._split_tklist(_toUTF8(code_obj.path))[-1]))
-    tk_tcl2ruby(ret)
-  end
-=end
-  def eval(cmd = Proc.new, *args)
-    code_obj = code(cmd)
-    ret = code_obj.call(*args)
-    uninstall_cmd(_fromUTF8(TkCore::INTERP._split_tklist(_toUTF8(code_obj.path))[-1]))
-    ret
-  end
-
-  def self.exist?(ns)
-    bool(tk_call('namespace', 'exists', ns))
-  end
-  def exist?
-    TkNamespece.exist?(@fullname)
-  end
-
-  def self.export(*patterns)
-    tk_call('namespace', 'export', *patterns)
-  end
-  def self.export_with_clear(*patterns)
-    tk_call('namespace', 'export', '-clear', *patterns)
-  end
-  def export
-    TkNamespace.export(@fullname)
-  end
-  def export_with_clear
-    TkNamespace.export_with_clear(@fullname)
-  end
-
-  def self.forget(*patterns)
-    tk_call('namespace', 'forget', *patterns)
-  end
-  def forget
-    TkNamespace.forget(@fullname)
-  end
-
-  def self.import(*patterns)
-    tk_call('namespace', 'import', *patterns)
-  end
-  def self.force_import(*patterns)
-    tk_call('namespace', 'import', '-force', *patterns)
-  end
-  def import
-    TkNamespace.import(@fullname)
-  end
-  def force_import
-    TkNamespace.force_import(@fullname)
-  end
-
-  def self.inscope(namespace, script, *args)
-    tk_call('namespace', 'inscope', namespace, script, *args)
-  end
-  def inscope(script, *args)
-    TkNamespace.inscope(@fullname, script, *args)
-  end
-
-  def self.origin(cmd)
-    tk_call('namespace', 'origin', cmd)
-  end
-
-  def self.parent(namespace=None)
-    ns = tk_call('namespace', 'parent', namespace)
-    if Tk_Namespace_ID_TBL.key?(ns)
-      Tk_Namespace_ID_TBL[ns]
-    else
-      ns
-    end
-  end
-  def parent
-    tk_call('namespace', 'parent', @fullname)
-  end
-
-  def self.get_path
-    tk_call('namespace', 'path')
-  end
-  def self.set_path(*namespace_list)
-    tk_call('namespace', 'path', array2tk_list(namespace_list))
-  end
-  def set_path
-    tk_call('namespace', 'path', @fullname)
-  end
-
-  def self.qualifiers(str)
-    tk_call('namespace', 'qualifiers', str)
-  end
-
-  def self.tail(str)
-    tk_call('namespace', 'tail', str)
-  end
-
-  def self.upvar(namespace, *var_pairs)
-    tk_call('namespace', 'upvar', namespace, *(var_pairs.flatten))
-  end
-  def upvar(*var_pairs)
-    TkNamespace.inscope(@fullname, *(var_pairs.flatten))
-  end
-
-  def self.get_unknown_handler
-    tk_tcl2ruby(tk_call('namespace', 'unknown'))
-  end
-  def self.set_unknown_handler(cmd = Proc.new)
-    tk_call('namespace', 'unknown', cmd)
-  end
-
-  def self.which(name)
-    tk_call('namespace', 'which', name)
-  end
-  def self.which_command(name)
-    tk_call('namespace', 'which', '-command', name)
-  end
-  def self.which_variable(name)
-    tk_call('namespace', 'which', '-variable', name)
-  end
-end
-
-TkNamespace::Global = TkNamespace.new('::')
diff --git a/ext/tk/lib/tk/optiondb.rb b/ext/tk/lib/tk/optiondb.rb
deleted file mode 100644
index a806f3971d..0000000000
--- a/ext/tk/lib/tk/optiondb.rb
+++ /dev/null
@@ -1,371 +0,0 @@
-#
-# tk/optiondb.rb : treat option database
-#
-require 'tk'
-
-module TkOptionDB
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['option'.freeze].freeze
-  CmdClassID = ['CMD_CLASS'.freeze, '00000'.taint].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
-    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_without_enc('option', 'clear')
-  end
-  def get(win, name, klass)
-    tk_call('option', 'get', win ,name, klass)
-  end
-  def readfile(file, pri=None)
-    tk_call('option', 'readfile', file, pri)
-  end
-  alias read_file readfile
-  module_function :add, :clear, :get, :readfile, :read_file
-
-  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)? Tk.encoding : Tk.encoding_system)
-
-    unless f_enc
-      f_enc = i_enc
-    end
-
-    ent = []
-    cline = ''
-    open(file, 'r') {|f|
-      while line = f.gets
-        #cline += line.chomp!
-        cline.concat(line.chomp!)
-        case cline
-        when /\\$/    # continue
-          cline.chop!
-          next
-        when /^\s*(!|#)/     # coment
-          cline = ''
-          next
-        when /^([^:]+):(.*)$/
-          pat = $1.strip
-          val = $2.lstrip
-          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
-    read_entries(file, f_enc).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 /^\s*!/     # 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
-
-  @@resource_proc_class.const_set(:CARRIER, '.'.freeze)
-
-  @@resource_proc_class.instance_variable_set('@method_tbl', 
-                                              TkCore::INTERP.create_table)
-  @@resource_proc_class.instance_variable_set('@add_method', false)
-  @@resource_proc_class.instance_variable_set('@safe_mode', 4)
-
-  class << @@resource_proc_class
-    private :new
-
-=begin 
-    CARRIER    = '.'.freeze
-    METHOD_TBL = TkCore::INTERP.create_table
-    ADD_METHOD = false
-    SAFE_MODE  = 4
-=end
-
-=begin
-    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
-    private :__closed_block_check__
-=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, proc_str = self::METHOD_TBL[id]
-      res_proc, proc_str = @method_tbl[id]
-
-      proc_source = TkOptionDB.get(self::CARRIER, id.id2name, '').strip
-      res_proc = nil if proc_str != proc_source # resource is changed
-
-      # unless res_proc.kind_of?(Proc)
-      unless TkComm._callback_entry?(res_proc)
-        #if id == :new || !(self::METHOD_TBL.has_key?(id) || self::ADD_METHOD)
-        if id == :new || !(@method_tbl.has_key?(id) || @add_method)
-          raise NoMethodError, 
-                "not support resource-proc '#{id.id2name}' for #{self.name}"
-        end
-        proc_str = proc_source
-        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 = proc{ 
-          begin
-            #eval("$SAFE = #{self::SAFE_MODE};\nProc.new" + proc_str)
-            eval("$SAFE = #{@safe_mode};\nProc.new" + proc_str)
-          rescue SyntaxError=>err
-            raise SyntaxError, 
-              TkCore::INTERP._toUTF8(err.message.gsub(/\(eval\):\d:/, 
-                                                      "(#{id.id2name}):"))
-          end
-        }.call
-        #self::METHOD_TBL[id] = [res_proc, proc_source]
-        @method_tbl[id] = [res_proc, proc_source]
-      end
-      res_proc.call(*args)
-    end
-
-    private :__check_proc_string__, :method_missing
-  end
-  @@resource_proc_class.freeze
-
-=begin
-  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_without_enc('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
-=end
-  def __create_new_class(klass, func, safe = 4, add = false, parent = nil)
-    if klass.kind_of?(TkWindow)
-      carrier = klass.path
-      klass = CmdClassID.join(TkCore::INTERP._ip_id_)
-      CmdClassID[1].succ!
-      parent = nil # ignore parent
-    else
-      klass = klass.to_s if klass.kind_of?(Symbol)
-      unless (?A..?Z) === klass[0]
-        fail ArgumentError, "bad string '#{klass}' for class name"
-      end
-      if parent == nil
-        install_win(nil)
-      elsif parent.kind_of?(TkWindow)
-        install_win(parent.path)
-      elsif parent <= @@resource_proc_class
-        install_win(parent::CARRIER)
-      else
-        fail ArgumentError, "parent must be Resource-Proc class"
-      end
-      carrier = Tk.tk_call_without_enc('frame', @path, '-class', klass)
-    end
-
-    unless func.kind_of?(Array)
-      fail ArgumentError, "method-list must be Array"
-    end
-    func_str = func.join(' ')
-
-    if parent.kind_of?(Class) && parent <= @@resource_proc_class
-      cmd_klass = Class.new(parent)
-    else
-      cmd_klass = Class.new(TkOptionDB.module_eval('@@resource_proc_class'))
-    end
-    cmd_klass.const_set(:CARRIER, carrier.dup.freeze)
-
-    cmd_klass.instance_variable_set('@method_tbl', TkCore::INTERP.create_table)
-    cmd_klass.instance_variable_set('@add_method', add)
-    cmd_klass.instance_variable_set('@safe_mode', safe)
-    func.each{|f| 
-      cmd_klass.instance_variable_get('@method_tbl')[f.to_s.intern] = nil
-    }
-=begin
-    cmd_klass.const_set(:METHOD_TBL, TkCore::INTERP.create_table)
-    cmd_klass.const_set(:ADD_METHOD, add)
-    cmd_klass.const_set(:SAFE_MODE, safe)
-    func.each{|f| cmd_klass::METHOD_TBL[f.to_s.intern] = nil }
-=end
-
-    cmd_klass
-  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
-      def __null_method(*args); nil; end
-      [ :class_eval, :name, :superclass, :clone, :dup, :autoload, :autoload?, 
-        :ancestors, :const_defined?, :const_get, :const_set, :const_missing, 
-        :class_variables, :constants, :included_modules, :instance_methods, 
-        :method_defined?, :module_eval, :private_instance_methods, 
-        :protected_instance_methods, :public_instance_methods, 
-        :singleton_methods, :remove_const, :remove_method, :undef_method, 
-        :to_s, :inspect, :display, :method, :methods, :respond_to?, 
-        :instance_variable_get, :instance_variable_set, :instance_method, 
-        :instance_eval, :instance_variables, :kind_of?, :is_a?,
-        :private_methods, :protected_methods, :public_methods ].each{|m|
-        alias_method(m, :__null_method)
-      }
-    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
diff --git a/ext/tk/lib/tk/optionobj.rb b/ext/tk/lib/tk/optionobj.rb
deleted file mode 100644
index 8fe7e0ee5a..0000000000
--- a/ext/tk/lib/tk/optionobj.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-#
-# tk/optionobj.rb : control options for a group of widgets
-#
-#  NOTE: If you want to use key-only option (no value), 
-#        use Tk::None for the value of the key-only option. 
-#
-#        e.g. hash_kv({'aaa'=>1, 'bbb'=>Tk::None, 'ccc'=>3}) 
-#                 => ["-aaa", 1, "-bbb", "-ccc", 3]
-#
-require 'tk'
-
-module Tk
-  class OptionObj < Hash
-    include TkUtil
-
-    def initialize(hash = nil)
-      super()
-      @observ = []
-      update_without_notify(_symbolkey2str(hash)) if hash
-    end
-
-    def observ_info
-      @observ.dup
-    end
-
-    def observs
-      @observ.collect{|win|
-        if win.kind_of?(Array)
-          win[0]
-        else
-          win
-        end
-      }
-    end
-
-    def _remove_win(win)
-      if win.kind_of?(Array)
-        widget, method = win
-        @observ.delete_if{|x| 
-          if x.kind_of?(Array)
-            x[0] == widget
-          else
-            x == widget
-          end
-        }
-      else
-        @observ.delete_if{|x|
-          if x.kind_of?(Array)
-            x[0] == win
-          else
-            x == win
-          end
-        }
-      end
-    end
-    private :_remove_win
-
-    def assign(*wins)
-      # win := 
-      #   widget             #==> call widget.configure(hash)
-      #   [widget]           #==> call widget.configure(hash)
-      #   [widget, nil, {src=>target, ... }]
-      #                      #==> call widget.configure(hash) 
-      #                               with converting hash-key
-      #   [widget, method]   #==> call widget.method(hash)
-      #   [widget, method, {src=>target, ... }]
-      #                      #==> call widget.method(hash) 
-      #                               with converting hash-key
-      #   [widget [receiver, method, arg, ... ]]
-      #                      #==> call receiver.method(arg, ... , hash)
-      #   [widget [receiver, method, arg, ... ], {src=>target, ... }]
-      #                      #==> call receiver.method(arg, ... , hash)
-      #                               with onverting hash-key
-      #
-      # src := option_name_on_optobj
-      #
-      # target := 
-      #   nil                #==> not use the src
-      #   option_name_on_target_widget
-      #   [ option_name_on_target_widget, ... ]
-      #                      #==> set all of them
-      #
-      wins.each{|win|
-        _remove_win(win)
-        @observ << win
-        notify(win)
-      }
-      self
-    end
-
-    def unassign(*wins)
-      wins.each{|win|
-        _remove_win(win)
-      }
-      self
-    end
-
-    def notify(target = nil)
-      if target
-        targets = [target]
-      elsif @observ.empty?
-        return self
-      else
-        targets = @observ.dup
-      end
-
-      return self if empty?
-
-      org_hash = _symbolkey2str(self)
-
-      targets.each{|win|
-        widget = receiver = win
-        hash = org_hash
-        begin
-          if win.kind_of?(Array)
-            widget, method, conv_tbl = win
-            receiver = widget
-
-            if conv_tbl
-              hash = {}
-              org_hash.each{|key, val|
-                key = conv_tbl[key] if conv_tbl.key?(key)
-                next unless key
-                if key.kind_of?(Array)
-                  key.each{|k| hash[k] = val}
-                else              
-                  hash[key] = val
-                end
-              }
-            end
-
-            if method.kind_of?(Array)
-              receiver, method, *args = method
-              receiver.__send__(method, *(args << hash))
-            elsif method
-              widget.__send__(method, hash)
-            else
-              widget.configure(hash)
-            end
-
-          else
-            widget.configure(self)
-          end
-        rescue => e
-          if ( ( widget.kind_of?(TkObject) \
-                && widget.respond_to?('exist?') \
-                && ! receiver.exist? ) \
-            || ( receiver.kind_of?(TkObject) \
-                && receiver.respond_to?('exist?') \
-                && ! receiver.exist? ) )
-            @observ.delete(win)
-          else
-            fail e
-          end
-        end
-      }
-
-      self
-    end
-    alias apply notify
-
-    def +(hash)
-      unless hash.kind_of?(Hash)
-        fail ArgumentError, "expect a Hash"
-      end
-      new_obj = self.dup
-      new_obj.update_without_notify(_symbolkey2str(hash))
-      new_obj
-    end
-
-    alias update_without_notify update
-
-    def update(hash)
-      update_without_notify(_symbolkey2str(hash))
-      notify
-    end
-
-    def configure(key, value=nil)
-      if key.kind_of?(Hash)
-        update(key)
-      else
-        store(key,value)
-      end
-    end
-
-    def [](key)
-      super(key.to_s)
-    end
-    alias cget []
-
-    def store(key, val)
-      key = key.to_s
-      super(key, val)
-      notify
-    end
-    def []=(key, val)
-      store(key,val)
-    end
-
-    def replace(hash)
-      super(_symbolkey2str(hash))
-      notify
-    end
-
-    def default(opt)
-      fail RuntimeError, "unknown option `#{opt}'"
-    end
-    private :default
-
-    undef :default=
-  end
-end
diff --git a/ext/tk/lib/tk/pack.rb b/ext/tk/lib/tk/pack.rb
deleted file mode 100644
index 8fab363121..0000000000
--- a/ext/tk/lib/tk/pack.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# tk/pack.rb : control pack geometry manager
-#
-require 'tk'
-
-module TkPack
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['pack'.freeze].freeze
-
-  def configure(win, *args)
-    if args[-1].kind_of?(Hash)
-      opts = args.pop
-    else
-      opts = {}
-    end
-    params = []
-    # params.push((win.kind_of?(TkObject))? win.epath: win)
-    params.push(_epath(win))
-    args.each{|win|
-      # params.push((win.kind_of?(TkObject))? win.epath: win)
-      params.push(_epath(win))
-    }
-    opts.each{|k, v|
-      params.push("-#{k}")
-      # params.push((v.kind_of?(TkObject))? v.epath: v)
-      params.push(_epath(v))
-    }
-    tk_call_without_enc("pack", 'configure', *params)
-  end
-  alias pack configure
-
-  def forget(*args)
-    return '' if args.size == 0
-    wins = args.collect{|win|
-      # (win.kind_of?(TkObject))? win.epath: win
-      _epath(win)
-    }
-    tk_call_without_enc('pack', 'forget', *wins)
-  end
-
-  def info(slave)
-    # slave = slave.epath if slave.kind_of?(TkObject)
-    slave = _epath(slave)
-    ilist = list(tk_call_without_enc('pack', 'info', slave))
-    info = {}
-    while key = ilist.shift
-      info[key[1..-1]] = ilist.shift
-    end
-    return info
-  end
-
-  def propagate(master, mode=None)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    if mode == None
-      bool(tk_call_without_enc('pack', 'propagate', master))
-    else
-      tk_call_without_enc('pack', 'propagate', master, mode)
-    end
-  end
-
-  def slaves(master)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    list(tk_call_without_enc('pack', 'slaves', master))
-  end
-
-  module_function :pack, :configure, :forget, :info, :propagate, :slaves
-end
-=begin
-def TkPack(win, *args)
-  if args[-1].kind_of?(Hash)
-    opts = args.pop
-  else
-    opts = {}
-  end
-  params = []
-  params.push((win.kind_of?(TkObject))? win.epath: win)
-  args.each{|win|
-    params.push((win.kind_of?(TkObject))? win.epath: win)
-  }
-  opts.each{|k, v|
-    params.push("-#{k}")
-    params.push((v.kind_of?(TkObject))? v.epath: v)
-  }
-  tk_call_without_enc("pack", *params)
-end
-=end
diff --git a/ext/tk/lib/tk/package.rb b/ext/tk/lib/tk/package.rb
deleted file mode 100644
index d1eb27674d..0000000000
--- a/ext/tk/lib/tk/package.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# tk/package.rb : package command
-#
-require 'tk'
-
-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 if_needed(pkg, ver, *arg, &b)
-    size = arg.size
-
-    if size==0 && !b
-      # proc info
-      procedure(tk_call('package', 'ifneeded', pkg, ver))
-
-    elsif size==0 && b
-      # set proc
-      cmd = proc(&b)
-      tk_call('package', 'ifneeded', pkg, ver, cmd)
-      cmd
-
-    elsif size==1 && !b
-      # set proc
-      cmd = arg[0]
-      if cmd
-        tk_call('package', 'ifneeded', pkg, ver, cmd)
-        cmd
-      else
-        # remove proc
-        tk_call('package', 'ifneeded', pkg, ver, '')
-        nil
-      end
-
-    else
-      fail ArgumentError, 'too many arguments'
-    end
-  end
-
-  def names
-    tk_split_simplelist(tk_call('package', 'names'))
-  end
-
-  def provide(package, version=nil)
-    if version
-      tk_call('package', 'provide', package, version)
-    end
-    if (ret = tk_call('package', 'provide', package)) == ''
-      nil
-    else
-      ret
-    end
-  end
-
-  def present(package, version=None)
-    begin
-      tk_call('package', 'present', package, version)
-    rescue => e
-      fail e.class, 'TkPackage ' << e.message
-    end
-  end
-
-  def present_exact(package, version)
-    begin
-      tk_call('package', 'present', '-exact', package, version)
-    rescue => e
-      fail e.class, 'TkPackage ' << e.message
-    end
-  end
-
-  def require(package, version=None)
-    begin
-      tk_call('package', 'require', package, version)
-    rescue => e
-      fail e.class, 'TkPackage ' << e.message
-    end
-  end
-
-  def require_exact(package, version)
-    begin
-      tk_call('package', 'require', '-exact', package, version)
-    rescue => e
-      fail e.class, 'TkPackage ' << e.message
-    end
-  end
-
-  def unknown_proc(*arg, &b)
-    size = arg.size
-
-    if size==0 && !b
-      # proc info
-      procedure(tk_call('package', 'unknown'))
-
-    elsif size==0 && b
-      # set proc
-      cmd = proc(&b)
-      tk_call('package', 'unknown', cmd)
-      cmd
-
-    elsif size==1 && !b
-      # set proc
-      cmd = arg[0]
-      if cmd
-        tk_call('package', 'unknown', cmd)
-        cmd
-      else
-        # remove proc
-        tk_call('package', 'unknown', '')
-        nil
-      end
-
-    else
-      fail ArgumentError, 'too many arguments'
-    end
-  end
-
-  def versions(package)
-    tk_split_simplelist(tk_call('package', 'versions', package))
-  end
-
-  def vcompare(version1, version2)
-    number(tk_call('package', 'vcompare', version1, version2))
-  end
-
-  def vsatisfies(version1, version2)
-    bool(tk_call('package', 'vsatisfies', version1, version2))
-  end
-end
diff --git a/ext/tk/lib/tk/palette.rb b/ext/tk/lib/tk/palette.rb
deleted file mode 100644
index 2b6fdf5d90..0000000000
--- a/ext/tk/lib/tk/palette.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-#   tk/palette.rb : methods for Tcl/Tk standard library 'palette.tcl'
-#                     1998/06/21 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-require 'tk'
-
-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)
-  end
-  def TkPalette.setPalette(*args)
-    TkPalette.set(*args)
-  end
-
-  def TkPalette.bisque
-    tk_call('tk_bisque')
-  end
-
-  def TkPalette.darken(color, percent)
-    tk_call('tkDarken', color, percent)
-  end
-
-  def TkPalette.recolorTree(win, colors)
-    if not colors.kind_of?(Hash)
-      fail "2nd arg need to be Hash"
-    end
-
-    tk_call('global', "tkPalette")
-    colors.each{|key, value|
-      begin
-        if win.cget(key) == tk_call('set', "tkPalette(#{key})")
-          win[key] = colors[key]
-        end
-      rescue
-        # ignore
-      end
-    }
-
-    TkWinfo.children(win).each{|w| TkPalette.recolorTree(w, colors)}
-  end
-
-  def recolorTree(colors)
-    TkPalette.recolorTree(self, colors)
-  end
-end
diff --git a/ext/tk/lib/tk/panedwindow.rb b/ext/tk/lib/tk/panedwindow.rb
deleted file mode 100644
index c6cf3cd11f..0000000000
--- a/ext/tk/lib/tk/panedwindow.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-#
-# tk/panedwindow.rb : treat panedwindow
-#
-require 'tk'
-
-class TkPanedWindow<TkWindow
-  TkCommandNames = ['panedwindow'.freeze].freeze
-  WidgetClassName = 'Panedwindow'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('panedwindow', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('panedwindow', @path)
-  #  end
-  #end
-  #private :create_self
-
-  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 = args.collect{|w| (w.kind_of?(TkObject))? w.epath: w }
-      args = args.collect{|w| _epath(w) }
-      #args.push(hash_kv(keys))
-      args.concat(hash_kv(keys))
-    else
-      args.push(keys) if keys
-      # args = args.collect{|w| (w.kind_of?(TkObject))? w.epath: w }
-      args = args.collect{|w| _epath(w) }
-    end
-    tk_send_without_enc('add', *args)
-    self
-  end
-
-  def forget(win, *wins)
-    wins.unshift(win)
-    # tk_send_without_enc('forget', *((w.kind_of?(TkObject))? w.epath: w))
-    tk_send_without_enc('forget', *(wins.collect{|w| _epath(w)}))
-    self
-  end
-  alias del forget
-  alias delete forget
-  alias remove forget
-
-  def identify(x, y)
-    list(tk_send_without_enc('identify', x, y))
-  end
-
-  def proxy_coord
-    list(tk_send_without_enc('proxy', 'coord'))
-  end
-  def proxy_forget
-    tk_send_without_enc('proxy', 'forget')
-    self
-  end
-  def proxy_place(x, y)
-    tk_send_without_enc('proxy', 'place', x, y)
-    self
-  end
-
-  def sash_coord(index)
-    list(tk_send('sash', 'coord', index))
-  end
-  def sash_dragto(index, x, y)
-    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)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    tk_tcl2ruby(tk_send_without_enc('panecget', win, "-#{key}"))
-  end
-
-  def paneconfigure(win, key, value=nil)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    if key.kind_of? Hash
-      params = []
-      key.each{|k, v|
-        params.push("-#{k}")
-        # params.push((v.kind_of?(TkObject))? v.epath: v)
-        params.push(_epath(v))
-      }
-      tk_send_without_enc('paneconfigure', win, *params)
-    else
-      # value = value.epath if value.kind_of?(TkObject)
-      value = _epath(value)
-      tk_send_without_enc('paneconfigure', win, "-#{key}", value)
-    end
-    self
-  end
-  alias pane_config paneconfigure
-
-  def paneconfiginfo(win, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      # win = win.epath if win.kind_of?(TkObject)
-      win = _epath(win)
-      if key
-        #conf = tk_split_list(tk_send_without_enc('paneconfigure', 
-        #                                         win, "-#{key}"))
-        conf = tk_split_list(tk_send_without_enc('paneconfigure', 
-                                                 win, "-#{key}"), 
-                             false, true)
-        conf[0] = conf[0][1..-1]
-        if conf[0] == 'hide'
-          conf[3] = bool(conf[3]) unless conf[3].empty?
-          conf[4] = bool(conf[4]) unless conf[4].empty?
-        end
-        conf
-      else
-        #tk_split_simplelist(tk_send_without_enc('paneconfigure', 
-        #                                        win)).collect{|conflist|
-        #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('paneconfigure', win), 
-                            false, false).collect{|conflist|
-          conf = tk_split_simplelist(conflist, false, true)
-          conf[0] = conf[0][1..-1]
-          if conf[3]
-            if conf[0] == 'hide'
-              conf[3] = bool(conf[3]) unless conf[3].empty?
-            elsif conf[3].index('{')
-              conf[3] = tk_split_list(conf[3]) 
-            else
-              conf[3] = tk_tcl2ruby(conf[3]) 
-            end
-          end
-          if conf[4]
-            if conf[0] == 'hide'
-              conf[4] = bool(conf[4]) unless conf[4].empty?
-            elsif conf[4].index('{')
-              conf[4] = tk_split_list(conf[4]) 
-            else
-              conf[4] = tk_tcl2ruby(conf[4]) 
-            end
-          end
-          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      # win = win.epath if win.kind_of?(TkObject)
-      win = _epath(win)
-      if key
-        #conf = tk_split_list(tk_send_without_enc('paneconfigure', 
-        #                                         win, "-#{key}"))
-        conf = tk_split_list(tk_send_without_enc('paneconfigure', 
-                                                 win, "-#{key}"), 
-                             false, true)
-        key = conf.shift[1..-1]
-        if key == 'hide'
-          conf[2] = bool(conf[2]) unless conf[2].empty?
-          conf[3] = bool(conf[3]) unless conf[3].empty?
-        end
-        { key => conf }
-      else
-        ret = {}
-        #tk_split_simplelist(tk_send_without_enc('paneconfigure', 
-        #                                        win)).each{|conflist|
-        #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('paneconfigure', win), 
-                            false, false).each{|conflist|
-          conf = tk_split_simplelist(conflist, false, true)
-          key = conf.shift[1..-1]
-          if key
-            if key == 'hide'
-              conf[2] = bool(conf[2]) unless conf[2].empty?
-            elsif conf[2].index('{')
-              conf[2] = tk_split_list(conf[2]) 
-            else
-              conf[2] = tk_tcl2ruby(conf[2]) 
-            end
-          end
-          if conf[3]
-            if key == 'hide'
-              conf[3] = bool(conf[3]) unless conf[3].empty?
-            elsif conf[3].index('{')
-              conf[3] = tk_split_list(conf[3]) 
-            else
-              conf[3] = tk_tcl2ruby(conf[3]) 
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        ret
-      end
-    end
-  end
-  alias pane_configinfo paneconfiginfo
-
-  def current_paneconfiginfo(win, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = paneconfiginfo(win, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        paneconfiginfo(win).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      paneconfiginfo(win, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-
-  alias current_pane_configinfo current_paneconfiginfo
-
-  def panes
-    list(tk_send_without_enc('panes'))
-  end
-end
-TkPanedwindow = TkPanedWindow
diff --git a/ext/tk/lib/tk/place.rb b/ext/tk/lib/tk/place.rb
deleted file mode 100644
index f7ebdfcbd6..0000000000
--- a/ext/tk/lib/tk/place.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# tk/place.rb : control place geometry manager
-#
-require 'tk'
-
-module TkPlace
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['place'.freeze].freeze
-
-  def configure(win, slot, value=None)
-    # for >= Tk8.4a2 ?
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    if slot.kind_of? Hash
-      params = []
-      slot.each{|k, v|
-        params.push("-#{k}")
-        # params.push((v.kind_of?(TkObject))? v.epath: v)
-        params.push(_epath(v))
-      }
-      tk_call_without_enc('place', 'configure', win, *params)
-    else
-      # value = value.epath if value.kind_of?(TkObject)
-      value = _epath(value)
-      tk_call_without_enc('place', 'configure', win, "-#{slot}", value)
-    end
-  end
-  alias place configure
-
-  def configinfo(win, slot = nil)
-    # for >= Tk8.4a2 ?
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      # win = win.epath if win.kind_of?(TkObject)
-      win = _epath(win)
-      if slot
-        #conf = tk_split_list(tk_call_without_enc('place', 'configure', 
-        #                                        win, "-#{slot}") )
-        conf = tk_split_simplelist(tk_call_without_enc('place', 'configure', 
-                                                       win, "-#{slot}") )
-        conf[0] = conf[0][1..-1]
-        conf[1] = tk_tcl2ruby(conf[1])
-        conf[2] = tk_tcl2ruby(conf[1])
-        conf[3] = tk_tcl2ruby(conf[1])
-        conf[4] = tk_tcl2ruby(conf[1])
-        conf
-      else
-        tk_split_simplelist(tk_call_without_enc('place', 'configure', 
-                                                win)).collect{|conflist|
-          #conf = list(conflist)
-          conf = simplelist(conflist).collect!{|inf| tk_tcl2ruby(inf)}
-          conf[0] = conf[0][1..-1]
-          conf
-        }
-      end
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      current_configinfo(win, slot)
-    end
-  end
-
-  def current_configinfo(win, slot = nil)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    if slot
-      #conf = tk_split_list(tk_call_without_enc('place', 'configure', 
-      #                                         win, "-#{slot}") )
-      conf = tk_split_simplelist(tk_call_without_enc('place', 'configure', 
-                                                     win, "-#{slot}") )
-      # { conf[0][1..-1] => conf[1] }
-      { conf[0][1..-1] => tk_tcl2ruby(conf[4]) }
-    else
-      ret = {}
-      #tk_split_list(tk_call_without_enc('place','configure',win)).each{|conf|
-      tk_split_simplelist(tk_call_without_enc('place', 'configure', 
-                                              win)).each{|conf_list|
-        #ret[conf[0][1..-1]] = conf[1]
-        conf = simplelist(conf_list)
-        ret[conf[0][1..-1]] = tk_tcl2ruby(conf[4])
-      }
-      ret
-    end
-  end
-
-  def forget(win)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    tk_call_without_enc('place', 'forget', win)
-  end
-
-  def info(win)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    #ilist = list(tk_call_without_enc('place', 'info', win))
-    ilist = simplelist(tk_call_without_enc('place', 'info', win))
-    info = {}
-    while key = ilist.shift
-      #info[key[1..-1]] = ilist.shift
-      info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
-    end
-    return info
-  end
-
-  def slaves(master)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    list(tk_call('place', 'slaves', master))
-  end
-
-  module_function :place, :configure, :configinfo, :current_configinfo
-  module_function :forget, :info, :slaves
-end
-=begin
-def TkPlace(win, slot, value=None)
-  win = win.epath if win.kind_of?(TkObject)
-  if slot.kind_of? Hash
-    params = []
-    slot.each{|k, v|
-      params.push("-#{k}")
-      params.push((v.kind_of?(TkObject))? v.epath: v)
-    }
-    tk_call_without_enc('place', win, *params)
-  else
-    value = value.epath if value.kind_of?(TkObject)
-    tk_call_without_enc('place', win, "-#{slot}", value)
-  end
-end
-=end
diff --git a/ext/tk/lib/tk/radiobutton.rb b/ext/tk/lib/tk/radiobutton.rb
deleted file mode 100644
index f8f67d709a..0000000000
--- a/ext/tk/lib/tk/radiobutton.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# tk/radiobutton.rb : treat radiobutton widget
-#
-require 'tk'
-require 'tk/button'
-
-class TkRadioButton<TkButton
-  TkCommandNames = ['radiobutton'.freeze].freeze
-  WidgetClassName = 'Radiobutton'.freeze
-  WidgetClassNames[WidgetClassName] = self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('radiobutton', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('radiobutton', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def __boolval_optkeys
-    super() << 'indicatoron'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'selectcolor'
-  end
-  private :__strval_optkeys
-
-  def __ruby2val_optkeys  # { key=>proc, ... }
-    {
-      'variable'=>proc{|v| tk_trace_variable(v)}  # for backward compatibility
-    }
-  end
-  private :__ruby2val_optkeys
-
-
-  def deselect
-    tk_send_without_enc('deselect')
-    self
-  end
-  def select
-    tk_send_without_enc('select')
-    self
-  end
-
-  def get_value
-    var = tk_send_without_enc('cget', '-variable')
-    if TkVariable::USE_TCLs_SET_VARIABLE_FUNCTIONS
-      _fromUTF8(INTERP._get_global_var(var))
-    else
-      INTERP._eval(Kernel.format('global %s; set %s', var, var))
-    end
-  end
-
-  def set_value(val)
-    var = tk_send_without_enc('cget', '-variable')
-    if TkVariable::USE_TCLs_SET_VARIABLE_FUNCTIONS
-      _fromUTF8(INTERP._set_global_var(var, _get_eval_string(val, true)))
-    else
-      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
-      INTERP._eval(Kernel.format('global %s; set %s %s', var, var, s))
-    end
-  end
-end
-TkRadiobutton = TkRadioButton
diff --git a/ext/tk/lib/tk/root.rb b/ext/tk/lib/tk/root.rb
deleted file mode 100644
index 0e5584c7c1..0000000000
--- a/ext/tk/lib/tk/root.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# tk/root.rb : treat root widget
-#
-require 'tk'
-require 'tk/wm'
-require 'tk/menuspec'
-
-class TkRoot<TkWindow
-  include Wm
-  include TkMenuSpec
-
-  def __methodcall_optkeys  # { key=>method, ... }
-    TOPLEVEL_METHODCALL_OPTKEYS
-  end
-  private :__methodcall_optkeys
-
-=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
-    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['.']
-
-    keys = _symbolkey2str(keys)
-
-    # wm commands
-    root.instance_eval{
-      __methodcall_optkeys.each{|key, method|
-        value = keys.delete(key.to_s)
-        self.__send__(method, value) if value
-      }
-    }
-
-    if keys  # wm commands ( for backward comaptibility )
-      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
-
-  def self.to_eval
-    # self::WidgetClassName
-    '.'
-  end
-
-  def create_self
-    @path = '.'
-  end
-  private :create_self
-
-  def path
-    "."
-  end
-
-  def add_menu(menu_info, tearoff=false, opts=nil)
-    # See tk/menuspec.rb for menu_info.
-    # opts is a hash of default configs for all of cascade menus. 
-    # Configs of menu_info can override it. 
-    if tearoff.kind_of?(Hash)
-      opts = tearoff
-      tearoff = false
-    end
-    _create_menubutton(self, menu_info, tearoff, opts)
-  end
-
-  def add_menubar(menu_spec, tearoff=false, opts=nil)
-    # See tk/menuspec.rb for menu_spec.
-    # opts is a hash of default configs for all of cascade menus.
-    # Configs of menu_spec can override it. 
-    menu_spec.each{|info| add_menu(info, tearoff, opts)}
-    self.menu
-  end
-
-  def TkRoot.destroy
-    TkCore::INTERP._invoke('destroy', '.')
-  end
-end
diff --git a/ext/tk/lib/tk/scale.rb b/ext/tk/lib/tk/scale.rb
deleted file mode 100644
index 0b703aa055..0000000000
--- a/ext/tk/lib/tk/scale.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# tk/scale.rb : treat scale widget
-#
-require 'tk'
-
-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') && ! keys['command'].kind_of?(String)
-        cmd = keys.delete('command')
-        keys['command'] = proc{|val| cmd.call(val.to_f)}
-      end
-      #tk_call_without_enc('scale', @path, *hash_kv(keys, true))
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                          *hash_kv(keys, true))
-    else
-      #tk_call_without_enc('scale', @path)
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def __strval_optkeys
-    super() << 'label'
-  end
-  private :__strval_optkeys
-
-  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_without_enc('get', x, y))
-  end
-
-  def coords(val=None)
-    tk_split_list(tk_send_without_enc('coords', val))
-  end
-
-  def identify(x, y)
-    tk_send_without_enc('identify', x, y)
-  end
-
-  def set(val)
-    tk_send_without_enc('set', val)
-  end
-
-  def value
-    get
-  end
-
-  def value= (val)
-    set(val)
-    val
-  end
-end
diff --git a/ext/tk/lib/tk/scrollable.rb b/ext/tk/lib/tk/scrollable.rb
deleted file mode 100644
index ec27b76467..0000000000
--- a/ext/tk/lib/tk/scrollable.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# tk/scrollable.rb : module for scrollable widget
-#
-require 'tk'
-
-module Tk
-  module X_Scrollable
-    def xscrollcommand(cmd=Proc.new)
-      configure_cmd 'xscrollcommand', cmd
-      # Tk.update  # avoid scrollbar trouble
-      self
-    end
-
-    def xview(*index)
-      if index.size == 0
-        list(tk_send_without_enc('xview'))
-      else
-        tk_send_without_enc('xview', *index)
-        self
-      end
-    end
-    def xview_moveto(*index)
-      xview('moveto', *index)
-    end
-    def xview_scroll(*index)
-      xview('scroll', *index)
-    end
-
-    def xscrollbar(bar=nil)
-      if bar
-        @xscrollbar = bar
-        @xscrollbar.orient 'horizontal'
-        self.xscrollcommand {|*arg| @xscrollbar.set(*arg)}
-        @xscrollbar.command {|*arg| self.xview(*arg)}
-        Tk.update  # avoid scrollbar trouble
-      end
-      @xscrollbar
-    end
-  end
-
-  module Y_Scrollable
-    def yscrollcommand(cmd=Proc.new)
-      configure_cmd 'yscrollcommand', cmd
-      # Tk.update  # avoid scrollbar trouble
-      self
-    end
-
-    def yview(*index)
-      if index.size == 0
-        list(tk_send_without_enc('yview'))
-      else
-        tk_send_without_enc('yview', *index)
-        self
-      end
-    end
-    def yview_moveto(*index)
-      yview('moveto', *index)
-    end
-    def yview_scroll(*index)
-      yview('scroll', *index)
-    end
-
-    def yscrollbar(bar=nil)
-      if bar
-        @yscrollbar = bar
-        @yscrollbar.orient 'vertical'
-        self.yscrollcommand {|*arg| @yscrollbar.set(*arg)}
-        @yscrollbar.command {|*arg| self.yview(*arg)}
-        Tk.update  # avoid scrollbar trouble
-      end
-      @yscrollbar
-    end
-  end
-
-  module Scrollable
-    include X_Scrollable
-    include Y_Scrollable
-  end
-end
diff --git a/ext/tk/lib/tk/scrollbar.rb b/ext/tk/lib/tk/scrollbar.rb
deleted file mode 100644
index 70aadfdd4c..0000000000
--- a/ext/tk/lib/tk/scrollbar.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# tk/scrollbar.rb : treat scrollbar widget
-#
-require 'tk'
-
-class TkScrollbar<TkWindow
-  TkCommandNames = ['scrollbar'.freeze].freeze
-  WidgetClassName = 'Scrollbar'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  def create_self(keys)
-    @assigned = []
-    @scroll_proc = proc{|*args| 
-      if self.orient == 'horizontal'
-        @assigned.each{|w| w.xview(*args)}
-      else # 'vertical'
-        @assigned.each{|w| w.yview(*args)}
-      end
-    }
-
-    if keys and keys != None
-      #tk_call_without_enc('scrollbar', @path, *hash_kv(keys, true))
-      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-                          *hash_kv(keys, true))
-    else
-      #tk_call_without_enc('scrollbar', @path)
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def propagate_set(src_win, first, last)
-    self.set(first, last)
-    if self.orient == 'horizontal'
-      @assigned.each{|w| w.xview('moveto', first) if w != src_win}
-    else # 'vertical'
-      @assigned.each{|w| w.yview('moveto', first) if w != src_win}
-    end
-  end
-
-  def assign(*wins)
-    begin
-      self.command(@scroll_proc) if self.cget('command').cmd != @scroll_proc
-    rescue Exception
-      self.command(@scroll_proc)
-    end
-    orient = self.orient
-    wins.each{|w|
-      @assigned << w unless @assigned.index(w)
-      if orient == 'horizontal'
-        w.xscrollcommand proc{|first, last| self.propagate_set(w, first, last)}
-      else # 'vertical'
-        w.yscrollcommand proc{|first, last| self.propagate_set(w, first, last)}
-      end
-    }
-    Tk.update  # avoid scrollbar trouble
-    self
-  end
-
-  def assigned_list
-    begin
-      return @assigned.dup if self.cget('command').cmd == @scroll_proc
-    rescue Exception
-    end
-    fail RuntimeError, "not depend on the assigned_list"
-  end
-
-  def configure(*args)
-    ret = super(*args)
-    # Tk.update  # avoid scrollbar trouble
-    ret
-  end
-
-  #def delta(deltax=None, deltay=None)
-  def delta(deltax, deltay)
-    number(tk_send_without_enc('delta', deltax, deltay))
-  end
-
-  #def fraction(x=None, y=None)
-  def fraction(x, y)
-    number(tk_send_without_enc('fraction', x, y))
-  end
-
-  def identify(x, y)
-    tk_send_without_enc('identify', x, y)
-  end
-
-  def get
-    #ary1 = tk_send('get').split
-    #ary2 = []
-    #for i in ary1
-    #  ary2.push number(i)
-    #end
-    #ary2
-    list(tk_send_without_enc('get'))
-  end
-
-  def set(first, last)
-    tk_send_without_enc('set', first, last)
-    self
-  end
-
-  def activate(element=None)
-    tk_send_without_enc('activate', element)
-  end
-end
-
-class TkXScrollbar<TkScrollbar
-  def create_self(keys)
-    keys = {} unless keys
-    keys['orient'] = 'horizontal'
-    super(keys)
-  end
-  private :create_self
-end
-
-class TkYScrollbar<TkScrollbar
-  def create_self(keys)
-    keys = {} unless keys
-    keys['orient'] = 'vertical'
-    super(keys)
-  end
-  private :create_self
-end
diff --git a/ext/tk/lib/tk/scrollbox.rb b/ext/tk/lib/tk/scrollbox.rb
deleted file mode 100644
index 833505be17..0000000000
--- a/ext/tk/lib/tk/scrollbox.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#               tk/scrollbox.rb - Tk Listbox with Scrollbar
-#                                 as an example of Composite Widget
-#                       $Date: 2004/10/11 04:51:07 $
-#                       by Yukihiro Matsumoto <matz@netlab.co.jp>
-#
-require 'tk'
-require 'tk/listbox'
-
-class TkScrollbox<TkListbox
-  include TkComposite
-  def initialize_composite(keys=nil)
-    list = TkListbox.new(@frame)
-    scroll = TkScrollbar.new(@frame)
-    @path = list.path
-
-=begin
-    list.configure 'yscroll', scroll.path+" set"
-    list.pack 'side'=>'left','fill'=>'both','expand'=>'yes'
-    scroll.configure 'command', list.path+" yview"
-    scroll.pack 'side'=>'right','fill'=>'y'
-=end
-    list.yscrollbar(scroll)
-    list.pack('side'=>'left','fill'=>'both','expand'=>'yes')
-    scroll.pack('side'=>'right','fill'=>'y')
-
-    delegate('DEFAULT', list)
-    delegate('foreground', list)
-    delegate('background', list, scroll)
-    delegate('borderwidth', @frame)
-    delegate('relief', @frame)
-
-    configure keys if keys
-  end
-  private :initialize_composite
-end
diff --git a/ext/tk/lib/tk/selection.rb b/ext/tk/lib/tk/selection.rb
deleted file mode 100644
index 5caa6ef8ef..0000000000
--- a/ext/tk/lib/tk/selection.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# tk/selection.rb : control selection
-#
-require 'tk'
-
-module TkSelection
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['selection'.freeze].freeze
-
-  def self.clear(sel=nil)
-    if sel
-      tk_call_without_enc('selection', 'clear', '-selection', sel)
-    else
-      tk_call_without_enc('selection', 'clear')
-    end
-  end
-  def self.clear_on_display(win, sel=nil)
-    if sel
-      tk_call_without_enc('selection', 'clear', 
-                          '-displayof', win, '-selection', sel)
-    else
-      tk_call_without_enc('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))
-    _fromUTF8(tk_call_without_enc('selection', 'get', *hash_kv(keys)))
-  end
-  def self.get_on_display(win, keys=nil)
-    #tk_call('selection', 'get', '-displayof', win, *hash_kv(keys))
-    _fromUTF8(tk_call_without_enc('selection', 'get', '-displayof', 
-                                  win, *hash_kv(keys)))
-  end
-  def get(keys=nil)
-    TkSelection.get_on_display(self, sel)
-  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.concat(hash_kv(keys))
-    args.concat([win, func])
-    tk_call_without_enc(*args)
-  end
-  def handle(func=Proc.new, keys=nil, &b)
-    TkSelection.handle(self, func, keys, &b)
-  end
-
-  def self.get_owner(sel=nil)
-    if sel
-      window(tk_call_without_enc('selection', 'own', '-selection', sel))
-    else
-      window(tk_call_without_enc('selection', 'own'))
-    end
-  end
-  def self.get_owner_on_display(win, sel=nil)
-    if sel
-      window(tk_call_without_enc('selection', 'own', 
-                                 '-displayof', win, '-selection', sel))
-    else
-      window(tk_call_without_enc('selection', 'own', '-displayof', win))
-    end
-  end
-  def get_owner(sel=nil)
-    TkSelection.get_owner_on_display(self, sel)
-    self
-  end
-
-  def self.set_owner(win, keys=nil)
-    tk_call_without_enc('selection', 'own', *(hash_kv(keys) << win))
-  end
-  def set_owner(keys=nil)
-    TkSelection.set_owner(self, keys)
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/spinbox.rb b/ext/tk/lib/tk/spinbox.rb
deleted file mode 100644
index 1eed4d1dc4..0000000000
--- a/ext/tk/lib/tk/spinbox.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-#               tk/spinbox.rb - Tk spinbox classes
-#                       $Date: 2005/10/22 22:16:24 $
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-#
-require 'tk'
-require 'tk/entry'
-
-class TkSpinbox<TkEntry
-  TkCommandNames = ['spinbox'.freeze].freeze
-  WidgetClassName = 'Spinbox'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  class SpinCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?d, ?s, :direction ], 
-        [ ?s, ?e, :current ], 
-        [ ?W, ?w, :widget ], 
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?s, TkComm.method(:string) ], 
-        [ ?w, TkComm.method(:window) ], 
-
-        [ ?e, proc{|val|
-            #enc = Tk.encoding
-            enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
-            if enc
-              Tk.fromUTF8(TkComm::string(val), enc)
-            else
-              TkComm::string(val)
-            end
-          }
-        ], 
-
-        nil
-      ]
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        (val)? '1': '0'
-      end
-    end
-
-    def self._config_keys
-      ['command']
-    end
-  end
-
-  def __validation_class_list
-    super() << SpinCommand
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, SpinCommand)
-
-  #def create_self(keys)
-  #  tk_call_without_enc('spinbox', @path)
-  #  if keys and keys != None
-  #    configure(keys)
-  #  end
-  #end
-  #private :create_self
-
-  def __boolval_optkeys
-    super() << 'wrap'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'buttonbackground' << 'format'
-  end
-  private :__strval_optkeys
-
-  def __listval_optkeys
-    super() << 'values'
-  end
-  private :__listval_optkeys
-
-  def identify(x, y)
-    tk_send_without_enc('identify', x, y)
-  end
-
-  def spinup
-    tk_send_without_enc('invoke', 'spinup')
-    self
-  end
-
-  def spindown
-    tk_send_without_enc('invoke', 'spindown')
-    self
-  end
-
-  def set(str)
-    _fromUTF8(tk_send_without_enc('set', _get_eval_enc_str(str)))
-  end
-end
diff --git a/ext/tk/lib/tk/tagfont.rb b/ext/tk/lib/tk/tagfont.rb
deleted file mode 100644
index a1807395d2..0000000000
--- a/ext/tk/lib/tk/tagfont.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# tk/tagfont.rb : control font of tags
-#
-require 'tk'
-
-module TkTreatTagFont
-  def font_configinfo
-    @parent.tagfont_configinfo(@id)
-  end
-#  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(win, wintag=nil)
-    @parent.tagfont_copy(@id, win, wintag)
-    self
-  end
-
-  def latinfont_copy(win, wintag=nil)
-    @parent.latintagfont_copy(@id, win, wintag)
-    self
-  end
-  alias asciifont_copy latinfont_copy
-
-  def kanjifont_copy(win, wintag=nil)
-    @parent.kanjitagfont_copy(@id, win, wintag)
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/text.rb b/ext/tk/lib/tk/text.rb
deleted file mode 100644
index 0db10a653f..0000000000
--- a/ext/tk/lib/tk/text.rb
+++ /dev/null
@@ -1,1550 +0,0 @@
-#
-#               tk/text.rb - Tk text classes
-#                       $Date: 2005/11/23 12:01:05 $
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-require 'tk'
-require 'tk/itemfont'
-require 'tk/itemconfig'
-require 'tk/scrollable'
-require 'tk/txtwin_abst'
-
-module TkTextTagConfig
-  include TkTreatItemFont
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)  # id := [ type, tagOrId ]
-    [self.path, id[0], 'cget', id[1]]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)  # id := [ type, tagOrId ]
-    [self.path, id[0], 'configure', id[1]]
-  end
-  private :__item_config_cmd
-
-  def __item_pathname(id)
-    if id.kind_of?(Array)
-      id = tagid(id[1])
-    end
-    [self.path, id].join(';')
-  end
-  private :__item_pathname
-
-  def tag_cget(tagOrId, option)
-    itemcget(['tag', tagOrId], option)
-  end
-  def tag_configure(tagOrId, slot, value=None)
-    itemconfigure(['tag', tagOrId], slot, value)
-  end
-  def tag_configinfo(tagOrId, slot=nil)
-    itemconfigure(['tag', tagOrId], slot)
-  end
-  def current_tag_configinfo(tagOrId, slot=nil)
-    itemconfigure(['tag', tagOrId], slot)
-  end
-
-  def window_cget(tagOrId, option)
-    itemcget(['window', tagOrId], option)
-  end
-  def window_configure(tagOrId, slot, value=None)
-    itemconfigure(['window', tagOrId], slot, value)
-  end
-  def window_configinfo(tagOrId, slot=nil)
-    itemconfigure(['window', tagOrId], slot)
-  end
-  def current_window_configinfo(tagOrId, slot=nil)
-    itemconfigure(['window', tagOrId], slot)
-  end
-
-  private :itemcget, :itemconfigure
-  private :itemconfiginfo, :current_itemconfiginfo
-end
-
-class TkText<TkTextWin
-  ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
-  #include TkTreatTextTagFont
-  include TkTextTagConfig
-  include Scrollable
-
-  #######################################
-
-  module IndexModMethods
-    def +(mod)
-      return chars(mod) if mod.kind_of?(Numeric)
-
-      mod = mod.to_s
-      if mod =~ /^\s*[+-]?\d/
-        TkText::IndexString.new(String.new(id) << ' + ' << mod)
-      else
-        TkText::IndexString.new(String.new(id) << ' ' << mod)
-      end
-    end
-
-    def -(mod)
-      return chars(-mod) if mod.kind_of?(Numeric)
-
-      mod = mod.to_s
-      if mod =~ /^\s*[+-]?\d/
-        TkText::IndexString.new(String.new(id) << ' - ' << mod)
-      elsif mod =~ /^\s*[-]\s+(\d.*)$/
-        TkText::IndexString.new(String.new(id) << ' - -' << $1)
-      else
-        TkText::IndexString.new(String.new(id) << ' ' << mod)
-      end
-    end
-
-    def chars(mod)
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' chars')
-      else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' chars')
-      end
-    end
-    alias char chars
-
-    def display_chars(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display chars')
-      else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display chars')
-      end
-    end
-    alias display_char display_chars
-
-    def any_chars(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any chars')
-      else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any chars')
-      end
-    end
-    alias any_char any_chars
-
-    def indices(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' indices')
-      else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' indices')
-      end
-    end
-
-    def display_indices(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display indices')
-      else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display indices')
-      end
-    end
-
-    def any_indices(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any indices')
-      else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any indices')
-      end
-    end
-
-    def lines(mod)
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' lines')
-      else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' lines')
-      end
-    end
-    alias line lines
-
-    def display_lines(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display_lines')
-      else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display lines')
-      end
-    end
-    alias display_line display_lines
-
-    def any_lines(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any_lines')
-      else
-        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any lines')
-      end
-    end
-    alias any_line any_lines
-
-    def linestart
-      TkText::IndexString.new(String.new(id) << ' linestart')
-    end
-    def lineend
-      TkText::IndexString.new(String.new(id) << ' lineend')
-    end
-
-    def display_linestart
-      # Tk8.5 feature
-      TkText::IndexString.new(String.new(id) << ' display linestart')
-    end
-    def display_lineend
-      # Tk8.5 feature
-      TkText::IndexString.new(String.new(id) << ' display lineend')
-    end
-
-    def wordstart
-      TkText::IndexString.new(String.new(id) << ' wordstart')
-    end
-    def wordend
-      TkText::IndexString.new(String.new(id) << ' wordend')
-    end
-
-    def display_wordstart
-      # Tk8.5 feature
-      TkText::IndexString.new(String.new(id) << ' display wordstart')
-    end
-    def display_wordend
-      # Tk8.5 feature
-      TkText::IndexString.new(String.new(id) << ' display wordend')
-    end
-  end
-
-  class IndexString < String
-    include IndexModMethods
-
-    def self.at(x,y)
-      self.new("@#{x},#{y}")
-    end
-
-    def self.new(str)
-      if str.kind_of?(String)
-        super(str)
-      elsif str.kind_of?(Symbol)
-        super(str.to_s)
-      else
-        str
-      end
-    end
-
-    def id
-      self
-    end
-  end
-
-  #######################################
-
-  TkCommandNames = ['text'.freeze].freeze
-  WidgetClassName = 'Text'.freeze
-  WidgetClassNames[WidgetClassName] = self
-
-  def self.new(*args, &block)
-    obj = super(*args){}
-    obj.init_instance_variable
-    obj.instance_eval(&block) if defined? yield
-    obj
-  end
-
-  def init_instance_variable
-    @cmdtbl = []
-    @tags = {}
-  end
-
-  def __destroy_hook__
-    TkTextTag::TTagID_TBL.delete(@path)
-    TkTextMark::TMarkID_TBL.delete(@path)
-  end
-
-  def create_self(keys)
-    #if keys and keys != None
-    #  #tk_call_without_enc('text', @path, *hash_kv(keys, true))
-    #  tk_call_without_enc(self.class::TkCommandNames[0], @path, 
-    #                     *hash_kv(keys, true))
-    #else
-    #  #tk_call_without_enc('text', @path)
-    #  tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    #end
-    super(keys)
-    init_instance_variable
-  end
-  private :create_self
-
-  def __strval_optkeys
-    super() << 'inactiveseletcionbackground'
-  end
-  private :__strval_optkeys
-
-  def self.at(x, y)
-    TkText::IndexString.at(x, y)
-  end
-
-  def at(x, y)
-    TkText::IndexString.at(x, y)
-  end
-
-  def index(idx)
-    TkText::IndexString.new(tk_send_without_enc('index', 
-                                                _get_eval_enc_str(idx)))
-  end
-
-  def get_displaychars(*index)
-    # Tk8.5 feature
-    get('-displaychars', *index)
-  end
-
-  def value
-    _fromUTF8(tk_send_without_enc('get', "1.0", "end - 1 char"))
-  end
-
-  def value= (val)
-    tk_send_without_enc('delete', "1.0", 'end')
-    tk_send_without_enc('insert', "1.0", _get_eval_enc_str(val))
-    val
-  end
-
-  def clear
-    tk_send_without_enc('delete', "1.0", 'end')
-    self
-  end
-  alias erase clear
-
-  def _addcmd(cmd)
-    @cmdtbl.push cmd
-  end
-
-  def _addtag(name, obj)
-    @tags[name] = obj
-  end
-
-  def tagid(tag)
-    if tag.kind_of?(TkTextTag) \
-      || tag.kind_of?(TkTextMark) \
-      || tag.kind_of?(TkTextImage) \
-      || tag.kind_of?(TkTextWindow)
-      tag.id
-    else
-      tag  # maybe an Array of configure paramters
-    end
-  end
-  private :tagid
-
-  def tagid2obj(tagid)
-    if @tags[tagid]
-      @tags[tagid]
-    else
-      tagid
-    end
-  end
-
-  def tag_names(index=None)
-    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag', 'names', _get_eval_enc_str(index)))).collect{|elt|
-    tk_split_simplelist(tk_send_without_enc('tag', 'names', _get_eval_enc_str(index)), false, true).collect{|elt|
-      tagid2obj(elt)
-    }
-  end
-
-  def mark_names
-    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('mark', 'names'))).collect{|elt|
-    tk_split_simplelist(tk_send_without_enc('mark', 'names'), false, true).collect{|elt|
-      tagid2obj(elt)
-    }
-  end
-
-  def mark_gravity(mark, direction=nil)
-    if direction
-      tk_send_without_enc('mark', 'gravity', 
-                          _get_eval_enc_str(mark), direction)
-      self
-    else
-      tk_send_without_enc('mark', 'gravity', _get_eval_enc_str(mark))
-    end
-  end
-
-  def mark_set(mark, index)
-    tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark), 
-                        _get_eval_enc_str(index))
-    self
-  end
-  alias set_mark mark_set
-
-  def mark_unset(*marks)
-    tk_send_without_enc('mark', 'unset', 
-                        *(marks.collect{|mark| _get_eval_enc_str(mark)}))
-    self
-  end
-  alias unset_mark mark_unset
-
-  def mark_next(index)
-    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next', 
-                                            _get_eval_enc_str(index))))
-  end
-  alias next_mark mark_next
-
-  def mark_previous(index)
-    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous', 
-                                            _get_eval_enc_str(index))))
-  end
-  alias previous_mark mark_previous
-
-  def image_cget(index, slot)
-    case slot.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      _fromUTF8(tk_send_without_enc('image', 'cget', 
-                                    _get_eval_enc_str(index), "-#{slot}"))
-    else
-      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget', 
-                                                _get_eval_enc_str(index), 
-                                                "-#{slot}")))
-    end
-  end
-
-  def image_configure(index, slot, value=None)
-    if slot.kind_of?(Hash)
-      _fromUTF8(tk_send_without_enc('image', 'configure', 
-                                    _get_eval_enc_str(index), 
-                                    *hash_kv(slot, true)))
-    else
-      _fromUTF8(tk_send_without_enc('image', 'configure', 
-                                    _get_eval_enc_str(index), 
-                                    "-#{slot}", 
-                                    _get_eval_enc_str(value)))
-    end
-    self
-  end
-
-  def image_configinfo(index, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        case slot.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
-        else
-          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        # tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).collect{|conflist|
-        #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).collect{|conflist|
-          conf = tk_split_simplelist(conflist, false, true)
-          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[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        case slot.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
-        else
-          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).each{|conflist|
-        #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).each{|conflist|
-          conf = tk_split_simplelist(conflist, false, true)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
-              else
-                conf[2] = tk_tcl2ruby(conf[2]) 
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
-              else
-                conf[3] = tk_tcl2ruby(conf[3]) 
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        ret
-      end
-    end
-  end
-
-  def current_image_configinfo(index, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        conf = image_configinfo(index, slot)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        image_configinfo(index).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      image_configinfo(index, slot).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-
-  def image_names
-    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'names'))).collect{|elt|
-    tk_split_simplelist(tk_send_without_enc('image', 'names'), false, true).collect{|elt|
-      tagid2obj(elt)
-    }
-  end
-
-  def set_insert(index)
-    tk_send_without_enc('mark','set','insert', _get_eval_enc_str(index))
-    self
-  end
-
-  def set_current(index)
-    tk_send_without_enc('mark','set','current', _get_eval_enc_str(index))
-    self
-  end
-
-  def insert(index, chars, *tags)
-    if tags[0].kind_of?(Array)
-      # multiple chars-taglist argument :: str, [tag,...], str, [tag,...], ...
-      args = [chars]
-      while tags.size > 0
-        args << 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 :: str, tag, tag, ...
-      if tags.size == 0
-        super(index, chars)
-      else
-        super(index, chars, tags.collect{|x|_get_eval_string(x)}.join(' '))
-      end
-    end
-  end
-
-  def destroy
-    @tags = {} unless @tags
-    @tags.each_value do |t|
-      t.destroy
-    end
-    super()
-  end
-
-  def backspace
-    self.delete 'insert'
-  end
-
-  def bbox(index)
-    list(tk_send_without_enc('bbox', _get_eval_enc_str(index)))
-  end
-
-  def compare(idx1, op, idx2)
-    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1), 
-                             op, _get_eval_enc_str(idx2)))
-  end
-
-  def count(idx1, idx2, *opts)
-    # opts are Tk8.5 feature
-    cnt = 0
-    args = opts.collect{|opt|
-      str = opt.to_s
-      cnt += 1 if str != 'update'
-      '-' + str
-    }
-    args << _get_eval_enc_str(idx1) << _get_eval_enc_str(idx2)
-    if cnt <= 1
-      number(tk_send_without_enc('count', *opts))
-    else
-      list(tk_send_without_enc('count', *opts))
-    end
-  end
-
-  def count_info(idx1, idx2, update=true)
-    # Tk8.5 feature
-    opts = [
-      :chars, :displaychars, :displayindices, :displaylines, 
-      :indices, :lines, :xpixels, :ypixels
-    ]
-    if update
-      lst = count(idx1, idx2, :update, *opts)
-    else
-      lst = count(idx1, idx2, *opts)
-    end
-    info = {}
-    opts.each_with_index{|key, idx| info[key] = lst[idx]}
-    info
-  end
-
-  def peer_names()
-    # Tk8.5 feature
-    list(tk_send_without_enc('peer', 'names'))
-  end
-
-  def replace(idx1, idx2, *opts)
-    tk_send('replace', idx1, idx2, *opts)
-    self
-  end
-
-  def debug
-    bool(tk_send_without_enc('debug'))
-  end
-  def debug=(boolean)
-    tk_send_without_enc('debug', boolean)
-    #self
-    boolean
-  end
-
-  def dlineinfo(index)
-    list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
-  end
-
-  def modified?
-    bool(tk_send_without_enc('edit', 'modified'))
-  end
-  def modified(mode)
-    tk_send_without_enc('edit', 'modified', mode)
-    self
-  end
-  def modified=(mode)
-    modified(mode)
-    mode
-  end
-
-  def edit_redo
-    tk_send_without_enc('edit', 'redo')
-    self
-  end
-  def edit_reset
-    tk_send_without_enc('edit', 'reset')
-    self
-  end
-  def edit_separator
-    tk_send_without_enc('edit', 'separator')
-    self
-  end
-  def edit_undo
-    tk_send_without_enc('edit', 'undo')
-    self
-  end
-
-  def xview_pickplace(index)
-    tk_send_without_enc('xview', '-pickplace', _get_eval_enc_str(index))
-    self
-  end
-
-  def yview_pickplace(index)
-    tk_send_without_enc('yview', '-pickplace', _get_eval_enc_str(index))
-    self
-  end
-
-  def text_copy
-    # Tk8.4 feature
-    tk_call_without_enc('tk_textCopy', @path)
-    self
-  end
-
-  def text_cut
-    # Tk8.4 feature
-    tk_call_without_enc('tk_textCut', @path)
-    self
-  end
-
-  def text_paste
-    # Tk8.4 feature
-    tk_call_without_enc('tk_textPaste', @path)
-    self
-  end
-
-  def tag_add(tag, index1, index2=None)
-    tk_send_without_enc('tag', 'add', _get_eval_enc_str(tag), 
-                        _get_eval_enc_str(index1), 
-                        _get_eval_enc_str(index2))
-    self
-  end
-  alias addtag tag_add
-  alias add_tag tag_add
-
-  def tag_delete(*tags)
-    tk_send_without_enc('tag', 'delete', 
-                        *(tags.collect{|tag| _get_eval_enc_str(tag)}))
-    if TkTextTag::TTagID_TBL[@path]
-      tags.each{|tag|
-        if tag.kind_of?(TkTextTag)
-          TkTextTag::TTagID_TBL[@path].delete(tag.id) 
-        else
-          TkTextTag::TTagID_TBL[@path].delete(tag) 
-        end
-      }
-    end
-    self
-  end
-  alias deltag tag_delete
-  alias delete_tag tag_delete
-
-  #def tag_bind(tag, seq, cmd=Proc.new, *args)
-  #  _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
-  #  self
-  #end
-  def tag_bind(tag, seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
-    self
-  end
-
-  #def tag_bind_append(tag, seq, cmd=Proc.new, *args)
-  #  _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
-  #  self
-  #end
-  def tag_bind_append(tag, seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _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
-  end
-
-  def tag_bindinfo(tag, context=nil)
-    _bindinfo([@path, 'tag', 'bind', tag], context)
-  end
-
-=begin
-  def tag_cget(tag, key)
-    case key.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      tk_call_without_enc(@path, 'tag', 'cget', 
-                          _get_eval_enc_str(tag), "-#{key}")
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('tag', 'cget', tag, "-#{key}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('tag','cget',_get_eval_enc_str(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(_fromUTF8(tk_call_without_enc(@path,'tag','cget',_get_eval_enc_str(tag),"-#{key}")))
-    end
-  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)
-      else
-        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag), 
-                            *hash_kv(key, true))
-      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
-      else
-        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag), 
-                            "-#{key}", _get_eval_enc_str(val))
-      end
-    end
-    self
-  end
-
-  def tag_configinfo(tag, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-          conf[4] = tagfont_configinfo(tag, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        ret = tk_split_simplelist(_fromUTF8(tk_send('tag','configure',_get_eval_enc_str(tag)))).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[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          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
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-          conf[4] = tagfont_configinfo(tag, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(_fromUTF8(tk_send('tag','configure',_get_eval_enc_str(tag)))).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
-              else
-                conf[2] = tk_tcl2ruby(conf[2]) 
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
-              else
-                conf[3] = tk_tcl2ruby(conf[3]) 
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        fontconf = ret['font']
-        if fontconf
-          ret.delete('font')
-          ret.delete('kanjifont')
-          fontconf[3] = tagfont_configinfo(tag, fontconf[3])
-          ret['font'] = fontconf
-        end
-        ret
-      end
-    end
-  end
-
-  def current_tag_configinfo(tag, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = tag_configinfo(tag, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        tag_configinfo(tag).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      tag_configinfo(tag, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-=end
-
-  def tag_raise(tag, above=None)
-    tk_send_without_enc('tag', 'raise', _get_eval_enc_str(tag), 
-                        _get_eval_enc_str(above))
-    self
-  end
-
-  def tag_lower(tag, below=None)
-    tk_send_without_enc('tag', 'lower', _get_eval_enc_str(tag), 
-                        _get_eval_enc_str(below))
-    self
-  end
-
-  def tag_remove(tag, *indices)
-    tk_send_without_enc('tag', 'remove', _get_eval_enc_str(tag), 
-                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
-    self
-  end
-
-  def tag_ranges(tag)
-    #l = tk_split_simplelist(tk_send_without_enc('tag', 'ranges',
-    #                                            _get_eval_enc_str(tag)))
-    l = tk_split_simplelist(tk_send_without_enc('tag', 'ranges',
-                                                _get_eval_enc_str(tag)), 
-                            false, true)
-    r = []
-    while key=l.shift
-      r.push [TkText::IndexString.new(key), TkText::IndexString.new(l.shift)]
-    end
-    r
-  end
-
-  def tag_nextrange(tag, first, last=None)
-    simplelist(tk_send_without_enc('tag', 'nextrange', 
-                                   _get_eval_enc_str(tag), 
-                                   _get_eval_enc_str(first), 
-                                   _get_eval_enc_str(last))).collect{|idx|
-      TkText::IndexString.new(idx)
-    }
-  end
-
-  def tag_prevrange(tag, first, last=None)
-    simplelist(tk_send_without_enc('tag', 'prevrange', 
-                                   _get_eval_enc_str(tag), 
-                                   _get_eval_enc_str(first), 
-                                   _get_eval_enc_str(last))).collect{|idx|
-      TkText::IndexString.new(idx)
-    }
-  end
-
-=begin
-  def window_cget(index, slot)
-    case slot.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      _fromUTF8(tk_send_without_enc('window', 'cget', 
-                                    _get_eval_enc_str(index), "-#{slot}"))
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('window', 'cget', index, "-#{slot}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('window', 'cget', _get_eval_enc_str(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(_fromUTF8(tk_send_without_enc('window', 'cget', _get_eval_enc_str(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)
-        slot = _symbolkey2str(slot)
-        win = slot['window']
-        # slot['window'] = win.epath if win.kind_of?(TkWindow)
-        slot['window'] = _epath(win) if win
-        if slot['create']
-          p_create = slot['create']
-          if p_create.kind_of?(Proc)
-#=begin
-            slot['create'] = install_cmd(proc{
-                                           id = p_create.call
-                                           if id.kind_of?(TkWindow)
-                                             id.epath
-                                           else
-                                             id
-                                           end
-                                         })
-#=end
-            slot['create'] = install_cmd(proc{_epath(p_create.call)})
-          end
-        end
-        tk_send_without_enc('window', 'configure', 
-                            _get_eval_enc_str(index), 
-                            *hash_kv(slot, true))
-      else
-        if slot == 'window' || slot == :window
-          # id = value 
-          # value = id.epath if id.kind_of?(TkWindow)
-          value = _epath(value)
-        end
-        if slot == 'create' || slot == :create
-          p_create = value
-          if p_create.kind_of?(Proc)
-#=begin
-            value = install_cmd(proc{
-                                  id = p_create.call
-                                  if id.kind_of?(TkWindow)
-                                    id.epath
-                                  else
-                                    id
-                                  end
-                                })
-#=end
-            value = install_cmd(proc{_epath(p_create.call)})
-          end
-        end
-        tk_send_without_enc('window', 'configure', 
-                            _get_eval_enc_str(index), 
-                            "-#{slot}", _get_eval_enc_str(value))
-      end
-    end
-    self
-  end
-
-  def window_configinfo(win, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        case slot.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          conf = tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
-        else
-          conf = tk_split_list(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(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[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        case slot.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          conf = tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
-        else
-          conf = tk_split_list(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win)))).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2]) 
-              else
-                conf[2] = tk_tcl2ruby(conf[2]) 
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3]) 
-              else
-                conf[3] = tk_tcl2ruby(conf[3]) 
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        ret
-      end
-    end
-  end
-
-  def current_window_configinfo(win, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        conf = window_configinfo(win, slot)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        window_configinfo(win).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      window_configinfo(win, slot).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-=end
-
-  def window_names
-    # tk_split_simplelist(_fromUTF8(tk_send_without_enc('window', 'names'))).collect{|elt|
-    tk_split_simplelist(tk_send_without_enc('window', 'names'), false, true).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_without_enc('kstring', 'length', 
-                          _get_eval_enc_str(txt)).to_i
-    else
-      begin
-        tk_call_without_enc('encoding', 'convertto', 'ascii', 
-                            _get_eval_enc_str(txt)).length
-      rescue StandardError, NameError
-        # sorry, I have no plan
-        txt.length
-      end
-    end
-  end
-  private :_ktext_length
-
-  def tksearch(*args)
-    # call 'search' subcommand of text widget
-    #   args ::= [<array_of_opts>] <pattern> <start_index> [<stop_index>]
-    # If <pattern> is regexp, then it must be a regular expression of Tcl
-    nocase = false
-    if args[0].kind_of?(Array)
-      opts = args.shift.collect{|opt|
-        s_opt = opt.to_s
-        nocase = true if s_opt == 'nocase'
-        '-' + s_opt
-      }
-    else
-      opts = []
-    end
-
-    if args[0].kind_of?(Regexp)
-      regexp = args.shift
-      if !nocase && (regexp.options & Regexp::IGNORECASE) != 0
-        opts << '-nocase'
-      end
-      args.unshift(regexp.source)
-    end
-
-    opts << '--'
-
-    ret = tk_send('search', *(opts + args))
-    if ret == ""
-      nil
-    else
-      TkText::IndexString.new(ret)
-    end
-  end
-
-  def tksearch_with_count(*args)
-    # call 'search' subcommand of text widget
-    #   args ::= [<array_of_opts>] <var> <pattern> <start_index> [<stop_index>]
-    # If <pattern> is regexp, then it must be a regular expression of Tcl
-    nocase = false
-    if args[0].kind_of?(Array)
-      opts = args.shift.collect{|opt|
-        s_opt = opt.to_s
-        nocase = true if s_opt == 'nocase'
-        '-' + s_opt
-      }
-    else
-      opts = []
-    end
-
-    opts << '-count' << args.shift
-
-    if args[0].kind_of?(Regexp)
-      regexp = args.shift
-      if !nocase && (regexp.options & Regexp::IGNORECASE) != 0
-        opts << '-nocase'
-      end
-      args.unshift(regexp.source)
-    end
-
-    opts << '--'
-
-    ret = tk_send('search', *(opts + args))
-    if ret == ""
-      nil
-    else
-      TkText::IndexString.new(ret)
-    end
-  end
-
-  def search_with_length(pat,start,stop=None)
-    pat = pat.chr 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
-        if pat.kind_of?(String)
-          #return [index(start + " + #{pos} chars"), pat.split('').length]
-          return [index(start + " + #{pos} chars"), 
-                  _ktext_length(pat), pat.dup]
-        else
-          #return [index(start + " + #{pos} chars"), $&.split('').length]
-          return [index(start + " + #{pos} chars"), 
-                  _ktext_length(match), match]
-        end
-      else
-        return ["", 0]
-      end
-    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
-        if pat.kind_of?(String)
-          #return [index(start + " + #{pos} chars"), pat.split('').length]
-          return [index(start + " + #{pos} chars"), 
-                  _ktext_length(pat), pat.dup]
-        else
-          #return [index(start + " + #{pos} chars"), $&.split('').length]
-          return [index(start + " + #{pos} chars"), 
-                  _ktext_length(match), match]
-        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
-          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]
-          else
-            #return [index("1.0 + #{pos} chars"), $&.split('').length]
-            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
-          end
-        else
-          return ["", 0]
-        end
-      end
-    end
-  end
-
-  def search(pat,start,stop=None)
-    search_with_length(pat,start,stop)[0]
-  end
-
-  def rsearch_with_length(pat,start,stop=None)
-    pat = pat.chr 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
-        if pat.kind_of?(String)
-          #return [index(stop + " + #{pos} chars"), pat.split('').length]
-          return [index(stop + " + #{pos} chars"), _ktext_length(pat), pat.dup]
-        else
-          #return [index(stop + " + #{pos} chars"), $&.split('').length]
-          return [index(stop + " + #{pos} chars"), _ktext_length(match), match]
-        end
-      else
-        return ["", 0]
-      end
-    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
-        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]
-        else
-          #return [index("1.0 + #{pos} chars"), $&.split('').length]
-          return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
-        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
-          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]
-          else
-            #return [index("1.0 + #{pos} chars"), $&.split('').length]
-            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
-          end
-        else
-          return ["", 0]
-        end
-      end
-    end
-  end
-
-  def rsearch(pat,start,stop=None)
-    rsearch_with_length(pat,start,stop)[0]
-  end
-
-  def dump(type_info, *index, &block)
-    if type_info.kind_of?(Symbol)
-      type_info = [ type_info.to_s ]
-    elsif type_info.kind_of?(String)
-      type_info = [ type_info ]
-    end
-    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)
-        when 'image'
-          result.push tk_tcl2ruby(val)
-        end
-        i = idx + 1
-      end
-
-      # retrieve index
-      idx = str.index(/ /, i)
-      if idx
-        result.push(TkText::IndexString.new(str[i..(idx-1)]))
-        i = idx + 1
-      else
-        result.push(TkText::IndexString.new(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 TkText::Peer < TkText
-  # Tk8.5 feature
-  def initialize(text, parent=nil, keys={})
-    unless text.kind_of?(TkText)
-      fail ArgumentError, "TkText is expected for 1st argument"
-    end
-    @src_text = text
-    super(parent, keys)
-  end
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(@src_text.path, 'peer', 'create', @path)
-    else
-      tk_call_without_enc(@src_text.path, 'peer', 'create', @path)
-    end
-  end
-  private :create_self
-end
diff --git a/ext/tk/lib/tk/textimage.rb b/ext/tk/lib/tk/textimage.rb
deleted file mode 100644
index a29b23c7dd..0000000000
--- a/ext/tk/lib/tk/textimage.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# tk/textimage.rb - treat Tk text image object
-#
-require 'tk'
-require 'tk/text'
-
-class TkTextImage<TkObject
-  include TkText::IndexModMethods
-
-  def initialize(parent, index, keys)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
-    #end
-    @t = parent
-    if index == 'end' || index == :end
-      @path = TkTextMark.new(@t, tk_call(@t.path, 'index', 'end - 1 chars'))
-    elsif index.kind_of? TkTextMark
-      if tk_call_without_enc(@t.path,'index',index.path) == tk_call_without_enc(@t.path,'index','end')
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
-                                                       'end - 1 chars'))
-      else
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
-                                                       index.path))
-      end
-    else
-      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
-                                                     _get_eval_enc_str(index)))
-    end
-    @path.gravity = 'left'
-    @index = @path.path
-    @id = tk_call_without_enc(@t.path, 'image', 'create', @index, 
-                              *hash_kv(keys, true)).freeze
-    @path.gravity = 'right'
-  end
-
-  def id
-    TkText::IndexString.new(@id)
-  end
-  def mark
-    @path
-  end
-
-  def [](slot)
-    cget(slot)
-  end
-  def []=(slot, value)
-    configure(slot, value)
-    value
-  end
-
-  def cget(slot)
-    @t.image_cget(@index, slot)
-  end
-
-  def configure(slot, value=None)
-    @t.image_configure(@index, slot, value)
-    self
-  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 current_configinfo(slot = nil)
-    @t.current_image_configinfo(@index, slot)
-  end
-
-  def image
-    img = tk_call_without_enc(@t.path, 'image', 'cget', @index, '-image')
-    TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
-  end
-
-  def image=(value)
-    tk_call_without_enc(@t.path, 'image', 'configure', @index, '-image', 
-                        _get_eval_enc_str(value))
-    #self
-    value
-  end
-end
diff --git a/ext/tk/lib/tk/textmark.rb b/ext/tk/lib/tk/textmark.rb
deleted file mode 100644
index 650d95af70..0000000000
--- a/ext/tk/lib/tk/textmark.rb
+++ /dev/null
@@ -1,166 +0,0 @@
-#
-# tk/textmark.rb - methods for treating text marks
-#
-require 'tk'
-require 'tk/text'
-
-class TkTextMark<TkObject
-  include TkText::IndexModMethods
-
-  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
-
-  def initialize(parent, index)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
-    #end
-    @parent = @t = parent
-    @tpath = parent.path
-    # @path = @id = Tk_TextMark_ID.join('')
-    @path = @id = Tk_TextMark_ID.join(TkCore::INTERP._ip_id_).freeze
-    TMarkID_TBL[@id] = self
-    TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
-    TMarkID_TBL[@tpath][@id] = self
-    Tk_TextMark_ID[1].succ!
-    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
-                        _get_eval_enc_str(index))
-    @t._addtag id, self
-  end
-
-  def id
-    TkText::IndexString.new(@id)
-  end
-
-  def exist?
-    #if ( tk_split_simplelist(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'names'))).find{|id| id == @id } )
-    if ( tk_split_simplelist(tk_call_without_enc(@t.path, 'mark', 'names'), false, true).find{|id| id == @id } )
-      true
-    else
-      false
-    end
-  end
-
-=begin
-  # move to TkText::IndexModMethods module
-  def +(mod)
-    return chars(mod) if mod.kind_of?(Numeric)
-
-    mod = mod.to_s
-    if mod =~ /^\s*[+-]?\d/
-      TkText::IndexString.new(@id + ' + ' + mod)
-    else
-      TkText::IndexString.new(@id + ' ' + mod)
-    end
-  end
-
-  def -(mod)
-    return chars(-mod) if mod.kind_of?(Numeric)
-
-    mod = mod.to_s
-    if mod =~ /^\s*[+-]?\d/
-      TkText::IndexString.new(@id + ' - ' + mod)
-    elsif mod =~ /^\s*[-]\s+(\d.*)$/
-      TkText::IndexString.new(@id + ' - -' + $1)
-    else
-      TkText::IndexString.new(@id + ' ' + mod)
-    end
-  end
-=end
-
-  def pos
-    @t.index(@id)
-  end
-
-  def pos=(where)
-    set(where)
-  end
-
-  def set(where)
-    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
-                        _get_eval_enc_str(where))
-    self
-  end
-
-  def unset
-    tk_call_without_enc(@t.path, 'mark', 'unset', @id)
-    self
-  end
-  alias destroy unset
-
-  def gravity
-    tk_call_without_enc(@t.path, 'mark', 'gravity', @id)
-  end
-
-  def gravity=(direction)
-    tk_call_without_enc(@t.path, 'mark', 'gravity', @id, direction)
-    #self
-    direction
-  end
-
-  def next(index = nil)
-    if index
-      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'next', _get_eval_enc_str(index))))
-    else
-      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'next', @id)))
-    end
-  end
-
-  def previous(index = nil)
-    if index
-      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'previous', _get_eval_enc_str(index))))
-    else
-      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@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)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
-    #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]
-    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
-                        _get_eval_enc_str(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<TkTextNamedMark
-  def self.new(parent,*args)
-    super(parent, 'current', *args)
-  end
-end
-
-class TkTextMarkAnchor<TkTextNamedMark
-  def self.new(parent,*args)
-    super(parent, 'anchor', *args)
-  end
-end
diff --git a/ext/tk/lib/tk/texttag.rb b/ext/tk/lib/tk/texttag.rb
deleted file mode 100644
index cc2c56210f..0000000000
--- a/ext/tk/lib/tk/texttag.rb
+++ /dev/null
@@ -1,279 +0,0 @@
-#
-# tk/texttag.rb - methods for treating text tags
-#
-require 'tk'
-require 'tk/text'
-require 'tk/tagfont'
-
-class TkTextTag<TkObject
-  include TkTreatTagFont
-  include TkText::IndexModMethods
-
-  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
-
-  def initialize(parent, *args)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
-    #end
-    @parent = @t = parent
-    @tpath = parent.path
-    # @path = @id = Tk_TextTag_ID.join('')
-    @path = @id = Tk_TextTag_ID.join(TkCore::INTERP._ip_id_).freeze
-    # TTagID_TBL[@id] = self
-    TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
-    TTagID_TBL[@tpath][@id] = self
-    Tk_TextTag_ID[1].succ!
-    #tk_call @t.path, "tag", "configure", @id, *hash_kv(keys)
-    if args != []
-      keys = args.pop
-      if keys.kind_of?(Hash)
-        add(*args) if args != []
-        configure(keys)
-      else
-        args.push keys
-        add(*args)
-      end
-    end
-    @t._addtag id, self
-  end
-
-  def id
-    TkText::IndexString.new(@id)
-  end
-
-  def exist?
-    #if ( tk_split_simplelist(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'names'))).find{|id| id == @id } )
-    if ( tk_split_simplelist(tk_call_without_enc(@t.path, 'tag', 'names'), false, true).find{|id| id == @id } )
-      true
-    else
-      false
-    end
-  end
-
-  def first
-    TkText::IndexString.new(@id + '.first')
-  end
-
-  def last
-    TkText::IndexString.new(@id + '.last')
-  end
-
-  def add(*indices)
-    tk_call_without_enc(@t.path, 'tag', 'add', @id, 
-                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
-    self
-  end
-
-  def remove(*indices)
-    tk_call_without_enc(@t.path, 'tag', 'remove', @id, 
-                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
-    self
-  end
-
-  def ranges
-    l = tk_split_simplelist(tk_call_without_enc(@t.path, 'tag', 'ranges', @id))
-    r = []
-    while key=l.shift
-      r.push [TkText::IndexString.new(key), TkText::IndexString.new(l.shift)]
-    end
-    r
-  end
-
-  def nextrange(first, last=None)
-    simplelist(tk_call_without_enc(@t.path, 'tag', 'nextrange', @id, 
-                                   _get_eval_enc_str(first), 
-                                   _get_eval_enc_str(last))).collect{|idx|
-      TkText::IndexString.new(idx)
-    }
-  end
-
-  def prevrange(first, last=None)
-    simplelist(tk_call_without_enc(@t.path, 'tag', 'prevrange', @id, 
-                                   _get_eval_enc_str(first), 
-                                   _get_eval_enc_str(last))).collect{|idx|
-      TkText::IndexString.new(idx)
-    }
-  end
-
-  def [](key)
-    cget key
-  end
-
-  def []=(key,val)
-    configure key, val
-    val
-  end
-
-  def cget(key)
-    @t.tag_cget @id, key
-  end
-=begin
-  def cget(key)
-    case key.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      _fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget', @id, "-#{key}"))
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_call(@t.path, 'tag', 'cget', @id, "-#{key}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@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(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget', 
-                                                @id, "-#{key}")))
-    end
-  end
-=end
-
-  def configure(key, val=None)
-    @t.tag_configure @id, key, val
-  end
-#  def configure(key, val=None)
-#    if key.kind_of?(Hash)
-#      tk_call @t.path, 'tag', 'configure', @id, *hash_kv(key)
-#    else
-#      tk_call @t.path, 'tag', 'configure', @id, "-#{key}", val
-#    end
-#  end
-#  def configure(key, value)
-#    if value == FALSE
-#      value = "0"
-#    elsif value.kind_of?(Proc)
-#      value = install_cmd(value)
-#    end
-#    tk_call @t.path, 'tag', 'configure', @id, "-#{key}", value
-#  end
-
-  def configinfo(key=nil)
-    @t.tag_configinfo @id, key
-  end
-
-  def current_configinfo(key=nil)
-    @t.current_tag_configinfo @id, key
-  end
-
-  #def bind(seq, cmd=Proc.new, *args)
-  #  _bind([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
-  #  self
-  #end
-  def bind(seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
-    self
-  end
-
-  #def bind_append(seq, cmd=Proc.new, *args)
-  #  _bind_append([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
-  #  self
-  #end
-  def bind_append(seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _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
-  end
-
-  def bindinfo(context=nil)
-    _bindinfo([@t.path, 'tag', 'bind', @id], context)
-  end
-
-  def raise(above=None)
-    tk_call_without_enc(@t.path, 'tag', 'raise', @id, 
-                        _get_eval_enc_str(above))
-    self
-  end
-
-  def lower(below=None)
-    tk_call_without_enc(@t.path, 'tag', 'lower', @id, 
-                        _get_eval_enc_str(below))
-    self
-  end
-
-  def destroy
-    tk_call_without_enc(@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 != []
-        keys = args.pop
-        if keys.kind_of?(Hash)
-          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)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
-    #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 != []
-      keys = args.pop
-      if keys.kind_of?(Hash)
-        add(*args) if args != []
-        configure(keys)
-      else
-        args.push keys
-        add(*args)
-      end
-    end
-    @t._addtag id, self
-  end
-end
-
-class TkTextTagSel<TkTextNamedTag
-  def self.new(parent, *args)
-    super(parent, 'sel', *args)
-  end
-end
diff --git a/ext/tk/lib/tk/textwindow.rb b/ext/tk/lib/tk/textwindow.rb
deleted file mode 100644
index 605c40addd..0000000000
--- a/ext/tk/lib/tk/textwindow.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# tk/textwindow.rb - treat Tk text window object
-#
-require 'tk'
-require 'tk/text'
-
-class TkTextWindow<TkObject
-  include TkText::IndexModMethods
-
-  def initialize(parent, index, keys = {})
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
-    #end
-    @t = parent
-    if index == 'end' || index == :end
-      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
-                                                     'end - 1 chars'))
-    elsif index.kind_of?(TkTextMark)
-      if tk_call_without_enc(@t.path,'index',index.path) == tk_call_without_enc(@t.path,'index','end')
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
-                                                       'end - 1 chars'))
-      else
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
-                                                       index.path))
-      end
-    else
-      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', _get_eval_enc_str(index)))
-    end
-    @path.gravity = 'left'
-    @index = @path.path
-    keys = _symbolkey2str(keys)
-    @id = keys['window']
-    # keys['window'] = @id.epath if @id.kind_of?(TkWindow)
-    keys['window'] = _epath(@id) if @id
-    if keys['create']
-      @p_create = keys['create']
-      # if @p_create.kind_of?(Proc)
-      if TkComm._callback_entry?(@p_create)
-=begin
-        keys['create'] = install_cmd(proc{
-                                       @id = @p_create.call
-                                       if @id.kind_of?(TkWindow)
-                                         @id.epath
-                                       else
-                                         @id
-                                       end
-                                     })
-=end
-        keys['create'] = install_cmd(proc{@id = @p_create.call; _epath(@id)})
-      end
-    end
-    tk_call_without_enc(@t.path, 'window', 'create', @index, 
-                        *hash_kv(keys, true))
-    @path.gravity = 'right'
-  end
-
-  def id
-    TkText::IndexString.new(_epath(@id))
-  end
-  def mark
-    @path
-  end
-
-  def [](slot)
-    cget(slot)
-  end
-  def []=(slot, value)
-    configure(slot, value)
-    value
-  end
-
-  def cget(slot)
-    @t.window_cget(@index, slot)
-  end
-
-  def configure(slot, value=None)
-    if slot.kind_of?(Hash)
-      slot = _symbolkey2str(slot)
-      if slot['window']
-        @id = slot['window'] 
-        # slot['window'] = @id.epath if @id.kind_of?(TkWindow)
-        slot['window'] = _epath(@id) if @id
-      end
-      if slot['create']
-        self.create=slot.delete('create')
author	git <svn-admin@ruby-lang.org>	2022-03-27 02:43:02 +0900
committer	git <svn-admin@ruby-lang.org>	2022-03-27 02:43:02 +0900
commit	956e57f7f300894fea7a8c38b9ce0804917f2a7f (patch)
tree	156597d29d72fb392e0305f402f6792fd15a8ee0 /spec/ruby/core/regexp/case_compare_spec.rb
parent	e699e2d9bff14e3de1323d8d263cd3d04f4d9128 (diff)